Author: baggins Date: Wed Jul 13 11:33:45 2005 GMT
Module: pam Tag: HEAD
---- Log message:
- provide --enable-FEATURE for opie,skey,cap,tcpd
---- Files affected:
pam:
configure.in (1.59 -> 1.60)
---- Diffs:
================================================================
Index: pam/configure.in
diff -u pam/configure.in:1.59 pam/configure.in:1.60
--- pam/configure.in:1.59 Tue Jul 12 16:57:28 2005
+++ pam/configure.in Wed Jul 13 13:33:40 2005
@@ -146,6 +146,272 @@
-DLIBPAM_VERSION_MINOR=$LIBPAM_VERSION_MINOR \
-DLIBPAM_VERSION_STRING=\"\\\"$LIBPAM_VERSION_MAJOR.$LIBPAM_VERSION_MINOR\\\"\""
+dnl Checks for header files.
+
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(endian.h crack.h crypt.h fcntl.h limits.h malloc.h paths.h
strings.h sys/file.h sys/ioctl.h sys/time.h sys/fsuid.h syslog.h termio.h
unistd.h ndbm.h db.h inttypes.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_STRUCT_ST_BLKSIZE
+AC_HEADER_TIME
+AC_STRUCT_TM
+
+dnl Checks for library functions.
+
+AC_FUNC_ALLOCA
+AC_TYPE_GETGROUPS
+AC_PROG_GCC_TRADITIONAL
+AC_FUNC_MEMCMP
+AC_FUNC_MMAP
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(gethostname gettimeofday mkdir select strcspn strdup strerror
strspn strstr strtol)
+AC_CHECK_FUNCS(getpwnam_r getgrnam_r)
+
+dnl Checks for libraries.
+
+AC_CHECK_LIB(c, main, , AC_MSG_ERROR(How do you expect me to build anything?))
+AC_CHECK_LIB(fl, yywrap)
+
+AC_CHECK_LIB(crypt, crypt, cryptlib_present=true; CRYPT_LIB="-lcrypt")
+AM_CONDITIONAL(CRYPTLIB_PRESENT, test x$cryptlib_present = xtrue)
+
+AC_CHECK_FUNC(dlopen, [],
+ AC_CHECK_LIB(dl, dlopen,
+ LIB_DL="-ldl",
+ AC_MSG_ERROR(PAM will not build without libdl)
+ )
+)
+AC_SUBST(LIB_DL)
+
+AC_CHECK_LIB(crack, FascistCheck, cracklib_present=true,
+ AC_MSG_WARN(pam_cracklib module will not be built!
+ and some functionality of pam_unix module will be lost))
+AM_CONDITIONAL(CRACKLIB_PRESENT, test x$cracklib_present = xtrue)
+if test x"$cracklib_present" = x"true"; then
+ AC_DEFINE(HAVE_CRACKLIB)
+fi
+AC_MSG_CHECKING([where cracklib_dict is located])
+AC_ARG_ENABLE(cracklib_dict, [ --with-cracklib-dict Directory where
cracklib_dict is located],
+ if test "$enableval" = "" ; then
+ if test -f /usr/${libdirname}/cracklib_dict.hwm ; then
+ CRACKLIB_DICTPATH=/usr/${libdirname}/cracklib_dict
+ else
+ CRACKLIB_DICTPATH=/usr/share/dict/cracklib_dict
+ fi
+ AC_MSG_RESULT([$CRACKLIB_DICTPATH])
+ else
+ CRACKLIB_DICTPATH=$enableval
+ AC_MSG_RESULT([$CRACKLIB_DICTPATH])
+ fi,
+ if test -f /usr/${libdirname}/cracklib_dict.hwm ; then
+ CRACKLIB_DICTPATH=/usr/${libdirname}/cracklib_dict
+ else
+ CRACKLIB_DICTPATH=/usr/share/dict/cracklib_dict
+ fi
+ AC_MSG_RESULT([$CRACKLIB_DICTPATH])
+)
+AC_SUBST(CRACKLIB_DICTPATH)
+
+AC_CHECK_LIB(nsl, gethostname, nsllib_present=true)
+AM_CONDITIONAL(NSLLIB_PRESENT, test x$nsllib_present = xtrue)
+
+AC_CHECK_LIB(db, db_version, dblib_present=true,
+ AC_MSG_WARN(pam_userdb module will not be built!))
+AM_CONDITIONAL(DBLIB_PRESENT, test x$dblib_present = xtrue)
+
+AC_CHECK_LIB(pwdb, pwdb_posix_getlogin, pwdblib_present=true,
+ AC_MSG_WARN(pam_pwdb and pam_radius modules will not be built!))
+AM_CONDITIONAL(PWDBLIB_PRESENT, test x$pwdblib_present = xtrue)
+
+AC_MSG_CHECKING([whether to use pwdb lib for group, lastlog and mail modules])
+AC_ARG_ENABLE(want_pwdb, [ --enable-want-pwdb Use pwdb lib for group,
lastlog and mail modules [default=no]],
+ if test "$enableval" = "yes" -a "$pwdblib_present" = "true" ; then
+ want_pwdb=true
+ AC_DEFINE(WANT_PWDB)
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi,
+ AC_MSG_RESULT([no])
+)
+AM_CONDITIONAL(WANT_PWDB, test x$want_pwdb = xtrue)
+
+AC_MSG_CHECKING([whether to build pam_skey module (requires libskey)])
+AC_ARG_ENABLE(skey, [ --enable-skey Build pam_skey module (requires
libskey) [default=yes]],
+ if test "$enableval" = "yes" -o "$skey" = "yes"; then
+ AC_MSG_RESULT([yes])
+ enable_skey=true
+ else
+ AC_MSG_RESULT([no])
+ enable_skey=false
+ fi,
+ AC_MSG_RESULT([yes])
+ enable_skey=maybe
+)
+if test "$enable_skey" = "false"; then
+ AC_MSG_WARN(pam_skey module will not be built!)
+else
+ AC_CHECK_LIB(skey, skeyaccess,
+ skeylib_present=true,
+ if test "$enable_skey" = "maybe"; then
+ enable_skey=false
+ AC_MSG_WARN(pam_skey module will not be built!)
+ else
+ AC_MSG_ERROR(Cannot find libskey)
+ fi,
+ $CRYPT_LIB)
+fi
+AM_CONDITIONAL(SKEYLIB_PRESENT, test x$skeylib_present = xtrue)
+
+AC_MSG_CHECKING([whether to build pam_cap module (requires libcap)])
+AC_ARG_ENABLE(cap, [ --enable-cap Build pam_cap module (requires libcap)
[default=yes]],
+ if test "$enableval" = "yes" -o "$cap" = "yes"; then
+ AC_MSG_RESULT([yes])
+ enable_cap=true
+ else
+ AC_MSG_RESULT([no])
+ enable_cap=false
+ fi,
+ AC_MSG_RESULT([yes])
+ enable_cap=maybe
+)
+if test "$enable_cap" = "false"; then
+ AC_MSG_WARN(pam_cap module will not be built!)
+else
+ AC_CHECK_LIB(cap, cap_init,
+ enable_cap=true,
+ if test "$enable_cap" = "maybe"; then
+ enable_cap=false
+ AC_MSG_WARN(pam_cap module will not be built!)
+ else
+ AC_MSG_ERROR(Cannot find libcap)
+ fi)
+fi
+AM_CONDITIONAL(CAPLIB_PRESENT, test x$enable_cap = xtrue)
+
+AC_MSG_CHECKING([whether to build pam_opie modules (requires libopie)])
+AC_ARG_ENABLE(opie, [ --enable-opie Build pam_opie modules (requires
libopie) [default=yes]],
+ if test "$enableval" = "yes" -o "$opie" = "yes"; then
+ AC_MSG_RESULT([yes])
+ enable_opie=true
+ else
+ AC_MSG_RESULT([no])
+ enable_opie=false
+ fi,
+ AC_MSG_RESULT([yes])
+ enable_opie=maybe
+)
+if test "$enable_opie" = "false"; then
+ AC_MSG_WARN(pam_opie modules will not be built!)
+else
+ AC_CHECK_LIB(opie, opieverify,
+ enable_opie=true,
+ if test "$enable_opie" = "maybe"; then
+ enable_opie=false
+ AC_MSG_WARN(pam_opie modules will not be built!)
+ else
+ AC_MSG_ERROR(Cannot find libopie)
+ fi)
+fi
+AM_CONDITIONAL(OPIELIB_PRESENT, test x$enable_opie = xtrue)
+
+AC_MSG_CHECKING([whether to build pam_tcpd module (requires libwrap)])
+AC_ARG_ENABLE(tcpd, [ --enable-tcpd Build pam_tcpd module (requires
libwrap) [default=yes]],
+ if test "$enableval" = "yes" -o "$tcpd" = "yes"; then
+ AC_MSG_RESULT([yes])
+ enable_tcpd=true
+ else
+ AC_MSG_RESULT([no])
+ enable_tcpd=false
+ fi,
+ AC_MSG_RESULT([yes])
+ enable_tcpd=maybe
+)
+if test "$enable_tcpd" = "false"; then
+ AC_MSG_WARN(pam_tcpd module will not be built!)
+else
+ AC_MSG_CHECKING(for hosts_access in -lwrap)
+ oldLIBS=$LIBS
+ LIBS="$LIBS -lwrap"
+ AC_TRY_LINK(int allow_severity; int deny_severity;, hosts_access(0),
+ AC_MSG_RESULT(yes)
+ enable_tcpd=true,
+ AC_MSG_RESULT(no)
+ if test "$enable_tcpd" = "maybe"; then
+ enable_tcpd=false
+ AC_MSG_WARN(pam_tcpd module will not be built!)
+ else
+ AC_MSG_ERROR(Cannot find libwrap)
+ fi)
+ LIBS=$oldLIBS
+fi
+AM_CONDITIONAL(WRAPLIB_PRESENT, test x$enable_tcpd = xtrue)
+
+
+AC_MSG_CHECKING([whether to use SELinux])
+AC_ARG_ENABLE(selinux, [ --enable-selinux Enable SELinux support
[default=yes]],
+ if test "$enableval" = "yes" -o "$selinux" = "yes"; then
+ AC_MSG_RESULT([yes])
+ enable_selinux=true
+ else
+ AC_MSG_RESULT([no])
+ enable_selinux=false
+ fi,
+ AC_MSG_RESULT([yes])
+ enable_selinux=maybe
+)
+
+if test "$enable_selinux" = "false"; then
+ AC_MSG_WARN(SELinux support will not be enabled. pam_selinux module and
pam_selinux_check will not be built!)
+else
+ AC_CHECK_LIB(selinux, getfilecon,
+ enable_selinux=true
+ AC_DEFINE(WITH_SELINUX),
+ if test "$enable_selinux" = "maybe"; then
+ enable_selinux=false
+ AC_MSG_WARN(SELinux support will not be enabled.
pam_selinux module and pam_selinux_check will not be built!)
+ else
+ AC_MSG_ERROR(Cannot find libselinux)
+ fi)
+fi
+AM_CONDITIONAL(SELINUX_PRESENT, test x$enable_selinux = xtrue)
+
+AC_MSG_CHECKING([whether to use Prelude IDS])
+AC_ARG_ENABLE(prelude, [ --enable-prelude Enable Prelude IDS support in
libpam [default=yes]],
+ if test "$enableval" = "yes" -o "$prelude" = "yes"; then
+ AC_MSG_RESULT([yes])
+ enable_prelude=true
+ else
+ AC_MSG_RESULT([no])
+ enable_prelude=false
+ fi,
+ AC_MSG_RESULT([yes])
+ enable_prelude=maybe
+)
+
+if test "$enable_prelude" = "false"; then
+ AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
+else
+ AM_PATH_LIBPRELUDE(0.9.0,
+ CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS
-DLIBPRELUDE_CONFIG_PREFIX=\"\$(LIBPRELUDE_CONFIG_PREFIX)\""
+ AC_DEFINE(WITH_PRELUDE),
+ if test "$enable_prelude" = "maybe"; then
+ AC_MSG_WARN(Prelude IDS support in libpam will not be
enabled.)
+ else
+ AC_MSG_ERROR(Cannot find libprelude: Is
libprelude-config in the path?)
+ fi)
+fi
+
+dnl PAM specific settings
+
AC_MSG_CHECKING([whether to build shared modules])
AC_ARG_ENABLE(
shared_modules, [ --enable-shared-modules build shared modules
[default=yes]],
@@ -241,61 +507,6 @@
AC_MSG_RESULT([yes])
)
-AC_MSG_CHECKING([whether to use SELinux])
-AC_ARG_ENABLE(selinux, [ --enable-selinux Enable SELinux support
[default=yes]],
- if test "$enableval" = "yes" -o "$selinux" = "yes"; then
- AC_MSG_RESULT([yes])
- enable_selinux=true
- else
- AC_MSG_RESULT([no])
- enable_selinux=false
- fi,
- AC_MSG_RESULT([yes])
- enable_selinux=maybe
-)
-
-if test "$enable_selinux" = "false"; then
- AC_MSG_WARN(SELinux support will not be enabled. pam_selinux module and
pam_selinux_check will not be built!)
-else
- AC_CHECK_LIB(selinux, getfilecon,
- enable_selinux=true
- AC_DEFINE(WITH_SELINUX),
- enable_selinux=false
- if test "$enable_selinux" = "maybe"; then
- AC_MSG_WARN(SELinux support will not be enabled.
pam_selinux module and pam_selinux_check will not be built!)
- else
- AC_MSG_ERROR(Cannot find libselinux)
- fi)
-fi
-AM_CONDITIONAL(SELINUX_PRESENT, test x$enable_selinux = xtrue)
-
-AC_MSG_CHECKING([whether to use Prelude IDS])
-AC_ARG_ENABLE(prelude, [ --enable-prelude Enable Prelude IDS support in
libpam [default=yes]],
- if test "$enableval" = "yes" -o "$prelude" = "yes"; then
- AC_MSG_RESULT([yes])
- enable_prelude=true
- else
- AC_MSG_RESULT([no])
- enable_prelude=false
- fi,
- AC_MSG_RESULT([yes])
- enable_prelude=maybe
-)
-
-if test "$enable_prelude" = "false"; then
- AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
-else
- AM_PATH_LIBPRELUDE(0.9.0,
- CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS
-DLIBPRELUDE_CONFIG_PREFIX=\"\$(LIBPRELUDE_CONFIG_PREFIX)\""
- AC_DEFINE(WITH_PRELUDE),
- if test "$enable_prelude" = "maybe"; then
- AC_MSG_WARN(Prelude IDS support in libpam will not be
enabled.)
- else
- AC_MSG_ERROR(Cannot find libprelude: Is
libprelude-config in the path?)
- fi)
-fi
-
-AC_CHECK_HEADERS(paths.h)
AC_ARG_WITH(mailspool,
[ --with-mailspool path to mail spool directory
[default _PATH_MAILDIR if defined in paths.h,
otherwise /var/spool/mail]],
@@ -317,95 +528,6 @@
fi
AC_DEFINE_UNQUOTED(PAM_PATH_MAILDIR, $pam_mail_spool)
-dnl Checks for libraries.
-AC_CHECK_LIB(c, main, , AC_MSG_ERROR(How do you expect me to build anything?))
-AC_CHECK_LIB(crypt, crypt, cryptlib_present=true)
-AC_CHECK_FUNC(dlopen, [],
- AC_CHECK_LIB(dl, dlopen,
- LIB_DL="-ldl",
- AC_MSG_ERROR(PAM will not build without libdl)
- )
-)
-AC_SUBST(LIB_DL)
-
-AC_CHECK_LIB(fl, yywrap)
-AC_CHECK_LIB(crack, FascistCheck, cracklib_present=true,
- AC_MSG_WARN(pam_cracklib module will not be built!
- and some functionality of pam_unix module will be lost))
-AC_CHECK_LIB(nsl, gethostname, nsllib_present=true)
-AC_CHECK_LIB(db, db_version, dblib_present=true,
- AC_MSG_WARN(pam_userdb module will not be built!))
-AC_CHECK_LIB(pwdb, pwdb_posix_getlogin, pwdblib_present=true,
- AC_MSG_WARN(pam_pwdb and pam_radius modules will not be built!))
-if test x$cryptlib_present = xtrue ; then
- AC_CHECK_LIB(skey, skeyaccess, skeylib_present=true,
- AC_MSG_WARN(pam_skey module will not be built!),-lcrypt)
-else
- AC_CHECK_LIB(skey, skeyaccess, skeylib_present=true,
- AC_MSG_WARN(pam_skey module will not be built!))
-fi
-AC_CHECK_LIB(cap, cap_init, caplib_present=true,
- AC_MSG_WARN(pam_cap module will not be built!))
-AC_CHECK_LIB(opie, opieverify, opielib_present=true,
- AC_MSG_WARN(pam_opie modules will not be built!))
-AC_MSG_CHECKING(for hosts_access in -lwrap)
-oldLIBS=$LIBS
-LIBS="$LIBS -lwrap"
-AC_TRY_LINK(int allow_severity; int deny_severity;, hosts_access(0),
- AC_MSG_RESULT(yes), AC_MSG_WARN(pam_tcpd module will not be built!);
- libwrap="no")
-LIBS=$oldLIBS
-if test x"$libwrap" != x"no"; then
- wraplib_present=true
-fi
-AM_CONDITIONAL(CRYPTLIB_PRESENT, test x$cryptlib_present = xtrue)
-AM_CONDITIONAL(CRACKLIB_PRESENT, test x$cracklib_present = xtrue)
-if test x"$cracklib_present" = x"true"; then
- AC_DEFINE(HAVE_CRACKLIB)
-fi
-AM_CONDITIONAL(NSLLIB_PRESENT, test x$nsllib_present = xtrue)
-AM_CONDITIONAL(DBLIB_PRESENT, test x$dblib_present = xtrue)
-AM_CONDITIONAL(PWDBLIB_PRESENT, test x$pwdblib_present = xtrue)
-AM_CONDITIONAL(SKEYLIB_PRESENT, test x$skeylib_present = xtrue)
-AM_CONDITIONAL(CAPLIB_PRESENT, test x$caplib_present = xtrue)
-AM_CONDITIONAL(WRAPLIB_PRESENT, test x$wraplib_present = xtrue)
-AM_CONDITIONAL(OPIELIB_PRESENT, test x$opielib_present = xtrue)
-
-AC_MSG_CHECKING([where cracklib_dict is located])
-AC_ARG_ENABLE(cracklib_dict, [ --with-cracklib-dict Directory where
cracklib_dict is located],
- if test "$enableval" = "" ; then
- if test -f /usr/${libdirname}/cracklib_dict.hwm ; then
- CRACKLIB_DICTPATH=/usr/${libdirname}/cracklib_dict
- else
- CRACKLIB_DICTPATH=/usr/share/dict/cracklib_dict
- fi
- AC_MSG_RESULT([$CRACKLIB_DICTPATH])
- else
- CRACKLIB_DICTPATH=$enableval
- AC_MSG_RESULT([$CRACKLIB_DICTPATH])
- fi,
- if test -f /usr/${libdirname}/cracklib_dict.hwm ; then
- CRACKLIB_DICTPATH=/usr/${libdirname}/cracklib_dict
- else
- CRACKLIB_DICTPATH=/usr/share/dict/cracklib_dict
- fi
- AC_MSG_RESULT([$CRACKLIB_DICTPATH])
-)
-AC_SUBST(CRACKLIB_DICTPATH)
-
-AC_MSG_CHECKING([whether to use pwdb lib for group, lastlog and mail modules])
-AC_ARG_ENABLE(want_pwdb, [ --enable-want-pwdb Use pwdb lib for group,
lastlog and mail modules [default=no]],
- if test "$enableval" = "yes" -a "$pwdblib_present" = "true" ; then
- want_pwdb=true
- AC_DEFINE(WANT_PWDB)
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- fi,
- AC_MSG_RESULT([no])
-)
-AM_CONDITIONAL(WANT_PWDB, test x$want_pwdb = xtrue)
-
AC_MSG_CHECKING([whether to build pwexport module and hack pam_unix])
AC_ARG_ENABLE(want_pwexport_module, [ --enable-want-pwexport-module Build
pwexport module and patched version of pam_unix [default=no]],
if test "$enableval" = "yes" ; then
@@ -418,33 +540,6 @@
AC_MSG_RESULT([no])
)
AM_CONDITIONAL(WANT_PWEXPORT_MODULE, test x$want_pwexport_module = xtrue)
-
-dnl Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(endian.h crack.h crypt.h fcntl.h limits.h malloc.h paths.h
strings.h sys/file.h sys/ioctl.h sys/time.h sys/fsuid.h syslog.h termio.h
unistd.h ndbm.h db.h inttypes.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_STRUCT_ST_BLKSIZE
-AC_HEADER_TIME
-AC_STRUCT_TM
-
-dnl Checks for library functions.
-AC_FUNC_ALLOCA
-AC_TYPE_GETGROUPS
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(gethostname gettimeofday mkdir select strcspn strdup strerror
strspn strstr strtol)
-AC_CHECK_FUNCS(getpwnam_r getgrnam_r)
AM_CONFIG_HEADER(config.h)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pam/configure.in?r1=1.59&r2=1.60&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
