change AC_NETATALK_CNID to AC_NETATALK_CNID[berkeley required, berkeley not required]

diff --git a/configure.in b/configure.in
index a657c2664c27905e9b964bbfbccc5204d52bfb5b..9e25a1e131bdab51f9f943ee0fc000cd491ef3cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.11 2003-11-01 02:38:09 bfernhomberg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.12 2003-11-01 07:45:56 bfernhomberg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -326,7 +326,7 @@ AC_ARG_ENABLE(force-uidgid,
 
 dnl Check for CNID database backends
 bdb_required=no
-AC_NETATALK_CNID
+AC_NETATALK_CNID([bdb_required=yes],[bdb_required=no])
 
 dnl Check for Berkeley DB library
 if test "x$bdb_required" = "xyes"; then

diff --git a/macros/cnid-backend.m4 b/macros/cnid-backend.m4
index a054849675568ebd77a6846a8875ab0638861c37..75f9965e8ecac730f0f40d74415772ac648d72ed 100644 (file)
--- a/macros/cnid-backend.m4
+++ b/macros/cnid-backend.m4
@@ -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
 ])

diff --git a/macros/quota-check.m4 b/macros/quota-check.m4
index 8caee91dfb41ca2512785b4426c844b7425092dc..6b3fda98e20bd197ca43fb063f2acb2ea02ddb81 100644 (file)
--- a/macros/quota-check.m4
+++ b/macros/quota-check.m4
@@ -1,10 +1,10 @@
-dnl $Id: quota-check.m4,v 1.1.12.1 2003-11-01 02:38:09 bfernhomberg Exp $
+dnl $Id: quota-check.m4,v 1.1.12.2 2003-11-01 07:45:56 bfernhomberg Exp $
 dnl Autoconf macro to check for quota support
 dnl FIXME: This is in now way complete.
 
 AC_DEFUN([AC_CHECK_QUOTA], [
-       QUOTA_LIBS=
-       AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS=-lrpcsvc])
+       QUOTA_LIBS=""
+       AC_CHECK_LIB(rpcsvc, main, [QUOTA_LIBS="-lrpcsvc"])
        AC_CHECK_HEADERS(rpc/rpc.h)
        AC_SUBST(QUOTA_LIBS)
 ])