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 | c6f18a3c8058a1d76478a40ed4b77f5b35a2961c (patch) | |
| tree | c2f093d1bac20015b1fa11dd289eac0a30a3730c /modules | |
| parent | a0c0ef9f7fb94d49d186f1f6dcbc357781fa37d3 (diff) | |
| download | pam-c6f18a3c8058a1d76478a40ed4b77f5b35a2961c.tar.gz pam-c6f18a3c8058a1d76478a40ed4b77f5b35a2961c.tar.bz2 pam-c6f18a3c8058a1d76478a40ed4b77f5b35a2961c.zip | |
build: move pam_tty_audit build condition to modules/Makefile.am
* configure.ac (AM_CONDITIONAL): Replace HAVE_AUDIT_TTY_STATUS with
COND_BUILD_PAM_TTY_AUDIT.
* modules/Makefile.am [COND_BUILD_PAM_TTY_AUDIT] (MAYBE_PAM_TTY_AUDIT):
Define.
(SUBDIRS): Replace pam_tty_audit with $(MAYBE_PAM_TTY_AUDIT).
* modules/pam_tty_audit/Makefile.am: Assume HAVE_AUDIT_TTY_STATUS.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/pam_tty_audit/Makefile.am | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index dec06624..61e35a7b 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -14,6 +14,10 @@ if COND_BUILD_PAM_SETQUOTA MAYBE_PAM_SETQUOTA = pam_setquota endif +if COND_BUILD_PAM_TTY_AUDIT + MAYBE_PAM_TTY_AUDIT = pam_tty_audit +endif + SUBDIRS := \ pam_access \ pam_cracklib \ @@ -53,7 +57,7 @@ SUBDIRS := \ pam_tally2 \ pam_time \ pam_timestamp \ - pam_tty_audit \ + $(MAYBE_PAM_TTY_AUDIT) \ pam_umask \ pam_unix \ pam_userdb \ diff --git a/modules/pam_tty_audit/Makefile.am b/modules/pam_tty_audit/Makefile.am index bdec8478..37890f98 100644 --- a/modules/pam_tty_audit/Makefile.am +++ b/modules/pam_tty_audit/Makefile.am @@ -7,11 +7,9 @@ MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = README pam_tty_audit.8 $(XMLS) tst-pam_tty_audit -if HAVE_AUDIT_TTY_STATUS - TESTS = tst-pam_tty_audit +TESTS = tst-pam_tty_audit if HAVE_DOC - man_MANS = pam_tty_audit.8 -endif +man_MANS = pam_tty_audit.8 endif XMLS = README.xml pam_tty_audit.8.xml @@ -24,10 +22,8 @@ if HAVE_VERSIONING AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif -if HAVE_AUDIT_TTY_STATUS - pam_tty_audit_la_LIBADD = $(top_builddir)/libpam/libpam.la - securelib_LTLIBRARIES = pam_tty_audit.la -endif +pam_tty_audit_la_LIBADD = $(top_builddir)/libpam/libpam.la +securelib_LTLIBRARIES = pam_tty_audit.la if ENABLE_REGENERATE_MAN noinst_DATA = README |