From 8e12aac8a6883a9fd57243033744944f592392e4 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 26 Apr 2020 19:40:57 +0000 Subject: build: move pam_keyinit build condition to modules/Makefile.am * configure.ac (AM_CONDITIONAL): Replace HAVE_KEY_MANAGEMENT with COND_BUILD_PAM_KEYINIT. * modules/Makefile.am [COND_BUILD_PAM_KEYINIT] (MAYBE_PAM_KEYINIT): Define. (SUBDIRS): Replace pam_keyinit with $(MAYBE_PAM_KEYINIT). * modules/pam_keyinit/Makefile.am: Assume HAVE_KEY_MANAGEMENT. --- modules/pam_keyinit/Makefile.am | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'modules/pam_keyinit') diff --git a/modules/pam_keyinit/Makefile.am b/modules/pam_keyinit/Makefile.am index f7819e49..b1089b57 100644 --- a/modules/pam_keyinit/Makefile.am +++ b/modules/pam_keyinit/Makefile.am @@ -8,12 +8,10 @@ MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(XMLS) pam_keyinit.8 tst-pam_keyinit XMLS = README.xml pam_keyinit.8.xml -if HAVE_KEY_MANAGEMENT if HAVE_DOC - man_MANS = pam_keyinit.8 -endif - TESTS = tst-pam_keyinit +man_MANS = pam_keyinit.8 endif +TESTS = tst-pam_keyinit if ENABLE_REGENERATE_MAN noinst_DATA = README @@ -31,7 +29,5 @@ if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif -if HAVE_KEY_MANAGEMENT - securelib_LTLIBRARIES = pam_keyinit.la -endif +securelib_LTLIBRARIES = pam_keyinit.la pam_keyinit_la_LIBADD = $(top_builddir)/libpam/libpam.la -- cgit v1.2.3