remove signed/unsigned gcc warning

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

diff --git a/macros/cnid-backend.m4 b/macros/cnid-backend.m4
index a054849675568ebd77a6846a8875ab0638861c37..ddf1cde2f7bebf88b5cb256592233d96c51e568b 100644 (file)
--- a/macros/cnid-backend.m4
+++ b/macros/cnid-backend.m4
@@ -38,8 +38,8 @@ AC_DEFUN([AC_NETATALK_CNID], [
             AC_MSG_RESULT([yes])
         fi
     ],[
-        use_dbd_backend=no
-        AC_MSG_RESULT([no])
+        use_dbd_backend=yes
+        AC_MSG_RESULT([yes])
     ])
 
     dnl Determine whether or not to use with transaction support in Database Daemon
@@ -86,7 +86,6 @@ AC_DEFUN([AC_NETATALK_CNID], [
             use_db3_backend=no
         else
             use_db3_backend=yes
-            $compiled_backends="$compile_backends db3"
         fi
     ],[
         use_db3_backend=no
@@ -98,6 +97,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
         if test x"$DEFAULT_CNID_SCHEME" = x; then
             DEFAULT_CNID_SCHEME=db3
         fi
+        compiled_backends="$compiled_backends db3"
         bdb_required=yes
     else
         AC_MSG_RESULT([no])
@@ -112,10 +112,9 @@ AC_DEFUN([AC_NETATALK_CNID], [
             use_last_backend=no
         else
             use_last_backend=yes
-            compiled_backends="$compiled_backends last"
         fi
     ],[
-        use_last_backend=no
+        use_last_backend=yes
     ])
 
     if test $use_last_backend = yes; then
@@ -124,6 +123,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
         if test x"$DEFAULT_CNID_SCHEME" = x; then
             DEFAULT_CNID_SCHEME=last
         fi
+        compiled_backends="$compiled_backends last"
     else
         AC_MSG_RESULT([no])
     fi
@@ -137,7 +137,6 @@ AC_DEFUN([AC_NETATALK_CNID], [
             use_hash_backend=no
         else
             use_hash_backend=yes
-            compiled_backends="$compiled_backends hash"
         fi
     ],[
         use_hash_backend=no
@@ -149,6 +148,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
         if test x"$DEFAULT_CNID_SCHEME" = x; then
             DEFAULT_CNID_SCHEME=hash
         fi
+        compiled_backends="$compiled_backends hash"
     else
         AC_MSG_RESULT([no])
     fi
@@ -162,7 +162,6 @@ AC_DEFUN([AC_NETATALK_CNID], [
             use_tdb_backend=no
         else
             use_tdb_backend=yes
-            compiled_backends="$compiled_backends tdb"
         fi
     ],[
         use_tdb_backend=no
@@ -174,6 +173,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
         if test x"$DEFAULT_TDB_SCHEME" = x; then
             DEFAULT_CNID_SCHEME=tdb
         fi
+        compiled_backends="$compiled_backends tdb"
     else
         AC_MSG_RESULT([no])
     fi
@@ -187,7 +187,6 @@ AC_DEFUN([AC_NETATALK_CNID], [
             use_mtab_backend=no
         else
             use_mtab_backend=yes
-            compiled_backends="$compiled_backends mtab"
         fi
     ],[
         use_mtab_backend=no
@@ -199,6 +198,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
         if test x"$DEFAULT_CNID_SCHEME" = x; then
             DEFAULT_CNID_SCHEME=mtab
         fi
+        compiled_backends="$compiled_backends mtab"
     else               
         AC_MSG_RESULT([no])
     fi
@@ -225,7 +225,7 @@ AC_DEFUN([AC_NETATALK_CNID], [
     AC_MSG_CHECKING([whether default CNID scheme has been activated])
     found_scheme=no
     for scheme in $compiled_backends ; do
-        if test "$scheme" = $DEFAULT_CNID_SCHEME ; then        
+        if test x"$scheme" = x"$DEFAULT_CNID_SCHEME"; then     
             found_scheme=yes
         fi
     done
@@ -240,4 +240,9 @@ AC_DEFUN([AC_NETATALK_CNID], [
     AC_SUBST(DEFAULT_CNID_SCHEME)
     AC_SUBST(compiled_backends)
 
+    if test "x$bdb_required" = "xyes"; then
+       ifelse([$1], , :, [$1])
+    else
+       ifelse([$2], , :, [$2])     
+    fi
 ])