From 6969079052bde6af4bdaeccbbe51ac97913bdb00 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 26 Apr 2020 19:40:57 +0000 Subject: 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. --- modules/Makefile.am | 6 +++++- modules/pam_cracklib/Makefile.am | 10 +++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'modules') 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 # +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 -- cgit v1.2.3