commenting changes, more autoconf support in afpd, etc

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 431bca331da8f1c6d51c7054a2ffe391b9ee2744..6a332041a2f2ff46066ada600229c65c48323137 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.91 2001-06-20 14:51:12 rufustfirefly Exp $
+dnl $Id: configure.in,v 1.92 2001-06-20 18:33:03 rufustfirefly Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -85,7 +85,7 @@ dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h)
+AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h dlfcn.h)
 AC_CHECK_HEADER(sys/cdefs.h,,
        AC_MSG_RESULT([enabling generic cdefs.h from tree])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
@@ -140,7 +140,7 @@ dnl --------------------------------------------------------------------------
 AC_DEFINE(ADMIN_GRP, 1)
 
 AC_ARG_WITH(admin-group,
-       [  --disable-admin-group  disable admin group],
+       [  --disable-admin-group   disable admin group],
         if test "$enableval" = "no"; then
                AC_DEFINE(ADMIN_GRP, 0)
                AC_MSG_RESULT([disabling administrative group support])
@@ -148,7 +148,7 @@ AC_ARG_WITH(admin-group,
  )
 
 AC_ARG_ENABLE(afs,
-       [  --enable-afs           enable AFS support],
+       [  --enable-afs            enable AFS support],
        if test "$enableval" = "yes"; then
                AC_DEFINE(AFS, 1)
                AC_MSG_RESULT([enabling AFS support])
@@ -162,7 +162,8 @@ AC_ARG_WITH(config-dir,
 )
 
 AC_ARG_WITH(pkgconfdir,
-       [  --with-pkgconfdir=DIR   package specific configuration in DIR [default=SYSCONF/netatalk]],
+       [  --with-pkgconfdir=DIR   package specific configuration in DIR
+                          [default=SYSCONF/netatalk]],
                PKGCONFDIR="$withval",
                PKGCONFDIR="${sysconfdir}/netatalk"
 )
@@ -233,7 +234,7 @@ AC_ARG_ENABLE(force-uidgid,
 )
 
 AC_ARG_WITH(did,
-       [  --with-did=[scheme]      set DID scheme (last,mtab)],
+       [  --with-did=[scheme]     set DID scheme (last,mtab)],
        if test "x$withval" != "xno" ; then
                if test "$withval" = "last"; then 
                        AC_DEFINE(USE_LASTDID, 1)
@@ -455,19 +456,11 @@ if test x"$this_os" = "xlinux"; then
        LDSHAREDFLAGS="-shared"
 
        dnl ----- check if we need the quotactl wrapper
-       AC_CHECK_HEADER(sys/quota.h,
-               sys_quota=yes,
-               sys_quota=no
-       )
-       AC_CHECK_HEADER(linux/quota.h,
-               linux_quota=yes,
-               linux_quota=no
-       )
-
-       if test "x$linux_quota" = "xno" -a "x$sys_quota" = "xno"; then
-               AC_MSG_RESULT([enabling quotactl wrapper])
+       AC_CHECK_HEADERS(sys/quota.h linux/quota.h)
+       AC_CHECK_FUNC(quotactl,,
                AC_DEFINE(NEED_QUOTACTL_WRAPPER)
-       fi
+               AC_MSG_RESULT([enabling quotactl wrapper])
+       )
 
        dnl ----- as far as I can tell, dbtob always does the wrong thing
        dnl ----- on every single version of linux I've ever played with.