Change all references to db3/DB3 to BDB. We now support Berkeley DB

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 35c37cecc3cbb381b9cfb8a686672c326fc8f7d6..860ab7574e3ce27b6dc9d5d37947982d7eaa1180 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.169 2002-10-11 14:18:22 didg Exp $
+dnl $Id: configure.in,v 1.175 2003-01-04 21:41:48 jmarcus Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -106,7 +106,7 @@ AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_FUNC_UTIME_NULL
 AC_FUNC_WAIT3
-AC_CHECK_FUNCS(flock getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strcasestr strstr strtoul setpgrp strchr memcpy)
+AC_CHECK_FUNCS(getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strcasestr strstr strtoul setpgrp strchr memcpy)
 AC_FUNC_SETPGRP
 
 dnl Checks for (v)snprintf
@@ -188,7 +188,7 @@ AC_ARG_ENABLE(debug,
 
 afp3=no
 AC_ARG_ENABLE(afp3,
-       [  --enable-afp3          enable AFP 3.x calls],
+       [  --enable-afp3           enable AFP 3.x calls],
        if test "$enableval" = "yes"; then
                afp3=yes
                AC_DEFINE(AFP3x, 1)
@@ -224,8 +224,8 @@ AC_ARG_ENABLE(force-uidgid,
        fi
 )
 
-dnl Don't use DB3 unless it's needed
-db3_required=no
+dnl Don't use BDB unless it's needed
+bdb_required=no
 
 dnl Determine DID scheme
 AC_MSG_CHECKING([for DID scheme to use])
@@ -239,7 +239,7 @@ if test "x$did_scheme" = "xlast"; then
        AC_DEFINE(USE_LASTDID, 1)
        AC_MSG_RESULT([last])
 elif test "x$did_scheme" = "xcnid"; then
-       db3_required="yes"
+       bdb_required="yes"
        AC_DEFINE(CNID_DB, 1)
        AC_MSG_RESULT([enabling build with CNID DB support])
 else
@@ -251,39 +251,59 @@ dnl Determine whether or not to use filename mangling
 AC_MSG_CHECKING([whether or not to use filename mangling])
 AC_ARG_WITH(mangling,
        [  --with-mangling         enable filename mangling],
-       if test "$withval" = "yes"; then
-           if test "x$did_scheme" != "xcnid"; then
-               AC_MSG_ERROR([DID scheme must be CNID to use filename mangling])
-           else
-               AC_DEFINE(FILE_MANGLING, 1)
-               AC_MSG_RESULT([yes])
-           fi
-       else
-           AC_MSG_RESULT([no])
-       fi
-       , AC_MSG_RESULT([no])
+       [
+               if test "x$withval" = "xyes"; then
+                       if test "x$did_scheme" != "xcnid"; then
+                               AC_MSG_ERROR([DID scheme must be CNID to use filename mangling])
+                       else
+                               AC_DEFINE(FILE_MANGLING, 1)
+                               AC_MSG_RESULT([yes])
+                       fi
+               else
+                       AC_MSG_RESULT([no])
+               fi
+       ], [
+               if test "x$did_scheme" = "xcnid"; then
+                       AC_DEFINE(FILE_MANGLING, 1)
+                       AC_MSG_RESULT([yes])
+               else
+                       AC_MSG_RESULT([no])
+               fi
+       ]
 )
 
+if test "$did_scheme" = "cnid"; then
+    USE_CDB="yes"
+else
+    USE_CDB="no"
+fi
+
 dnl Determine whether or not to use CDB or transactional DB store
 AC_MSG_CHECKING([whether or not to use CNID with Concurrent Data Store])
 AC_ARG_WITH(cdb,
-       [ --with-cdb            enable CNID with Concurrent Data Store],
-       if test "$withval" = "yes"; then
+       [  --with-cdb              enable CNID with Concurrent Data Store],
+       if test "$withval" = "no"; then
            if test "x$did_scheme" != "xcnid"; then
+               USE_CDB="no"
                AC_MSG_ERROR([DID scheme must be CNID to use CDB])
            else
-               AC_DEFINE(CNID_DB_CDB, 1)
-               AC_MSG_RESULT([yes])
+               USE_CDB="no"
+               AC_MSG_RESULT([no])
            fi
        else
-           AC_MSG_RESULT([no])
+           USE_CDB="yes"
+           AC_MSG_RESULT([yes])
        fi
-       , AC_MSG_RESULT([no])
+       , AC_MSG_RESULT([yes])
 )
 
-dnl Check for Berkeley DB3 library
-if test "x$db3_required" = "xyes"; then
-       AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
+if test "$USE_CDB" = "yes"; then
+    AC_DEFINE(CNID_DB_CDB, 1)
+fi
+
+dnl Check for Berkeley DB library
+if test "x$bdb_required" = "xyes"; then
+       AC_PATH_BDB(, [AC_MSG_ERROR([Berkeley DB library not found!])])
 fi
 
 dnl Check for quota support
@@ -320,17 +340,6 @@ AC_ARG_ENABLE(shell-check,
        fi
 )
 
-AC_MSG_CHECKING([whether flock locks should be enabled])
-AC_ARG_WITH(flock-locks,
-       [  --with-flock-locks      enable flock locks support],
-       [flock_locks="$withval"],
-       [flock_locks="no"]
-)
-if test "x$flock_locks" = "xyes"; then
-       AC_DEFINE(USE_FLOCK_LOCKS)
-fi
-AC_MSG_RESULT([$flock_locks])
-
 AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     enable TCP wrappers support],
        AC_CHECK_LIB(wrap, tcpd_warn,
@@ -388,13 +397,6 @@ AC_ARG_WITH(uams-path,
        uams_path="${PKGCONFDIR}/uams"
 )
 
-AC_ARG_WITH(catsearch,
-       [  --with-catsearch     enable fpCatSearch functionality (experimental)],
-       if test "$withval" = "yes"; then
-           AC_DEFINE(WITH_CATSEARCH, 1)
-       fi
-)
-
 dnl --------------------------------------------------------------------------
 dnl FHS stuff has to be done last because it overrides other defaults
 dnl --------------------------------------------------------------------------