PAM cleanups, removed unused USE_SHADOWPW conditional.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index 3dbe52e2e64ebea895f5a9a88dac9640c2b9d882..fb8940d1a8809941e4e78ff09fd50cbfb48eb30c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.127 2001-11-20 16:04:23 pooba53 Exp $
+dnl $Id: configure.in,v 1.131 2001-11-24 18:32:31 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -137,12 +137,6 @@ dnl --------------------------------------------------------------------------
 
 AC_DEFINE(ADMIN_GRP, 1)
 
-AC_ARG_WITH(prefix,
-        [  --prefix=DIR    architecture-independant files alternative location],
-        prefix = "$withval"
-)
-
-
 AC_ARG_WITH(admin-group,
        [  --disable-admin-group   disable admin group],
         if test "$enableval" = "no"; then
@@ -159,16 +153,11 @@ AC_ARG_ENABLE(afs,
        fi
 )
 
-AC_ARG_WITH(sysconfdir,
-       [  --sysconfdir=DIR   system specific configuration files],
-               sysconfdir="$withval",
-               sysconfdir="${ac_prefix_default}/etc"
-)
-
 AC_ARG_WITH(pkgconfdir,
-       [  --with-pkgconfdir=DIR   package specific configuration in DIR],
+       [  --with-pkgconfdir=DIR   package specific configuration in DIR
+                          [[SYSCONF/netatalk]]],
                PKGCONFDIR="$withval",
-               PKGCONFDIR="${ac_prefix_default}/netatalk"
+               PKGCONFDIR="${sysconfdir}/netatalk"
 )
 
 AC_ARG_WITH(cracklib,
@@ -259,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"
 
 AC_ARG_WITH(did,
        [  --with-did=SCHEME       set DID scheme (last,mtab)],
@@ -318,20 +305,19 @@ AC_ARG_WITH(pam,
     [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]
-               )
+               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)
+               ])
        fi
-else
-       use_pam_so=no
-       compile_pam=no
 fi
 
 AC_MSG_CHECKING([whether shadow support should be enabled])
@@ -672,7 +658,6 @@ 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