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 | 276bd9a38b879e979e3e5b38639c5298f5dd1c11 (patch) | |
| tree | 51c6a46354272d1a6b7b610e459374b311939111 /modules | |
| parent | 5afb8d0fac540cc0555d8f7e1c7796d1f6b59b63 (diff) | |
| download | pam-276bd9a38b879e979e3e5b38639c5298f5dd1c11.tar.gz pam-276bd9a38b879e979e3e5b38639c5298f5dd1c11.tar.bz2 pam-276bd9a38b879e979e3e5b38639c5298f5dd1c11.zip | |
build: move pam_userdb build condition to modules/Makefile.am
* configure.ac (AM_CONDITIONAL): Replace HAVE_LIBDB with
COND_BUILD_PAM_USERDB.
* modules/Makefile.am [COND_BUILD_PAM_USERDB] (MAYBE_PAM_USERDB):
Define.
(SUBDIRS): Replace pam_userdb with $(MAYBE_PAM_USERDB).
* modules/pam_userdb/Makefile.am: Assume HAVE_LIBDB.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/pam_userdb/Makefile.am | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index fc75fe64..3ba750cd 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -26,6 +26,10 @@ if COND_BUILD_PAM_TTY_AUDIT MAYBE_PAM_TTY_AUDIT = pam_tty_audit endif +if COND_BUILD_PAM_USERDB + MAYBE_PAM_USERDB = pam_userdb +endif + SUBDIRS := \ pam_access \ $(MAYBE_PAM_CRACKLIB) \ @@ -68,7 +72,7 @@ SUBDIRS := \ $(MAYBE_PAM_TTY_AUDIT) \ pam_umask \ pam_unix \ - pam_userdb \ + $(MAYBE_PAM_USERDB) \ pam_usertype \ pam_warn \ pam_wheel \ diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am index d62fc54c..ca11d0e2 100644 --- a/modules/pam_userdb/Makefile.am +++ b/modules/pam_userdb/Makefile.am @@ -7,12 +7,10 @@ MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README $(XMLS) pam_userdb.8 create.pl tst-pam_userdb -if HAVE_LIBDB if HAVE_DOC - man_MANS = pam_userdb.8 -endif - TESTS = tst-pam_userdb +man_MANS = pam_userdb.8 endif +TESTS = tst-pam_userdb XMLS = README.xml pam_userdb.8.xml @@ -26,10 +24,8 @@ if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif -if HAVE_LIBDB - securelib_LTLIBRARIES = pam_userdb.la - pam_userdb_la_LIBADD = $(top_builddir)/libpam/libpam.la -endif +securelib_LTLIBRARIES = pam_userdb.la +pam_userdb_la_LIBADD = $(top_builddir)/libpam/libpam.la noinst_HEADERS = pam_userdb.h |