Removed the --with-cnid-db configure option, and replaced it with

--with-did=cnid.  This makes things more consistent, and avoids dual
DID calculation schemes.

diff --git a/ChangeLog b/ChangeLog
index ac4b1021e157ec3bcfab82c7cf17144caed7bc16..1c600d963087b2772119fcf31fb87efa01ae8912 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
-2011-11-19  pooba53 <bobo@bocklabs.wisc.edu>
-            * Modified distrib/initscripts/Makefile.am so
-              that SuSE init script ends up in the correct directory.
+2001-11-27  joe c   <marcus@marcuscom.com>
+       * configure.in: Removed the --with-cnid-db option, and added
+         --with-did=cnid for consistency
+
+2001-11-19  pooba53 <bobo@bocklabs.wisc.edu>
+    * Modified distrib/initscripts/Makefile.am so
+      that SuSE init script ends up in the correct directory.
 
 2001-11-19  pooba53 <bobo@bocklabs.wisc.edu>
        * modified config/AppleVolumes.default to not 

diff --git a/configure.in b/configure.in
index f94535c4cbb2282c96afceca0cb9c991e288b1cb..a80bb94920e7612894dfe17641844c01c79245b0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.132 2001-11-25 21:48:01 srittau Exp $
+dnl $Id: configure.in,v 1.133 2001-11-27 22:40:52 jmarcus 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,mtab,cnid)],
        [ did_scheme="$withval" ],
        [ did_scheme="last" ]
 )
@@ -263,12 +243,21 @@ if test "x$did_scheme" = "xlast"; then
 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" = "xcnid"; then
+       db3_required="yes"
+       AC_DEFINE(CNID_DB, 1)
+       AC_MSG_RESULT([enabling build with CNID DB support])
 elif test "x$did_scheme" != "xno"; then
        AC_MSG_RESULT([default])
 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]]],