diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | modules/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/pam_tty_audit/Makefile.am | 12 |
3 files changed, 10 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index b9db0da5..9a152cdb 100644 --- a/configure.ac +++ b/configure.ac @@ -410,8 +410,6 @@ else LIBAUDIT="" fi AC_SUBST(LIBAUDIT) -AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS], - [test "x$HAVE_AUDIT_TTY_STATUS" = xyes]) AC_CHECK_HEADERS(xcrypt.h crypt.h) AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], @@ -682,6 +680,7 @@ AC_DEFINE_UNQUOTED(PAM_USERTYPE_OVERFLOW_UID, $opt_kerneloverflowuid, [Kernel ov 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]) +AM_CONDITIONAL([COND_BUILD_PAM_TTY_AUDIT], [test "$HAVE_AUDIT_TTY_STATUS" = yes]) dnl Files to be created from when we run configure AC_CONFIG_FILES([Makefile libpam/Makefile libpamc/Makefile libpamc/test/Makefile \ 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 |