diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-26 19:40:57 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-26 19:40:57 +0000 |
| commit | 6969079052bde6af4bdaeccbbe51ac97913bdb00 (patch) | |
| tree | adcc2a3c3d9d24a0a8f00faee59d8ed64396a8af | |
| parent | f639003ff98dc2b7684ad91e44303f9fa9c7dc68 (diff) | |
| download | pam-6969079052bde6af4bdaeccbbe51ac97913bdb00.tar.gz pam-6969079052bde6af4bdaeccbbe51ac97913bdb00.tar.bz2 pam-6969079052bde6af4bdaeccbbe51ac97913bdb00.zip | |
build: move pam_cracklib build condition to modules/Makefile.am
* configure.ac (AM_CONDITIONAL): Replace HAVE_LIBCRACK with
COND_BUILD_PAM_CRACKLIB.
* modules/Makefile.am [COND_BUILD_PAM_CRACKLIB] (MAYBE_PAM_CRACKLIB):
Define.
(SUBDIRS): Replace pam_cracklib with $(MAYBE_PAM_CRACKLIB).
* modules/pam_cracklib/Makefile.am: Assume HAVE_LIBCRACK.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | modules/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/pam_cracklib/Makefile.am | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index ec5f1f54..ce1d5df4 100644 --- a/configure.ac +++ b/configure.ac @@ -382,7 +382,6 @@ 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 -n "$LIBCRACK"]) dnl Look for Linux Auditing library - see documentation AC_ARG_ENABLE([audit], @@ -660,6 +659,7 @@ if test x"$opt_kerneloverflowuid" == x; then fi AC_DEFINE_UNQUOTED(PAM_USERTYPE_OVERFLOW_UID, $opt_kerneloverflowuid, [Kernel overflow uid.]) +AM_CONDITIONAL([COND_BUILD_PAM_CRACKLIB], [test -n "$LIBCRACK"]) AM_CONDITIONAL([COND_BUILD_PAM_KEYINIT], [test "$have_key_syscalls" = 1]) AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes]) AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) diff --git a/modules/Makefile.am b/modules/Makefile.am index 5596fff3..fc75fe64 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -2,6 +2,10 @@ # Copyright (c) 2005, 2006, 2008 Thorsten Kukuk <kukuk@thkukuk.de> # +if COND_BUILD_PAM_CRACKLIB + MAYBE_PAM_CRACKLIB = pam_cracklib +endif + if COND_BUILD_PAM_KEYINIT MAYBE_PAM_KEYINIT = pam_keyinit endif @@ -24,7 +28,7 @@ endif SUBDIRS := \ pam_access \ - pam_cracklib \ + $(MAYBE_PAM_CRACKLIB) \ pam_debug \ pam_deny \ pam_echo \ diff --git a/modules/pam_cracklib/Makefile.am b/modules/pam_cracklib/Makefile.am index f6f7e821..4569dab0 100644 --- a/modules/pam_cracklib/Makefile.am +++ b/modules/pam_cracklib/Makefile.am @@ -7,11 +7,9 @@ MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(XMLS) pam_cracklib.8 tst-pam_cracklib -if HAVE_LIBCRACK - TESTS = tst-pam_cracklib +TESTS = tst-pam_cracklib if HAVE_DOC - man_MANS = pam_cracklib.8 -endif +man_MANS = pam_cracklib.8 endif XMLS = README.xml pam_cracklib.8.xml @@ -27,9 +25,7 @@ if HAVE_VERSIONING endif pam_cracklib_la_LIBADD = $(top_builddir)/libpam/libpam.la \ @LIBCRACK@ @LIBCRYPT@ -if HAVE_LIBCRACK - securelib_LTLIBRARIES = pam_cracklib.la -endif +securelib_LTLIBRARIES = pam_cracklib.la if ENABLE_REGENERATE_MAN noinst_DATA = README pam_cracklib.8 |