CNID/DID patch from Uwe Hees (moderately tested)

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 431bca331da8f1c6d51c7054a2ffe391b9ee2744..4889aa00c9943ad75b541c1eab74728e9961f47c 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.96 2001-08-14 14:00:08 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])
@@ -158,11 +158,16 @@ AC_ARG_ENABLE(afs,
 AC_ARG_WITH(config-dir,
        [  --with-config-dir=DIR   obsolete - use --pkgconfdir],
                sysconfdir="$withval",
-               sysconfdir="${prefix}/etc"
+               if test "x$prefix" = "xNONE"; then
+                       sysconfdir="$ac_default_prefix/etc"
+               else
+                       sysconfdir="${prefix}/etc"
+               fi
 )
 
 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"
 )
@@ -226,20 +231,28 @@ AC_ARG_ENABLE(dropkludge,
 
 AC_ARG_ENABLE(force-uidgid,
        [  --enable-force-uidgid   allow forcing of uid/gid per volume (BROKEN) ],
-       if test "$enableval" = "yes"; then 
+       if test "$enableval" = "yes"; then
                AC_DEFINE(FORCE_UIDGID, 1)
                AC_MSG_RESULT([enabling forcing of uid/gid per volume])
        fi
 )
 
+AC_ARG_ENABLE(cnid-db,
+       [  --enable-cnid-db   use persistent cnid database per volume (EXPERIMENTAL) ],
+       if test "$enableval" = "yes"; then
+               AC_DEFINE(CNID_DB, 1)
+               AC_MSG_RESULT([using persistent cnid database per volume])
+       fi
+)
+
 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 
+               if test "$withval" = "last"; then
                        AC_DEFINE(USE_LASTDID, 1)
                        AC_MSG_RESULT([enabling build without DID dev/inode mapping kludge])
                fi
-               if test "$withval" = "mtab"; then 
+               if test "$withval" = "mtab"; then
                        AC_DEFINE(DID_MTAB, 1)
                        AC_MSG_RESULT([enabling mtab-based DID creation support])
                fi
@@ -251,7 +264,7 @@ AC_ARG_WITH(message-dir,
        [  --with-msg-dir=path     path to message files [default=$ac_prefix_default/etc/msg]],
                msg_dir="$withval"
                if test x"$msg_dir" = "x"; then
-                       msg_dir="${prefix}/etc/msg"
+                       msg_dir="${PKGCONFDIR}/msg"
                fi
                AC_DEFINE_UNQUOTED(SERVERTEXT, "$msg_dir",
                        [path to message dir [default=$ac_prefix_default/etc/msg]])
@@ -270,11 +283,11 @@ AC_ARG_WITH(pam,
        compile_pam=no
        use_pam_so=no
        AC_DEFINE(USE_PAM, 0)
-       AC_MSG_RESULT([Disabling pam modules support])
+       AC_MSG_RESULT([disabling pam modules support])
 )
 if test "x$compile_pam" = "xyes"; then
        use_pam_so=yes
-       AC_MSG_RESULT([Enabling pam modules support])
+       AC_MSG_RESULT([enabling pam modules support])
 fi
 
 shadowpw=no
@@ -455,19 +468,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.
@@ -630,6 +635,17 @@ AC_ARG_ENABLE(pgp-uam,
        fi
 )
 
+dnl --------------------- check for building Kerberos v4 UAM module
+
+AC_ARG_ENABLE(krb4-uam,
+       [  --enable-krb4-uam      enable build of Kerberos v4 UAM module],
+       if test "$enableval" = "yes"; then
+               AC_DEFINE(UAM_KRB4, 1)
+               compile_kerberos=yes
+               AC_MSG_RESULT([enabling build with Kerberos v4 UAM module])
+       fi
+)
+
 dnl --------------------- last minute substitutions
 
 AC_SUBST(LIBS)
@@ -695,6 +711,7 @@ AC_OUTPUT([Makefile
        libatalk/adouble/Makefile
        libatalk/asp/Makefile
        libatalk/atp/Makefile
+       libatalk/cnid/Makefile
        libatalk/compat/Makefile
        libatalk/dsi/Makefile
        libatalk/nbp/Makefile
@@ -707,7 +724,14 @@ AC_OUTPUT([Makefile
        man/man5/Makefile
        man/man8/Makefile
        sys/Makefile
+       sys/generic/Makefile
+       sys/generic/sys/Makefile
        sys/netatalk/Makefile
+       sys/netbsd/Makefile
+       sys/netbsd/netatalk/Makefile
+       sys/solaris/Makefile
+       sys/sunos/Makefile
+       sys/ultrix/Makefile
        ],
        [chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_*]
 )