X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=f6d9b91fd15a617a28250309d5b8b3654b0feddd;hb=91ded787cdeb5698cbaf1da11af7da3274d44296;hp=2f8eb9e5e619fef7cd918135eb6b93eb621d4282;hpb=7c563936748fcb1d7bd32d87d905175e0602d8ae;p=netatalk.git

diff --git a/configure.in b/configure.in
index 2f8eb9e5..f6d9b91f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.162 2002-08-30 03:12:45 jmarcus Exp $
+dnl $Id: configure.in,v 1.168.2.5 2003-02-08 03:16:52 jmarcus Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -107,6 +107,9 @@ AC_FUNC_WAIT3
 AC_CHECK_FUNCS(flock getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strstr strtoul setpgrp strchr memcpy)
 AC_FUNC_SETPGRP
 
+dnl Checks for (v)snprintf
+NETATALK_SNPRINTF_CHECK
+
 dnl --------------------------------------------------------------------------
 dnl specific configuration comes in here:
 dnl --------------------------------------------------------------------------
@@ -205,27 +208,22 @@ 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])
 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"
+	bdb_required="yes"
 	AC_DEFINE(CNID_DB, 1)
 	AC_MSG_RESULT([enabling build with CNID DB support])
 else
@@ -236,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])
@@ -250,26 +248,38 @@ 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
+	[  --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
@@ -374,12 +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 --------------------------------------------------------------------------
@@ -387,9 +391,11 @@ dnl --------------------------------------------------------------------------
 AC_ARG_ENABLE(fhs,
 	[  --enable-fhs            use Filesystem Hierarchy Standard (FHS) compatibility],
 	if test "$enableval" = "yes"; then
-		uams_path="/usr/lib/netatalk"
+		uams_path="${libdir}/netatalk"
 		sysconfdir="/etc"
 		PKGCONFDIR=${sysconfdir}/netatalk
+		SERVERTEXT="${PKGCONFDIR}/msg"
+		NLSDIR="${PKGCONFDIR}/nls"
 		use_pam_so=yes
 		mandir="/usr/share/man"
 		AC_DEFINE(FHS_COMPATIBILITY)