Merge remote-tracking branch 'origin/develop' into spotlight

[netatalk.git] / macros / cnid-backend.m4

diff --git a/macros/cnid-backend.m4 b/macros/cnid-backend.m4
index e7f2101b9d3ff89f8f05bc0b02edefe18c7af334..1e0366142876fa9dd5c87f69b19f035f21fb4a03 100644 (file)
--- a/macros/cnid-backend.m4
+++ b/macros/cnid-backend.m4
@@ -6,10 +6,10 @@ AC_DEFUN([AC_NETATALK_CNID], [
     dnl Determine whether or not to use Database Daemon CNID backend
     AC_MSG_CHECKING([whether or not to use Database Daemon CNID backend])
     AC_ARG_WITH(cnid-dbd-backend,
-    [  --with-cnid-dbd-backend       build CNID with Database Daemon Data Store],
+    [  --with-cnid-dbd-backend       build CNID with Database Daemon Data Store [[yes]]],
     [   if test x"$withval" = x"no"; then
-            AC_MSG_RESULT([no])
             use_dbd_backend=no
+            AC_MSG_RESULT([no])
         else
             use_dbd_backend=yes
             AC_MSG_RESULT([yes])
@@ -32,14 +32,16 @@ AC_DEFUN([AC_NETATALK_CNID], [
     dnl Determine whether or not to use BDB Concurrent Data Store
     AC_MSG_CHECKING([whether or not to use BDB Concurrent Data Store])
     AC_ARG_WITH(cnid-cdb-backend,
-       [  --with-cnid-cdb-backend      build CNID with Concurrent BDB Data Store],[
+       [  --with-cnid-cdb-backend      build CNID with Concurrent BDB Data Store  [[no]]],[
            if test x"$withval" = x"no"; then
                use_cdb_backend=no
         else
             use_cdb_backend=yes
         fi
-    ],[use_cdb_backend=no]
-    )
+    ],[
+        use_cdb_backend=no
+    ])
+
 
     if test $use_cdb_backend = yes; then
         AC_MSG_RESULT([yes])
@@ -57,7 +59,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     dnl Determine whether or not to use LAST DID scheme
     AC_MSG_CHECKING([whether or not to use LAST DID scheme])
     AC_ARG_WITH(cnid-last-backend,
-       [  --with-cnid-last-backend     build LAST CNID scheme],
+       [  --with-cnid-last-backend     build LAST CNID scheme                     [[yes]]],
        [
         if test x"$withval" = x"no"; then
             use_last_backend=no
@@ -83,7 +85,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     dnl Determine whether or not to use TDB DID scheme
     AC_MSG_CHECKING([whether or not to use TDB DID scheme])
     AC_ARG_WITH(cnid-tdb-backend,
-       [  --with-cnid-tdb-backend      build DID CNID scheme],
+       [  --with-cnid-tdb-backend      build TDB CNID scheme                      [[yes]]],
     [
         if test x"$withval" = x"no"; then
             use_tdb_backend=no
@@ -91,13 +93,13 @@ AC_DEFUN([AC_NETATALK_CNID], [
             use_tdb_backend=yes
         fi
     ],[
-        use_tdb_backend=no
+        use_tdb_backend=yes
     ])
 
     if test $use_tdb_backend = yes; then
         AC_MSG_RESULT([yes])
         AC_DEFINE(CNID_BACKEND_TDB, 1, [Define if CNID TDB scheme backend should be compiled.])
-        if test x"$DEFAULT_TDB_SCHEME" = x; then
+        if test x"$DEFAULT_CNID_SCHEME" = x; then
             DEFAULT_CNID_SCHEME=tdb
         fi
         compiled_backends="$compiled_backends tdb"
@@ -109,7 +111,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     dnl Set default DID scheme
     AC_MSG_CHECKING([default DID scheme])
     AC_ARG_WITH(cnid-default-backend,
-       [  --with-cnid-default-backend=val      set default DID scheme],
+       [  --with-cnid-default-backend=val      set default DID scheme [[dbd]]],
     [
         if test x"$withval" = x; then
             AC_MSG_RESULT([ignored])