pap STDOUT/STDIN fix.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index b35371b4d0de00f357ca64d6c1d5d8ca5c96f34a..43883506fac8877f54f54527d235261fcd822663 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
-dnl $Id: configure.in,v 1.155 2002-02-13 16:44:02 srittau 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)
 
-NETATALK_VERSION=`cat VERSION`
+NETATALK_VERSION=`cat $srcdir/VERSION`
 AC_SUBST(NETATALK_VERSION)
 
 AC_CANONICAL_SYSTEM
@@ -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 --------------------------------------------------------------------------
@@ -132,7 +135,7 @@ AC_ARG_WITH(logfile,
                AC_DEFINE(DISABLE_LOGGER, 1)
                AC_MSG_RESULT([logger disabled])
        elif test "$withval" != "yes"; then
-               AC_DEFINE_UNQUOTED(LOGFILEPATH, $withval)
+               AC_DEFINE_UNQUOTED(LOGFILEPATH, "$withval")
                AC_MSG_RESULT([logfile set to $withval])
        else
                 AC_DEFINE_UNQUOTED(LOGFILEPATH, "/var/log/netatalk.log")
@@ -208,23 +211,17 @@ AC_ARG_ENABLE(force-uidgid,
 dnl Don't use DB3 unless it's needed
 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)
@@ -234,6 +231,52 @@ else
 fi
 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],
+       if test "$withval" = "yes"; then
+           if test "x$did_scheme" != "xcnid"; then
+               AC_MSG_ERROR([DID scheme must be CNID to use filename mangling])
+           else
+               AC_DEFINE(FILE_MANGLING, 1)
+               AC_MSG_RESULT([yes])
+           fi
+       else
+           AC_MSG_RESULT([no])
+       fi
+       , 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" = "no"; then
+           if test "x$did_scheme" != "xcnid"; then
+               USE_CDB="no"
+               AC_MSG_ERROR([DID scheme must be CNID to use CDB])
+           else
+               USE_CDB="no"
+               AC_MSG_RESULT([no])
+           fi
+       else
+               USE_CDB="yes"
+               AC_MSG_RESULT([yes])
+       fi
+       , 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!])])
@@ -242,19 +285,6 @@ fi
 dnl Check for quota support
 AC_CHECK_QUOTA
 
-msg_dir=""
-AC_ARG_WITH(message-dir,
-       [  --with-message-dir=PATH path to message files [[PKGCONF/msg]]],
-               msg_dir="$withval"
-               if test x"$msg_dir" = "x"; then
-                       msg_dir="${PKGCONFDIR}/msg"
-               fi
-               AC_DEFINE_UNQUOTED(SERVERTEXT, "$msg_dir",
-                       [path to message dir [[PKGCONF/msg]]])
-               SERVERTEXT="$msg_dir"
-               AC_SUBST(SERVERTEXT)
-)
-
 dnl Check for optional server location protocol support (used by MacOS X)
 NETATALK_SRVLOC
 
@@ -509,7 +539,12 @@ dnl ----- NetBSD specific -----
 if test x"$this_os" = "xnetbsd"; then 
        AC_MSG_RESULT([ * NetBSD specific configuration])
        AC_DEFINE(BSD4_4)
-       AC_DEFINE(DLSYM_PREPEND_UNDERSCORE)
+       if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+               # NetBSD ELF machines don't have to have DLSYM_PREPEND_UNDERSCORE.
+               # If this test is true, it's not an ELF box.
+               # This REALLY should be a configure test.
+               AC_DEFINE(DLSYM_PREPEND_UNDERSCORE)
+       fi
        CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS"
        need_dash_r=yes