]> arthur.barton.de Git - netatalk.git/blobdiff - configure.in
Changed macro name from AM_PATH_SSL to AC_PATH_SSL.
[netatalk.git] / configure.in
index 866f72a2fcb1654c66624907d93be61794a437a8..09cabdadf380b6485aacdcc2d5b81e521220e1c7 100644 (file)
@@ -1,6 +1,65 @@
-dnl $Id: configure.in,v 1.76 2001-05-22 19:13:36 rufustfirefly Exp $
+dnl $Id: configure.in,v 1.119 2001-10-27 13:07:16 srittau Exp $
 dnl configure.in for netatalk
 
+dnl Check for SSL
+AC_DEFUN([AC_PATH_SSL], [
+       tryssl=yes
+
+       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
+                       else
+                               tryssl=no
+                       fi
+               ]
+       )
+
+       SSL_CFLAGS=""
+       SSL_LIBS=""
+       compile_ssl=no
+
+       if test "$tryssl" = "yes"; then
+               AC_MSG_CHECKING([for SSL])
+               for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl /usr/local/ssl ; do
+                       if test -f "$ssldir/include/openssl/cast.h" ; then
+                               SSL_CFLAGS="$SSL_CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
+                               SSL_LIBS="$SSL_LIBS -L$ssldir/lib -L$ssldir -lcrypto"
+                               if test "$need_dash_r" = "yes"; then
+                                       SSL_LIBS="$SSL_LIBS -R$ssldir/lib -R$ssldir"
+                               fi
+                               AC_MSG_RESULT([$ssldir (enabling RANDNUM and DHX support)])
+
+                               dnl Check for the crypto library:
+                               AC_CHECK_LIB(crypto, main)
+                               dnl Check for "DES" library (for SSLeay, not openssl):
+                               AC_CHECK_LIB(des, main)
+
+                               dnl FIXME: do that temporarily
+                               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
+
+                               AC_DEFINE(OPENSSL_DHX,  1)
+                               AC_DEFINE(UAM_DHX,      1)
+                               compile_ssl=yes
+                               break
+                       fi
+               done
+               if test "x$compile_ssl" = "xno"; then
+                       AC_MSG_RESULT([no])
+               fi
+       fi
+       AC_SUBST(SSL_CFLAGS)
+       AC_SUBST(SSL_LIBS)
+])
+
+
+
 AC_INIT(bin/adv1tov2/adv1tov2.c)
 
 NETATALK_VERSION=`cat VERSION`
@@ -9,7 +68,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)
@@ -20,7 +78,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
@@ -42,8 +101,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:
@@ -85,7 +142,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/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 errno.h sys/errno.h security/pam_appl.h)
 AC_CHECK_HEADER(sys/cdefs.h,,
        AC_MSG_RESULT([enabling generic cdefs.h from tree])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
@@ -130,7 +187,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 --------------------------------------------------------------------------
@@ -140,7 +197,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,43 +205,47 @@ 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])
        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=DIR   obsolete - use --with-pkgconfdir],
+               sysconfdir="$withval",
+               if test "x$prefix" = "xNONE"; then
+                       sysconfdir="$ac_default_prefix/etc"
+               else
+                       sysconfdir="${prefix}/etc"
+               fi
 )
 
-AC_ARG_WITH(config-dir,
-       [  --with-config-dir=path  path to config files [default=$ac_default_prefix/etc]],
-               config_dir="$withval",
-               config_dir="${prefix}/etc"
+AC_ARG_WITH(pkgconfdir,
+       [  --with-pkgconfdir=DIR   package specific configuration in DIR
+                          [[SYSCONF/netatalk]]],
+               PKGCONFDIR="$withval",
+               PKGCONFDIR="${sysconfdir}/netatalk"
 )
 
 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,
@@ -227,57 +288,151 @@ 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(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])
+dnl Don't use DB3 unless it's needed
+db3_required=no
+
+dnl Check for CNID DB support
+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"
+
+               dnl Note that we don't AC_DEFINE(CNID_DB, 1) here...
+               dnl we have to check for the library first.
+               dnl AC_MSG_RESULT([db3 check enabled])
+       fi
+)
+
+dnl Check for Berkeley DB3 library
+AC_ARG_WITH(db3,
+       [  --with-db3=PATH         specify path to Berkeley DB3 installation],
+       if test "x$withval" != "xno"; then
+               trydb3dir="$withval"
+       fi
+)
+
+db3_found=no
+for db3dir in "" $trydb3dir "$trydb3dir/include" /usr/local/BerkeleyDB.3.3/include /usr/include/db3  /usr/local/include/db3 ; do
+       if test -f "$db3dir/db.h" ; then
+               db3libdir="`echo $db3dir | sed 's/include\/db3$/lib/'`"
+               db3libdir="`echo $db3libdir | sed 's/include$/lib/'`"
+               LDFLAGS="$LDFLAGS -L$db3libdir"
+               CFLAGS="$CFLAGS -I$db3dir"
+
+               dnl If we require DB3, die if we don't have it
+               if test "x$db3_required" != "xno"; then
+                       AC_CHECK_LIB(db, main,
+                               dnl AC_MSG_RESULT([enabling db3 support])
+                               db3_found=yes
+                               dnl -- also enable CNID DB when this is found
+                               AC_DEFINE(CNID_DB, 1)
+                               AC_MSG_RESULT([using persistent cnid database per volume])
+                               LIBS="$LIBS -ldb",
+                               dnl Not Found
+                               AC_MSG_ERROR([Berkeley DB3 library not found!])
+                       )
+               fi
+               break
+       fi
+done
+
+dnl Die if the library is required, but not found
+if test "x$db3_required" != "xno"; then
+       if test "x$db3_found" = "xno"; then
+               dnl Not Found
+               AC_MSG_ERROR([Berkeley DB3 library not found!])
+       fi
+fi
+
+AC_ARG_WITH(did,
+       [  --with-did=SCHEME       set DID scheme (last,mtab)],
+       if test "x$withval" != "xno" ; 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
+                       AC_DEFINE(DID_MTAB, 1)
+                       AC_MSG_RESULT([enabling mtab-based DID creation support])
+               fi
        fi
 )
 
 msg_dir=""
 AC_ARG_WITH(message-dir,
-       [  --with-msg-dir=path     path to message files [default=$ac_default_prefix/etc/msg]],
+       [  --with-msg-dir=PATH     path to message files [[PKGCONF/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_default_prefix/etc/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)
 
+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
+                       LDFLAGS="$LDFLAGS -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_MSG_CHECKING([whether PAM support should be enabled])
 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
+    [  --with-pam              enable PAM support],
+    [PAM_MSG="$withval"],
+    [PAM_MSG="yes"]
 )
+AC_MSG_RESULT($PAM_MSG)
+use_pam_so=yes
+compile_pam=yes
+
+if test "x$PAM_MSG" = "xyes"; then
+       if test "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
+        
+               AC_CHECK_LIB(pam, pam_set_item, 
+                               [PAPD_LIBS="$PAPD_LIBS -lpam"; AFPD_LIBS="$AFPD_LIBS -lpam"; use_pam_so=yes; compile_pam=yes; AC_DEFINE(USE_PAM)],
+                       [use_pam_so=no; compile_pam=no]
+               )
+       fi
+else
+       use_pam_so=no
+       compile_pam=no
+fi
 
-shadowpw=no
+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])
-       AC_DEFINE(SHADOWPW)
-       shadowpw=yes
+       [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],
@@ -287,11 +442,16 @@ AC_ARG_ENABLE(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],
@@ -327,19 +487,19 @@ AC_ARG_ENABLE(cobalt,
 )
 
 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],
-       if test "$enableval" = "yes"; then
-               compile_timelord=yes
-       fi
-       AC_MSG_RESULT([enabling timelord compilation])
+       [compile_timelord="$enableval"],
+       [compile_timelord="no"]
 )
+AC_MSG_RESULT([$compile_timelord])
 
 AC_ARG_WITH(uams-path,
-       [  --with-uams-path=path   path to UAMs [default=$ac_default_prefix/etc/uams]],
+       [  --with-uams-path=PATH   path to UAMs [[PKGCONF/uams]]],
        uams_path="$withval",
-       uams_path="${config_dir}/uams"
+       uams_path="${PKGCONFDIR}/uams"
 )
 
 dnl --------------------------------------------------------------------------
@@ -350,7 +510,8 @@ AC_ARG_ENABLE(fhs,
        [  --enable-fhs            use Filesystem Hierarchy Standard (FHS) compatibility],
        if test "$enableval" = "yes"; then
                uams_path="/usr/lib/netatalk"
-               config_dir="/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,16 +523,9 @@ dnl --------------------------------------------------------------------------
 dnl post-FHS substitutions, etc
 dnl --------------------------------------------------------------------------
 
-dnl ***** CONFIG_DIR
-AC_DEFINE_UNQUOTED(CONFIG_DIR, "${config_dir}",
-       [path to config dir [default=$ac_default_prefix/etc]])
-CONFIG_DIR="${config_dir}"
-AC_SUBST(CONFIG_DIR)
-AC_MSG_RESULT([setting configuration files location to $CONFIG_DIR])
-
-***** UAMS_PATH
+dnl ***** UAMS_PATH
 AC_DEFINE_UNQUOTED(UAMS_PATH, "${uams_path}",
-       [path to UAMs [default=$ac_default_prefix/etc/uams]])
+       [path to UAMs [default=PKGCONF/uams]])
 UAMS_PATH="${uams_path}"
 AC_SUBST(UAMS_PATH)
 
@@ -389,7 +543,10 @@ 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 ;;
        *netbsd*)                       this_os=netbsd ;;
@@ -407,6 +564,17 @@ 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])
@@ -415,6 +583,22 @@ 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 -----
+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 -----
@@ -425,9 +609,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
@@ -464,7 +649,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
@@ -484,9 +669,6 @@ if test x"$this_os" = "xnetbsd"; then
 
        dnl ----- NetBSD does not have crypt.h, uses unistd.h -----
        AC_DEFINE(UAM_DHX, 1)
-       AC_DEFINE(UAM_RNDNUM, 1)
-       compile_dhx=yes
-       compile_ssl=yes
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -501,9 +683,6 @@ if test x"$this_os" = "xopenbsd"; then
 
        dnl ----- OpenBSD does not have crypt.h, uses unistd.h -----
        AC_DEFINE(UAM_DHX, 1)
-       AC_DEFINE(UAM_RNDNUM, 1)
-       compile_dhx=yes
-       compile_ssl=yes
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -543,40 +722,8 @@ if test x"$this_os" = "xtru64"; then
        LDSHAREDFLAGS="-shared"
 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
-               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 /usr/local/ssl ; 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 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)
-               AC_DEFINE(UAM_RNDNUM,   1)
-               compile_dhx=yes
-               compile_ssl=yes
-               AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"])
-               break
-       fi
-done
+dnl -- look for openssl
+AC_PATH_SSL
 
 dnl --------------------- check for building PGP UAM module
 
@@ -591,21 +738,43 @@ 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 --------------------- overwrite the config files . . . or not.
+
+AC_MSG_CHECKING([whether configuration files should be overwritten])
+AC_ARG_ENABLE(overwrite,
+       [  --enable-overwrite      overwrite configuration files],
+       [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(COMPILE_TIMELORD, test x$compile_timelord = xyes)
-AM_CONDITIONAL(USE_DHX, test x$compile_dhx = 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)
@@ -653,6 +822,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
@@ -665,7 +835,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_*]
 )