CNID/DID patch from Uwe Hees (moderately tested)

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index d99f6c88ef51bbc92f236c7871cbff8585661523..4889aa00c9943ad75b541c1eab74728e9961f47c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.85 2001-06-11 20:36:10 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)
@@ -19,6 +19,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 
 dnl *********************************************************************
@@ -84,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)
+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"
@@ -139,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])
@@ -147,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])
@@ -155,9 +156,20 @@ AC_ARG_ENABLE(afs,
 )
 
 AC_ARG_WITH(config-dir,
-       [  --with-config-dir=path  path to config files [default=$ac_prefix_default/etc]],
+       [  --with-config-dir=DIR   obsolete - use --pkgconfdir],
                sysconfdir="$withval",
-               sysconfdir="${prefix}/etc/netatalk"
+               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]],
+               PKGCONFDIR="$withval",
+               PKGCONFDIR="${sysconfdir}/netatalk"
 )
 
 AC_ARG_WITH(cracklib,
@@ -219,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(did,
-       [  --with-did=[scheme]      set DID scheme (last,mtab)],
+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)],
        if test "x$withval" != "xno" ; then
-               if test "$withval" = "lastdid"; 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
@@ -244,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]])
@@ -257,17 +277,18 @@ AC_CHECK_LIB(pam, pam_start,
        LIBS="$LIBS -lpam"
        compile_pam=yes
 )
-AM_CONDITIONAL(BUILD_PAM, test x$compile_pam = xyes)
 
 AC_ARG_WITH(pam,
-       [  --with-pam              enable password authentication modules support],
-       if test "x$compile_pam" = "xyes"; then
-               use_pam_so=yes
-               AC_MSG_RESULT([enabling pam modules support])
-       else
-               AC_MSG_RESULT([pam libraries not found. Disabling pam modules support])
-       fi
+       [  --without-pam           disable password authentication modules support],
+       compile_pam=no
+       use_pam_so=no
+       AC_DEFINE(USE_PAM, 0)
+       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])
+fi
 
 shadowpw=no
 AC_ARG_WITH(shadow,
@@ -335,9 +356,9 @@ AC_ARG_ENABLE(timelord,
 )
 
 AC_ARG_WITH(uams-path,
-       [  --with-uams-path=path   path to UAMs [default=$ac_prefix_default/etc/uams]],
+       [  --with-uams-path=path   path to UAMs [default=PKGCONF/uams]],
        uams_path="$withval",
-       uams_path="${sysconfdir}/uams"
+       uams_path="${PKGCONFDIR}/uams"
 )
 
 dnl --------------------------------------------------------------------------
@@ -348,7 +369,8 @@ AC_ARG_ENABLE(fhs,
        [  --enable-fhs            use Filesystem Hierarchy Standard (FHS) compatibility],
        if test "$enableval" = "yes"; then
                uams_path="/usr/lib/netatalk"
-               sysconfdir="/etc/netatalk"
+               sysconfdir="/etc"
+               PKGCONFDIR=${sysconfdir}/netatalk
                use_pam_so=yes
                dnl FIXME: NEED TO HAVE --mandir=/usr/share/man AT SOME POINT...
                AC_DEFINE(FHS_COMPATIBILITY)
@@ -362,7 +384,7 @@ dnl --------------------------------------------------------------------------
 
 ***** UAMS_PATH
 AC_DEFINE_UNQUOTED(UAMS_PATH, "${uams_path}",
-       [path to UAMs [default=$ac_prefix_default/etc/uams]])
+       [path to UAMs [default=PKGCONF/uams]])
 UAMS_PATH="${uams_path}"
 AC_SUBST(UAMS_PATH)
 
@@ -420,6 +442,7 @@ if test x"$this_os" = "xfreebsd"; then
 
        dnl ----- Set -shared flag
        LDSHAREDFLAGS="-shared"
+       AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
 dnl ----- HP-UX 11 specific -----
@@ -445,9 +468,10 @@ if test x"$this_os" = "xlinux"; then
        LDSHAREDFLAGS="-shared"
 
        dnl ----- check if we need the quotactl wrapper
-       AC_CHECK_HEADER(sys/quota.h,,
-               AC_MSG_RESULT([enabling quotactl wrapper])
+       AC_CHECK_HEADERS(sys/quota.h linux/quota.h)
+       AC_CHECK_FUNC(quotactl,,
                AC_DEFINE(NEED_QUOTACTL_WRAPPER)
+               AC_MSG_RESULT([enabling quotactl wrapper])
        )
 
        dnl ----- as far as I can tell, dbtob always does the wrong thing
@@ -484,7 +508,7 @@ if test x"$this_os" = "xmacosx"; then
        AC_DEFINE(BSD4_4)
        AC_DEFINE(HAVE_BROKEN_CPP)
        AC_DEFINE(HAVE_2ARG_DBTOB)
-       AC_DEFINE(NO_DLFCN_H)
+       dnl AC_DEFINE(NO_DLFCN_H)
        AC_DEFINE(MACOSX_SERVER)
 
        dnl ----- Set -shared flag
@@ -611,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)
@@ -620,12 +655,15 @@ AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
 AC_SUBST(LDSHAREDFLAGS)
 
+AC_SUBST(PKGCONFDIR)
+
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
 AM_CONDITIONAL(USE_DHX, test x$compile_dhx = xyes)
 AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes)
 AM_CONDITIONAL(USE_PAM_SO, test x$use_pam_so = xyes)
 AM_CONDITIONAL(USE_PAM, test x$compile_pam = xyes)
+AM_CONDITIONAL(BUILD_PAM, test x$compile_pam = xyes)
 AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes)
 AM_CONDITIONAL(USE_COBALT, test x$sysv_style = xcobalt)
 AM_CONDITIONAL(USE_REDHAT, test x$sysv_style = xredhat)
@@ -673,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
@@ -685,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_*]
 )