Revert 1.10. This was pointless anyway.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index e7f7a71d9624d38e055370fb884ab5e85a42e86d..9136a3e61a8316d319c7e7d6b936d3567538ea9e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.134 2001-11-28 01:02:21 srittau Exp $
+dnl $Id: configure.in,v 1.142 2001-12-14 23:01:47 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -36,8 +36,6 @@ dnl Replace `main' with a function in -lauth:
 AC_CHECK_LIB(auth, main)
 dnl Replace `main' with a function in -lcmd:
 AC_CHECK_LIB(cmd, main)
-dnl Replace `main' with a function in -lcom_err:
-AC_CHECK_LIB(com_err, main)
 dnl Replace `main' with a function in -lcrypt:
 AC_CHECK_LIB(crypt, main)
 dnl Replace `main' with a function in -ld:
@@ -56,10 +54,6 @@ dnl Replace `main' with a function in -lnsl:
 AC_CHECK_LIB(nsl, main)
 dnl Replace `main' with a function in -lprot:
 AC_CHECK_LIB(prot, main)
-dnl Replace `main' with a function in -lresolv:
-AC_CHECK_LIB(resolv, main)
-dnl Replace `main' with a function in -lrpcsvc:
-AC_CHECK_LIB(rpcsvc, main)
 dnl Replace `main' with a function in -lrx:
 AC_CHECK_LIB(rx, main)
 dnl Replace `main' with a function in -lrxkad:
@@ -89,24 +83,6 @@ AC_CHECK_HEADER(sys/cdefs.h,,
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
 )
 
-# Allow user to specify flags
-AC_ARG_WITH(cflags,
-       [  --with-cflags           specify additional flags to pass to compiler],
-       [
-               if test "x$withval" != "xno" ; then
-                       CFLAGS="$CFLAGS $withval"
-               fi
-       ]       
-)
-AC_ARG_WITH(libs,
-       [  --with-libs             specify additional libraries to link with],
-       [
-               if test "x$withval" != "xno" ; then
-                       LIBS="$LIBS $withval"
-               fi
-       ]
-)
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_UID_T
@@ -241,7 +217,7 @@ 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([inode-based hashing])
+       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])
@@ -252,12 +228,16 @@ elif test "x$did_scheme" = "xcnid"; then
 else
        AC_MSG_ERROR([unknown DID scheme])
 fi
+AM_CONDITIONAL(COMPILE_CNID, test "x$did_scheme" = "xcnid")
 
 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 Check for quota support
+AC_CHECK_QUOTA
+
 msg_dir=""
 AC_ARG_WITH(message-dir,
        [  --with-message-dir=PATH path to message files [[PKGCONF/msg]]],
@@ -391,7 +371,7 @@ AC_ARG_ENABLE(fhs,
                sysconfdir="/etc"
                PKGCONFDIR=${sysconfdir}/netatalk
                use_pam_so=yes
-               dnl FIXME: NEED TO HAVE --mandir=/usr/share/man AT SOME POINT...
+               mandir="/usr/share/man"
                AC_DEFINE(FHS_COMPATIBILITY)
        fi
        AC_MSG_RESULT([enabling Filesystem Hierarchy Standard (FHS) compatibility])
@@ -651,6 +631,7 @@ AC_OUTPUT([Makefile
        bin/aecho/Makefile
        bin/afile/Makefile
        bin/afppasswd/Makefile
+       bin/cnid/Makefile
        bin/getzones/Makefile
        bin/megatron/Makefile
        bin/nbp/Makefile