more AFP 3.x define

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index fe43506761f8beec16d4a89baaacb33b190135cb..564c0c40d658adcbfc880573a318d86288daaa6a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.160 2002-08-23 17:42:52 sibaz Exp $
+dnl $Id: configure.in,v 1.168 2002-10-04 15:11:57 srittau 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 --------------------------------------------------------------------------
@@ -211,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)
@@ -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])
@@ -244,7 +242,27 @@ AC_ARG_WITH(mangling,
                AC_DEFINE(FILE_MANGLING, 1)
                AC_MSG_RESULT([yes])
            fi
+       else
+           AC_MSG_RESULT([no])
        fi
+       , AC_MSG_RESULT([no])
+)
+
+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 "x$did_scheme" != "xcnid"; then
+               AC_MSG_ERROR([DID scheme must be CNID to use CDB])
+           else
+               AC_DEFINE(CNID_DB_CDB, 1)
+               AC_MSG_RESULT([yes])
+           fi
+       else
+           AC_MSG_RESULT([no])
+       fi
+       , AC_MSG_RESULT([no])
 )
 
 dnl Check for Berkeley DB3 library
@@ -354,6 +372,13 @@ 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 --------------------------------------------------------------------------