X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=f94535c4cbb2282c96afceca0cb9c991e288b1cb;hb=b19bf8b3569ca2fc8199b55306482f71db14dd89;hp=fc4c602af6c8ec9c80c8bcc8f276f907ff4c0a33;hpb=7b2e02d955b03dfeb244fd60fa6d1d3a0e042799;p=netatalk.git

diff --git a/configure.in b/configure.in
index fc4c602a..f94535c4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.128 2001-11-20 19:06:46 srittau Exp $
+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)
@@ -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"
@@ -153,11 +153,6 @@ AC_ARG_ENABLE(afs,
 	fi
 )
 
-AC_ARG_WITH(config-dir,
-	[  --with-config-dir=DIR   obsolete - use --with-pkgconfdir],
-	[sysconfdir="$withval"]
-)
-
 AC_ARG_WITH(pkgconfdir,
 	[  --with-pkgconfdir=DIR   package specific configuration in DIR
                           [[SYSCONF/netatalk]]],
@@ -253,23 +248,27 @@ 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])
 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
+	[ 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-message-dir=PATH path to message files [[PKGCONF/msg]]],
@@ -305,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,
@@ -458,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 ;;