]> arthur.barton.de Git - netatalk.git/blobdiff - configure.in
Forward-Ports from the stabilizing branch.
[netatalk.git] / configure.in
index 3b164c00fe99ca3779a2f2b47cd9ec3d443d3357..f94535c4cbb2282c96afceca0cb9c991e288b1cb 100644 (file)
@@ -1,3 +1,4 @@
+dnl $Id: configure.in,v 1.132 2001-11-25 21:48:01 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -8,10 +9,9 @@ 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)
+AC_PREFIX_DEFAULT(/usr/local)
 
 dnl Checks for programs.
 AC_PROG_AWK
@@ -19,7 +19,8 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+AC_LIBTOOL_DLOPEN
+AM_PROG_LIBTOOL
 
 dnl *********************************************************************
 dnl FIXME! FIXME! These should be selectable properly, and should produce
@@ -41,8 +42,6 @@ dnl Replace `main' with a function in -lcrypt:
 AC_CHECK_LIB(crypt, main)
 dnl Replace `main' with a function in -ld:
 AC_CHECK_LIB(d, main)
-dnl Replace `main' with a function in -ldb:
-AC_CHECK_LIB(db, main)
 dnl Replace `main' with a function in -ldl:
 AC_CHECK_LIB(dl, main)
 dnl Replace `main' with a function in -lkauth:
@@ -84,7 +83,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/file.h sys/ioctl.h sys/time.h syslog.h unistd.h termios.h netdb.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 errno.h sys/errno.h)
 AC_CHECK_HEADER(sys/cdefs.h,,
        AC_MSG_RESULT([enabling generic cdefs.h from tree])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
@@ -129,7 +128,7 @@ AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_FUNC_UTIME_NULL
 AC_FUNC_WAIT3
-AC_CHECK_FUNCS(getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strstr strtoul setpgrp)
+AC_CHECK_FUNCS(flock getcwd gethostname gettimeofday getusershell mkdir rmdir select socket strdup strstr strtoul setpgrp strchr memcpy)
 AC_FUNC_SETPGRP
 
 dnl --------------------------------------------------------------------------
@@ -139,48 +138,45 @@ 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])
+               AC_DEFINE(ADMIN_GRP, 0)
+               AC_MSG_RESULT([disabling administrative group support])
         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_ENABLE(afs,
+       [  --enable-afs            enable AFS support],
+       if test "$enableval" = "yes"; then
+               AC_DEFINE(AFS, 1)
+               AC_MSG_RESULT([enabling AFS support])
+       fi
 )
 
-AC_ARG_WITH(config-dir,
-       [  --with-config-dir=path  path to config files [default=/etc/atalk]],
-               config_dir="$withval",
-               config_dir="/etc/atalk"
+AC_ARG_WITH(pkgconfdir,
+       [  --with-pkgconfdir=DIR   package specific configuration in DIR
+                          [[SYSCONF/netatalk]]],
+               PKGCONFDIR="$withval",
+               PKGCONFDIR="${sysconfdir}/netatalk"
 )
-AC_DEFINE_UNQUOTED(CONFIG_DIR, "$config_dir",
-       [path to config dir [default=/etc/atalk]])
-CONFIG_DIR="$config_dir"
-AC_SUBST(CONFIG_DIR)
-AC_MSG_RESULT([setting configuration files location to $CONFIG_DIR])
 
 AC_ARG_WITH(cracklib,
-       [  --with-cracklib=dict    enable/set location of cracklib dictionary],
-       cracklib="$withval"
-       AC_CHECK_LIB(crack, main,
-               AC_DEFINE(USE_CRACKLIB) 
-               LIBS="$LIBS -lcrack"
-               AC_MSG_RESULT([enabling cracklib support])
-               if test "$cracklib" = "yes"; then
-                       cracklib="/usr/lib/cracklib_dict"
-               fi
-               AC_DEFINE_UNQUOTED(_PATH_CRACKLIB, "$cracklib",
-                       [path to cracklib dictionary])
-               AC_MSG_RESULT([setting cracklib dictionary to $cracklib]),
-               AC_MSG_ERROR([cracklib not found!])
-       )
+       [  --with-cracklib=DICT    enable/set location of cracklib dictionary],
+       if test "x$withval" != "xno" ; then
+               cracklib="$withval"
+               AC_CHECK_LIB(crack, main,
+                       AC_DEFINE(USE_CRACKLIB) 
+                       LIBS="$LIBS -lcrack"
+                       AC_MSG_RESULT([enabling cracklib support])
+                       if test "$cracklib" = "yes"; then
+                               cracklib="/usr/lib/cracklib_dict"
+                       fi
+                       AC_DEFINE_UNQUOTED(_PATH_CRACKLIB, "$cracklib",
+                               [path to cracklib dictionary])
+                       AC_MSG_RESULT([setting cracklib dictionary to $cracklib]),
+                       AC_MSG_ERROR([cracklib not found!])
+               )
+       fi
 )
 
 AC_ARG_ENABLE(ddp,
@@ -222,111 +218,215 @@ AC_ARG_ENABLE(dropkludge,
 )
 
 AC_ARG_ENABLE(force-uidgid,
-       [  --enable-force-uidgid   allow forcing of uid/gid per volume (INSECURE?) ],
-       if test "$enableval" = "yes"; then 
+       [  --enable-force-uidgid   allow forcing of uid/gid per volume (BROKEN) ],
+       if test "$enableval" = "yes"; then
                AC_DEFINE(FORCE_UIDGID, 1)
                AC_MSG_RESULT([enabling forcing of uid/gid per volume])
        fi
 )
 
-AC_ARG_ENABLE(lastdid,
-       [  --enable-lastdid        enable build without DID dev/inode mapping kludge],
-       if test "$enableval" = "yes"; then 
-               AC_DEFINE(USE_LASTDID, 1)
-               AC_MSG_RESULT([enabling build without DID dev/inode mapping kludge])
-       fi
+dnl Don't use DB3 unless it's needed
+db3_required=no
+
+dnl Check for CNID DB support
+AC_MSG_CHECKING([whether CNID support should be enabled])
+AC_ARG_ENABLE(cnid-db,
+       [  --enable-cnid-db        use persistent cnid database per volume (EXPERIMENTAL) ],
+       [
+               if test "x$enableval" = "xyes"; then
+                       dnl Now we need DB3
+                       db3_required="yes"
+                       AC_DEFINE(CNID_DB)
+                       AC_MSG_RESULT([yes])
+               else
+                       AC_MSG_RESULT([no])
+               fi
+       ],[AC_MSG_RESULT([no])]
+)
+
+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 Determine DID scheme
+AC_MSG_CHECKING([for DID scheme to use])
+AC_ARG_WITH(did,
+       [  --with-did=SCHEME       set DID scheme (last,mtab)],
+       [ did_scheme="$withval" ],
+       [ did_scheme="last" ]
 )
 
+if test "x$did_scheme" = "xlast"; then
+       AC_DEFINE(USE_LASTDID, 1)
+       AC_MSG_RESULT([last])
+elif test "x$did_scheme" = "xmtab"; then
+       AC_DEFINE(DID_MTAB, 1)
+       AC_MSG_RESULT([mtab-based DID creation support])
+elif test "x$did_scheme" != "xno"; then
+       AC_MSG_RESULT([default])
+else
+       AC_MSG_ERROR([unknown DID scheme])
+fi
+
 msg_dir=""
 AC_ARG_WITH(message-dir,
-       [  --with-msg-dir=path     path to message files [default=/etc/atalk/msg]],
+       [  --with-message-dir=PATH path to message files [[PKGCONF/msg]]],
                msg_dir="$withval"
                if test x"$msg_dir" = "x"; then
-                       msg_dir="$CONFIG_DIR/msg"
+                       msg_dir="${PKGCONFDIR}/msg"
                fi
                AC_DEFINE_UNQUOTED(SERVERTEXT, "$msg_dir",
-                       [path to message dir [default=$CONFIG_DIR/msg]])
+                       [path to message dir [[PKGCONF/msg]]])
                SERVERTEXT="$msg_dir"
                AC_SUBST(SERVERTEXT)
 )
 
-AC_CHECK_LIB(pam, pam_start,
-       AC_DEFINE(USE_PAM, 1)
-       LIBS="$LIBS -lpam"
-       compile_pam=yes
+AC_ARG_ENABLE(srvloc,
+       [  --enable-srvloc         turn on Server Location Protocol support (EXPERIMENTAL)],
+       srvloc=$enableval,
+       srvloc=no
 )
-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
-)
+dnl Conditional for optional server location protocol support (used by OS X)
+AM_CONDITIONAL(USE_SRVLOC, test "x$srvloc" != "xno")
+if test "x$srvloc" != "xno"; then
+    for slpdir in "" $srvloc /usr /usr/local ; do
+               if test -f "$slpdir/include/slp.h" ; then
+                       LIBS="$LIBS -L$slpdir/lib -lslp"
+                       CFLAGS="$CFLAGS -I$slpdir/include"
+               AC_CHECK_LIB(slp,SLPOpen)
+               AC_CHECK_FUNCS(SLPReg SLPDereg SLPClose)
+               AC_DEFINE(USE_SRVLOC, 1)
+                       break
+               fi
+       done
+fi
 
+# Check for PAM libs
+AC_PATH_PAM([
+       PAPD_LIBS="$PAPD_LIBS $PAM_LIBS"
+       AFPD_LIBS="$AFPD_LIBS $PAM_LIBS"
+       use_pam_so=yes
+       compile_pam=yes
+       AC_DEFINE(USE_PAM)
+])
+
+AC_MSG_CHECKING([whether shadow support should be enabled])
 AC_ARG_WITH(shadow,
        [  --with-shadow           enable shadow password support],
-       AC_MSG_RESULT([enabling shadow password support])
+       [shadowpw="$withval"],
+       [shadowpw=no]
+)
+if test "x$shadowpw" = "xyes"; then
        AC_DEFINE(SHADOWPW)
+fi
+AC_MSG_RESULT([$shadowpw])
+
+AC_ARG_ENABLE(shell-check,
+       [  --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])
+       fi
 )
 
+AC_MSG_CHECKING([whether flock locks should be enabled])
 AC_ARG_WITH(flock-locks,
        [  --with-flock-locks      enable flock locks support],
-       AC_MSG_RESULT([enabling flock locks])
-       AC_DEFINE(USE_FLOCK_LOCKS)
+       [flock_locks="$withval"],
+       [flock_locks="no"]
 )
+if test "x$flock_locks" = "xyes"; then
+       AC_DEFINE(USE_FLOCK_LOCKS)
+fi
+AC_MSG_RESULT([$flock_locks])
 
 AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     enable TCP wrappers support],
-       AC_CHECK_LIB(wrap, main,
+       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
+       [  --enable-redhat         use redhat-style sysv configuration ],
+       if test "$enableval" = "yes"; then
                sysv_style=redhat
        fi
        AC_MSG_RESULT([enabling redhat-style sysv support])
 )
 
 AC_ARG_ENABLE(suse,
-       [  --enable-suse       use suse-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       [  --enable-suse           use suse-style sysv configuration ],
+       if test "$enableval" = "yes"; then
                sysv_style=suse
        fi
        AC_MSG_RESULT([enabling suse-style sysv support])
 )
 
 AC_ARG_ENABLE(cobalt,
-       [  --enable-cobalt     use cobalt-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       [  --enable-cobalt         use cobalt-style sysv configuration ],
+       if test "$enableval" = "yes"; then
                sysv_style=cobalt
        fi
        AC_MSG_RESULT([enabling cobalt-style sysv support])
 )
 
+dnl ----- timelord compilation (disabled by default)
+AC_MSG_CHECKING([whether timelord should be compiled])
+compile_timelord=no
+AC_ARG_ENABLE(timelord,
+       [  --enable-timelord       enable compilation of timelord server],
+       [compile_timelord="$enableval"],
+       [compile_timelord="no"]
+)
+AC_MSG_RESULT([$compile_timelord])
+
 AC_ARG_WITH(uams-path,
-       [  --with-uams-path=path   path to UAMs [default=/etc/atalk/uams]],
+       [  --with-uams-path=PATH   path to UAMs [[PKGCONF/uams]]],
        uams_path="$withval",
-       uams_path="$config_dir/uams"
+       uams_path="${PKGCONFDIR}/uams"
 )
-AC_DEFINE_UNQUOTED(UAMS_PATH, "$uams_path",
-       [path to UAMs [default=/etc/atalk/uams]])
-UAMS_PATH="$uams_path"
+
+dnl --------------------------------------------------------------------------
+dnl FHS stuff has to be done last because it overrides other defaults
+dnl --------------------------------------------------------------------------
+
+AC_ARG_ENABLE(fhs,
+       [  --enable-fhs            use Filesystem Hierarchy Standard (FHS) compatibility],
+       if test "$enableval" = "yes"; then
+               uams_path="/usr/lib/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)
+       fi
+       AC_MSG_RESULT([enabling Filesystem Hierarchy Standard (FHS) compatibility])
+)
+
+dnl --------------------------------------------------------------------------
+dnl post-FHS substitutions, etc
+dnl --------------------------------------------------------------------------
+
+dnl ***** UAMS_PATH
+AC_DEFINE_UNQUOTED(UAMS_PATH, "${uams_path}",
+       [path to UAMs [default=PKGCONF/uams]])
+UAMS_PATH="${uams_path}"
 AC_SUBST(UAMS_PATH)
 
 dnl --------------------------------------------------------------------------
 dnl drop in includes for top level directory structures here...
 dnl --------------------------------------------------------------------------
-LDFLAGS="$LDFLAGS -L\$(top_srcdir)/libatalk/"
-CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I\$(top_srcdir)/sys"
+
+dnl Note: $(top_srcdir)/include should be added before all other includes
+dnl       so that includes from that directory a preferred to includes from
+dnl       /usr/include or similar places.
+LIBS="$LIBS -L\$(top_srcdir)/libatalk"
+CFLAGS="-I\$(top_srcdir)/include $CFLAGS -I\$(top_srcdir)/sys"
 
 dnl --------------------------------------------------------------------------
 dnl specific configuration comes in here:
@@ -336,9 +436,13 @@ dnl ac_cv_target_os is now host_os, ac_cv_target_cpu is now host_cpu
 
 dnl --------------------- determine operating system from "target"
 case "$host_os" in
+       *aix*)                          this_os=aix ;;
        *freebsd*)                      this_os=freebsd ;;
+       *hpux11*)                       this_os=hpux11 ;;
+       *irix*)                         this_os=irix ;;
        *linux*)                        this_os=linux ;;
        *osx*)                          this_os=macosx ;;
+       *darwin*)                       this_os=macosx ;;
        *netbsd*)                       this_os=netbsd ;;
        *openbsd*)                      this_os=openbsd ;;
        *osf*)                          this_os=tru64 ;;
@@ -354,24 +458,72 @@ esac
 
 dnl --------------------- operating system specific flags (port from sys/*)
 
+dnl ----- AIX specific -----
+if test x"$this_os" = "xaix"; then
+       AC_MSG_RESULT([ * AIX specific configuration])
+       AC_DEFINE(NO_STRUCT_TM_GMTOFF)
+
+       dnl This is probably a lie; AIX 4.3 supports a 64-bit long
+       dnl compilation environment.  It's enough to get things defined
+       dnl right in endian.h provided that long long is supported, though.
+       AC_DEFINE(HAVE_32BIT_LONGS)
+fi
+
 dnl ----- FreeBSD specific -----
 if test x"$this_os" = "xfreebsd"; then 
        AC_MSG_RESULT([ * FreeBSD specific configuration])
        AC_DEFINE(BSD4_4)
        AC_DEFINE(SENDFILE_FLAVOR_BSD)
+
+       AC_DEFINE(NO_CRYPT_H, 1)
+fi
+
+dnl ----- HP-UX 11 specific -----
+if test x"$this_os" = "xhpux11"; then
+       AC_MSG_RESULT([ * HP-UX 11 specific configuration])
+
+       AC_DEFINE(_ISOC9X_SOURCE)
+       AC_DEFINE(NO_STRUCT_TM_GMTOFF)
+fi
+
+dnl ----- IRIX specific -----
+if test x"$this_os" = "xirix"; then
+       AC_MSG_RESULT([ * IRIX specific configuration])
+
+       AC_DEFINE(NO_STRUCT_TM_GMTOFF)
 fi
 
 dnl ----- Linux specific -----
 if test x"$this_os" = "xlinux"; then 
        AC_MSG_RESULT([ * Linux specific configuration])
-       AC_DEFINE(SENDFILE_FLAVOR_LINUX)
 
        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
+       dnl ----- on every single version of linux I've ever played with.
+       dnl ----- see etc/afpd/quota.c
+       AC_DEFINE(HAVE_BROKEN_DBTOB)
+
+       dnl --- added by Yoshinobu Ishizaki (2001.03.13) ---
+       dnl ----- check if version is newer than 2.2.x
+       changequote(<<,>>)
+       majorvers="`uname -r | sed 's/\([0-9]\)..*/\1/'`"
+       minorvers="`uname -r | sed 's/[0-9]\.\([0-9]\)\..*/\1/'`"
+       if [ $majorvers -ge 2 ]; then
+               if [ $minorvers -ge 2 ]; then
+                       changequote([,])
+                       AC_MSG_RESULT([ * found Linux 2.2.x or higher])
+                       AC_DEFINE(SENDFILE_FLAVOR_LINUX)
+               else
+                       AC_MSG_RESULT([ * found Linux 2.0.x ]) 
+               fi
+       fi
+
        dnl ----- Linux/alpha specific -----
        if test x"$this_cpu" = "xalpha"; then 
                AC_MSG_RESULT([enabling gcc memcpy bug workaround])
@@ -386,7 +538,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)
 fi
 
@@ -397,12 +549,21 @@ if test x"$this_os" = "xnetbsd"; then
        AC_DEFINE(DLSYM_PREPEND_UNDERSCORE)
        CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS"
        need_dash_r=yes 
+
+       dnl ----- NetBSD does not have crypt.h, uses unistd.h -----
+       AC_DEFINE(UAM_DHX, 1)
+       AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
 dnl ----- OpenBSD specific -----
 if test x"$this_os" = "xopenbsd"; then 
        AC_MSG_RESULT([ * OpenBSD specific configuration])
        AC_DEFINE(BSD4_4)
+       AC_DEFINE(DLSYM_PREPEND_UNDERSCORE)
+
+       dnl ----- OpenBSD does not have crypt.h, uses unistd.h -----
+       AC_DEFINE(UAM_DHX, 1)
+       AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
 dnl ----- Solaris specific -----
@@ -414,6 +575,7 @@ if test x"$this_os" = "xsolaris"; then
        AC_DEFINE(SOLARIS)
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
        need_dash_r=yes
+
        AC_MSG_RESULT([enabling Solaris kernel module build])
        solaris_module=yes
 fi
@@ -423,65 +585,73 @@ 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="-expect_unresolved \*"
        need_dash_r=no
        sysv_style=tru64
 fi
 
-dnl -- look for openssl  
-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
-                       tryssldir=$withval
+dnl -- look for openssl
+AC_PATH_SSL
+
+dnl --------------------- check for building PGP UAM module
+
+AC_ARG_ENABLE(pgp-uam,
+       [  --enable-pgp-uam        enable build of PGP UAM module],
+       if test "$enableval" = "yes"; then 
+               if test "$compile_ssl" = "yes"; then 
+                       AC_DEFINE(UAM_PGP, 1)
+                       compile_pgp=yes
+                       AC_MSG_RESULT([enabling build with PGP UAM module])
                fi
-       ]
+       fi
 )
 
-for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl/ /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
-       if test -f "$ssldir/include/openssl/cast.h" ; then
-               LDFLAGS="$LDFLAGS -L$ssldir/lib -L$ssldir"
-               CFLAGS="$CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
-               if test "$need_dash_r" = "yes"; then
-                       LIBS="$LIBS -R$ssldir/lib -R$ssldir"
-               fi
+dnl --------------------- check for building Kerberos v4 UAM module
 
-               dnl Check for the crypto library:
-               AC_CHECK_LIB(crypto, main)
-               dnl LIBS="$LIBS -lcrypto"
-               dnl Check for "DES" library (for SSLeay, not openssl):
-               AC_CHECK_LIB(des, main)
-
-               AC_DEFINE(OPENSSL_DHX,  1)
-               AC_DEFINE(UAM_DHX,      1)
-dnl            AC_DEFINE(UAM_PGP,      1)
-               AC_DEFINE(UAM_RNDNUM,   1)
-               use_pgp=no
-               compile_dhx=yes
-               AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"])
-               break
+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
-done
+)
+dnl --------------------- overwrite the config files . . . or not.
+
+AC_MSG_CHECKING([whether configuration files should be overwritten])
+AC_ARG_ENABLE(overwrite,
+       [  --enable-overwrite      overwrite configuration files during installation],
+       [OVERWRITE_CONFIG="${enable_overwrite}"],
+       [OVERWRITE_CONFIG="no"]
+)
+AC_MSG_RESULT([$OVERWRITE_CONFIG])
 
 dnl --------------------- last minute substitutions
 
 AC_SUBST(LIBS)
+AC_SUBST(AFPD_LIBS)
+AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
-AC_SUBST(LDSHAREDFLAGS)
+AC_SUBST(PKGCONFDIR)
+AC_SUBST(OVERWRITE_CONFIG)
+
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
-AM_CONDITIONAL(USE_DHX, test x$compile_dhx = xyes)
+AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
+AM_CONDITIONAL(USE_DHX, test x$compile_ssl = 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)
 AM_CONDITIONAL(USE_SUSE, test x$sysv_style = xsuse)
+AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
 AM_CONDITIONAL(USE_TRU64, test x$sysv_style = xtru64)
 
 dnl --------------------- generate files
@@ -499,6 +669,7 @@ AC_OUTPUT([Makefile
        bin/psorder/Makefile
        config/Makefile
        contrib/Makefile
+       contrib/macusers/Makefile
        contrib/nu/Makefile
        contrib/printing/Makefile
        contrib/shell_utils/Makefile
@@ -508,11 +679,13 @@ AC_OUTPUT([Makefile
        distrib/config/netatalk-config
        distrib/initscripts/Makefile
        distrib/m4/Makefile
+       doc/Makefile
        etc/Makefile
        etc/afpd/Makefile
        etc/afpd/nls/Makefile
        etc/atalkd/Makefile
        etc/uams/Makefile
+       etc/uams/uams_krb4/Makefile
        etc/papd/Makefile
        etc/psf/Makefile
        include/Makefile
@@ -521,11 +694,13 @@ AC_OUTPUT([Makefile
        libatalk/adouble/Makefile
        libatalk/asp/Makefile
        libatalk/atp/Makefile
+       libatalk/cnid/Makefile
        libatalk/compat/Makefile
        libatalk/dsi/Makefile
        libatalk/nbp/Makefile
        libatalk/netddp/Makefile
        libatalk/util/Makefile
+       macros/Makefile
        man/Makefile
        man/man1/Makefile
        man/man3/Makefile
@@ -533,7 +708,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_*]
 )