Backport from trunk: unified --with-did and --enable-cnid-db.

diff --git a/configure.in b/configure.in
index 94620bcea9527ca08122e429f2991a4ba64a62b5..98d00c130a8007f808c1c26d86ccf4543100109b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.126.2.3 2001-11-25 21:34:24 srittau Exp $
+dnl $Id: configure.in,v 1.126.2.4 2001-11-30 05:54:33 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -228,31 +228,11 @@ AC_ARG_ENABLE(force-uidgid,
 dnl Don't use DB3 unless it's needed
 db3_required=no
 
-dnl Check for CNID DB support
-AC_MSG_CHECKING([whether CNID support should be enabled])
-AC_ARG_ENABLE(cnid-db,
-       [  --enable-cnid-db        use persistent cnid database per volume (EXPERIMENTAL) ],
-       [
-               if test "x$enableval" = "xyes"; then
-                       dnl Now we need DB3
-                       db3_required="yes"
-                       AC_DEFINE(CNID_DB)
-                       AC_MSG_RESULT([yes])
-               else
-                       AC_MSG_RESULT([no])
-               fi
-       ],[AC_MSG_RESULT([no])]
-)
-
-dnl Check for Berkeley DB3 library
-if test "x$db3_required" = "xyes"; then
-       AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
-fi
 
 dnl Determine DID scheme
 AC_MSG_CHECKING([for DID scheme to use])
 AC_ARG_WITH(did,
-       [  --with-did=SCHEME       set DID scheme (last,mtab)],
+       [  --with-did=SCHEME       set DID scheme (last,hash,mtab,cnid)],
        [ did_scheme="$withval" ],
        [ did_scheme="last" ]
 )
@@ -260,15 +240,24 @@ AC_ARG_WITH(did,
 if test "x$did_scheme" = "xlast"; then
        AC_DEFINE(USE_LASTDID, 1)
        AC_MSG_RESULT([last])
+elif test "x$did_scheme" = "xhash"; then
+       AC_MSG_RESULT([device/inode-based hashing])
 elif test "x$did_scheme" = "xmtab"; then
        AC_DEFINE(DID_MTAB, 1)
        AC_MSG_RESULT([mtab-based DID creation support])
-elif test "x$did_scheme" != "xno"; then
-       AC_MSG_RESULT([default])
+elif test "x$did_scheme" = "xcnid"; then
+       db3_required="yes"
+       AC_DEFINE(CNID_DB, 1)
+       AC_MSG_RESULT([enabling build with CNID DB support])
 else
        AC_MSG_ERROR([unknown DID scheme])
 fi
 
+dnl Check for Berkeley DB3 library
+if test "x$db3_required" = "xyes"; then
+       AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
+fi
+
 msg_dir=""
 AC_ARG_WITH(message-dir,
        [  --with-message-dir=PATH path to message files [[PKGCONF/msg]]],