X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=43883506fac8877f54f54527d235261fcd822663;hb=0b80350fd86bfe8e07454e32495c9727897b1e00;hp=91ffc138577b8ff8cea649aa69bd07fc47f650c4;hpb=fcd89e0be187b694648ab85a73e5123c1d0992dc;p=netatalk.git

diff --git a/configure.in b/configure.in
index 91ffc138..43883506 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.165 2002-09-27 08:10:40 didg Exp $
+dnl $Id: configure.in,v 1.168.2.2 2002-11-11 22:18:45 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -214,19 +214,14 @@ db3_required=no
 dnl Determine DID scheme
 AC_MSG_CHECKING([for DID scheme to use])
 AC_ARG_WITH(did,
-	[  --with-did=SCHEME       set DID scheme (last,hash,mtab,cnid)],
+	[  --with-did=SCHEME       set DID scheme (cnid,last)],
 	[ did_scheme="$withval" ],
-	[ did_scheme="last" ]
+	[ did_scheme="cnid" ]
 )
 
 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" = "xcnid"; then
 	db3_required="yes"
 	AC_DEFINE(CNID_DB, 1)
@@ -239,7 +234,7 @@ AM_CONDITIONAL(COMPILE_CNID, test "x$did_scheme" = "xcnid")
 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],
+	[  --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])
@@ -253,23 +248,35 @@ AC_ARG_WITH(mangling,
 	, AC_MSG_RESULT([no])
 )
 
+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
+	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])
 )
 
+if test "$USE_CDB" = "yes"; then
+    AC_DEFINE(CNID_DB_CDB, 1)
+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!])])
@@ -377,13 +384,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 --------------------------------------------------------------------------