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 | 8e12aac8a6883a9fd57243033744944f592392e4 (patch) | |
| tree | 0421e94dab05da094b99568509563a1889865e9f | |
| parent | cf96beac0aa3f1ad8cae1b5ae21d5f649e6f8787 (diff) | |
| download | pam-8e12aac8a6883a9fd57243033744944f592392e4.tar.gz pam-8e12aac8a6883a9fd57243033744944f592392e4.tar.bz2 pam-8e12aac8a6883a9fd57243033744944f592392e4.zip | |
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.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | modules/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/pam_keyinit/Makefile.am | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 5fd26f83..522f0b8e 100644 --- a/configure.ac +++ b/configure.ac @@ -652,8 +652,6 @@ if test $HAVE_KEY_MANAGEMENT = 1; then fi AC_SUBST([HAVE_KEY_MANAGEMENT], $HAVE_KEY_MANAGEMENT) -AM_CONDITIONAL([HAVE_KEY_MANAGEMENT], [test "$have_key_syscalls" = 1]) - dnl dnl Get values for default uid ranges in login.defs used in pam_usertype dnl @@ -675,6 +673,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_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]) AM_CONDITIONAL([COND_BUILD_PAM_SETQUOTA], [test "$ac_cv_func_quotactl" = yes]) diff --git a/modules/Makefile.am b/modules/Makefile.am index 61e35a7b..5596fff3 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_KEYINIT + MAYBE_PAM_KEYINIT = pam_keyinit +endif + if COND_BUILD_PAM_LASTLOG MAYBE_PAM_LASTLOG = pam_lastlog endif @@ -31,7 +35,7 @@ SUBDIRS := \ pam_ftp \ pam_group \ pam_issue \ - pam_keyinit \ + $(MAYBE_PAM_KEYINIT) \ $(MAYBE_PAM_LASTLOG) \ pam_limits \ pam_listfile \ 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 |