implemented Sebastian Rittau's change to avoid overwriting AppleDouble headers

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index f1ea9033d42a8c5016be802d675713a2ad8ab169..8b73e9c1861ca930d3f749ea0283df292e082324 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,4 @@
+dnl $Id: configure.in,v 1.79 2001-05-31 18:42:58 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -8,7 +9,6 @@ AC_SUBST(NETATALK_VERSION)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(netatalk, ${NETATALK_VERSION})
 AM_CONFIG_HEADER(config.h)
-AM_PROG_LIBTOOL
 
 dnl Reset locations to proper places
 AC_PREFIX_DEFAULT(/usr/local)
@@ -19,7 +19,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
 
 dnl *********************************************************************
 dnl FIXME! FIXME! These should be selectable properly, and should produce
@@ -84,7 +84,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 syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.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)
 AC_CHECK_HEADER(sys/cdefs.h,,
        AC_MSG_RESULT([enabling generic cdefs.h from tree])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
@@ -141,8 +141,8 @@ AC_DEFINE(ADMIN_GRP, 1)
 AC_ARG_WITH(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])
+               AC_DEFINE(ADMIN_GRP, 0)
+               AC_MSG_RESULT([disabling administrative group support])
         fi
  )
 
@@ -154,15 +154,6 @@ AC_ARG_ENABLE(afs,
        fi
 )
 
-AC_ARG_WITH(auth-printing-dir,
-       [  --with-auth-printing-dir=path
-              path to authenticated printing directory],
-               cap_dir="$withval"
-               AC_DEFINE_UNQUOTED(CAPDIR, "$cap_dir")
-               AC_DEFINE(USE_CAP)
-               AC_MSG_RESULT([enabling authenticated printing support]),
-)
-
 AC_ARG_WITH(config-dir,
        [  --with-config-dir=path  path to config files [default=$ac_default_prefix/etc]],
                config_dir="$withval",
@@ -279,7 +270,7 @@ AC_ARG_WITH(shadow,
 )
 
 AC_ARG_ENABLE(shell-check,
-       [  --disable-shell-check   disable checking for a valid shell]
+       [  --disable-shell-check   disable checking for a valid shell],
        if test "$enableval" = "no"; then 
                AC_DEFINE(DISABLE_SHELLCHECK, 1)
                AC_MSG_RESULT([disabling valid shell check])
@@ -294,16 +285,16 @@ AC_ARG_WITH(flock-locks,
 
 AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     enable TCP wrappers support],
-       AC_CHECK_LIB(wrap, hosts_access,
+       AC_CHECK_LIB(wrap, tcpd_warn,
                AC_DEFINE(TCPWRAP)
-               LIBS="$LIBS -lwrap"
+               AFPD_LIBS="$AFPD_LIBS -lwrap"
                AC_MSG_RESULT([enabling TCP wrappers support])
        )
 )
 
 AC_ARG_ENABLE(redhat,
        [  --enable-redhat         use redhat-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                sysv_style=redhat
        fi
        AC_MSG_RESULT([enabling redhat-style sysv support])
@@ -311,7 +302,7 @@ AC_ARG_ENABLE(redhat,
 
 AC_ARG_ENABLE(suse,
        [  --enable-suse           use suse-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                sysv_style=suse
        fi
        AC_MSG_RESULT([enabling suse-style sysv support])
@@ -319,12 +310,22 @@ AC_ARG_ENABLE(suse,
 
 AC_ARG_ENABLE(cobalt,
        [  --enable-cobalt         use cobalt-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                sysv_style=cobalt
        fi
        AC_MSG_RESULT([enabling cobalt-style sysv support])
 )
 
+dnl ----- timelord compilation (disabled by default)
+compile_timelord=no
+AC_ARG_ENABLE(timelord,
+       [  --enable-timelord       enable compilation of timelord server],
+       if test "$enableval" = "yes"; then
+               compile_timelord=yes
+       fi
+       AC_MSG_RESULT([enabling timelord compilation])
+)
+
 AC_ARG_WITH(uams-path,
        [  --with-uams-path=path   path to UAMs [default=$ac_default_prefix/etc/uams]],
        uams_path="$withval",
@@ -337,7 +338,7 @@ dnl --------------------------------------------------------------------------
 
 AC_ARG_ENABLE(fhs,
        [  --enable-fhs            use Filesystem Hierarchy Standard (FHS) compatibility],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                uams_path="/usr/lib/netatalk"
                config_dir="/etc/netatalk"
                use_pam_so=yes
@@ -518,10 +519,11 @@ if test x"$this_os" = "xtru64"; then
        AC_MSG_RESULT([ * Tru64 specific configuration])
        AC_DEFINE(NO_DDP)
        AC_DEFINE(HAVE_64BIT_LONGS)
-       AC_DEFINE(USE_MOUNT_H)
+       dnl AC_DEFINE(USE_MOUNT_H)
        AC_DEFINE(USE_OLD_RQUOTA)
-       AC_DEFINE(USE_UFS_QUOTA_H)
+       dnl AC_DEFINE(USE_UFS_QUOTA_H)
        AC_DEFINE(TRU64)
+       AC_CHECK_LIB(security,set_auth_parameters)
        CFLAGS="-I\$(top_srcdir)/sys/tru64 $CFLAGS"
        LDSHAREDFLAGS="-shared -expect_unresolved \*"
        need_dash_r=no
@@ -536,7 +538,7 @@ AC_ARG_WITH(ssl-dir,
        [  --with-ssl-dir=PATH     specify path to openssl installation (must contain
                           lib and include dirs) ],
        [
-               if test "x$withval" != "$xno"; then
+               if test "x$withval" != "xno"; then
                        tryssldir=$withval
                fi
        ]
@@ -582,9 +584,14 @@ AC_ARG_ENABLE(pgp-uam,
 dnl --------------------- last minute substitutions
 
 AC_SUBST(LIBS)
+AC_SUBST(AFPD_LIBS)
+AC_SUBST(PAPD_LIBS)
+
 AC_SUBST(CFLAGS)
 AC_SUBST(LDSHAREDFLAGS)
+
 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)
@@ -611,6 +618,7 @@ AC_OUTPUT([Makefile
        bin/psorder/Makefile
        config/Makefile
        contrib/Makefile
+       contrib/macusers/Makefile
        contrib/nu/Makefile
        contrib/printing/Makefile
        contrib/shell_utils/Makefile