Use new PAM macro.

DB3 cleanup.

Add *darwin* as alias for *macosx*.

Better DID=last message.

diff --git a/configure.in b/configure.in
index 19718c67eb1799d06015058d52f2c1d614647198..94620bcea9527ca08122e429f2991a4ba64a62b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.126.2.2 2001-11-23 07:34:58 srittau Exp $
+dnl $Id: configure.in,v 1.126.2.3 2001-11-25 21:34:24 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -83,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/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_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"
@@ -248,8 +248,6 @@ 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
-CFLAGS="$CFLAGS $DB3_CFLAGS"
-LIBS="$LIBS $DB3_LIBS"
 
 dnl Determine DID scheme
 AC_MSG_CHECKING([for DID scheme to use])
@@ -261,7 +259,7 @@ AC_ARG_WITH(did,
 
 if test "x$did_scheme" = "xlast"; then
        AC_DEFINE(USE_LASTDID, 1)
-       AC_MSG_RESULT([no DID dev/inode mapping kludge])
+       AC_MSG_RESULT([last])
 elif test "x$did_scheme" = "xmtab"; then
        AC_DEFINE(DID_MTAB, 1)
        AC_MSG_RESULT([mtab-based DID creation support])
@@ -306,28 +304,13 @@ if test "x$srvloc" != "xno"; then
 fi
 
 # Check for PAM libs
-AC_MSG_CHECKING([if we should even bother with PAM])
-AC_ARG_WITH(pam,
-    [  --with-pam              enable PAM support],
-    [PAM_MSG="$withval"],
-    [PAM_MSG="yes"]
-)
-AC_MSG_RESULT($PAM_MSG)
-use_pam_so=no
-compile_pam=no
-
-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
+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,
@@ -459,6 +442,7 @@ case "$host_os" in
        *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 ;;