Make --disable-cracklib compatible with --enable-static-modules mode

* configure.in: Define HAVE_LIBCRACK when cracklib is enabled.
* libpam/pam_static_modules.h (static_modules): Guard the use of
_pam_cracklib_modstruct by HAVE_LIBCRACK macro.

diff --git a/configure.in b/configure.in
index 15ff6dc1bf90cb43fe718d457dee2a4dba6b5c4d..cba05ee3c24f10e255c60a7854f914ef0e599d71 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -363,8 +363,11 @@ if test x"$WITH_CRACKLIB" != xno ; then
 else
        LIBCRACK=""
 fi
+if test -n "$LIBCRACK"; then
+       AC_DEFINE([HAVE_LIBCRACK], [1], [Define to 1 if you have cracklib.])
+fi
 AC_SUBST(LIBCRACK)
-AM_CONDITIONAL([HAVE_LIBCRACK], [test ! -z "$LIBCRACK"])
+AM_CONDITIONAL([HAVE_LIBCRACK], [test -n "$LIBCRACK"])
 
 dnl Look for Linux Auditing library - see documentation
 AC_ARG_ENABLE([audit],

diff --git a/libpam/pam_static_modules.h b/libpam/pam_static_modules.h
index 67d81359c626cdc5b7f086abd1af5aa489bef6bf..b1739ed147c4e7ca99305f5ca9ccc2552cfb71ed 100644 (file)
--- a/libpam/pam_static_modules.h
+++ b/libpam/pam_static_modules.h
@@ -94,7 +94,9 @@ extern struct pam_module _pam_xauth_modstruct;
 
 static struct pam_module *static_modules[] = {
   &_pam_access_modstruct,
+#ifdef HAVE_LIBCRACK
   &_pam_cracklib_modstruct,
+#endif
   &_pam_debug_modstruct,
   &_pam_deny_modstruct,
   &_pam_echo_modstruct,