build: move pam_selinux and pam_sepermit build conditions to modules/Makefile.am

* configure.ac (AM_CONDITIONAL): Replace HAVE_LIBSELINUX with
COND_BUILD_PAM_SELINUX and COND_BUILD_PAM_SEPERMIT.
* modules/Makefile.am [COND_BUILD_PAM_SELINUX] (MAYBE_PAM_SELINUX):
Define.
[COND_BUILD_PAM_SEPERMIT] (MAYBE_PAM_SEPERMIT): Likewise.
(SUBDIRS): Replace pam_selinux with $(MAYBE_PAM_SELINUX),
pam_sepermit with MAYBE_PAM_SEPERMIT.
* modules/pam_selinux/Makefile.am: Assume HAVE_LIBSELINUX.
* modules/pam_sepermit/Makefile.am: Likewise.

4 files changed, 24 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index 535b0ae5..289f4f97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -514,7 +514,6 @@ else
   LIBSELINUX=""
 fi
 AC_SUBST(LIBSELINUX)
-AM_CONDITIONAL([HAVE_LIBSELINUX], [test -n "$LIBSELINUX"])
 if test -n "$LIBSELINUX" ; then
     AC_DEFINE([WITH_SELINUX], 1, [Defined if SE Linux support is compiled in])
     BACKUP_LIBS=$LIBS
@@ -658,6 +657,8 @@ 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_NAMESPACE], [test "$ac_cv_func_unshare" = 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_SELINUX], [test -n "$LIBSELINUX"])
+AM_CONDITIONAL([COND_BUILD_PAM_SEPERMIT], [test -n "$LIBSELINUX"])
 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])
 AM_CONDITIONAL([COND_BUILD_PAM_USERDB], [test -n "$LIBDB"])
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 233c69db..13ef7c05 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -22,6 +22,14 @@ if COND_BUILD_PAM_RHOSTS
  MAYBE_PAM_RHOSTS = pam_rhosts
 endif
 
+if COND_BUILD_PAM_SELINUX
+ MAYBE_PAM_SELINUX = pam_selinux
+endif
+
+if COND_BUILD_PAM_SEPERMIT
+ MAYBE_PAM_SEPERMIT = pam_sepermit
+endif
+
 if COND_BUILD_PAM_SETQUOTA
  MAYBE_PAM_SETQUOTA = pam_setquota
 endif
@@ -63,8 +71,8 @@ SUBDIRS := \
 	$(MAYBE_PAM_RHOSTS) \
 	pam_rootok \
 	pam_securetty \
-	pam_selinux \
-	pam_sepermit \
+	$(MAYBE_PAM_SELINUX) \
+	$(MAYBE_PAM_SEPERMIT) \
 	$(MAYBE_PAM_SETQUOTA) \
 	pam_shells \
 	pam_stress \
diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am
index d037f483..c46d408e 100644
--- a/modules/pam_selinux/Makefile.am
+++ b/modules/pam_selinux/Makefile.am
@@ -8,11 +8,9 @@ MAINTAINERCLEANFILES = $(MANS) README
 EXTRA_DIST = README $(XMLS) pam_selinux.8 pam_selinux_check.8 \
 		tst-pam_selinux
 
-if HAVE_LIBSELINUX
-  TESTS = tst-pam_selinux
+TESTS = tst-pam_selinux
 if HAVE_DOC
-  man_MANS = pam_selinux.8
-endif
+man_MANS = pam_selinux.8
 endif
 
 XMLS = README.xml pam_selinux.8.xml
@@ -29,12 +27,11 @@ if HAVE_VERSIONING
   pam_selinux_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
-if HAVE_LIBSELINUX
-  securelib_LTLIBRARIES = pam_selinux.la
-  noinst_PROGRAMS = pam_selinux_check
-  pam_selinux_check_LDADD = $(top_builddir)/libpam/libpam.la \
-			    $(top_builddir)/libpam_misc/libpam_misc.la
-endif
+securelib_LTLIBRARIES = pam_selinux.la
+noinst_PROGRAMS = pam_selinux_check
+pam_selinux_check_LDADD = $(top_builddir)/libpam/libpam.la \
+			  $(top_builddir)/libpam_misc/libpam_misc.la
+
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README pam_selinux.8
 README: pam_selinux.8.xml
diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am
index 3895e124..1f68cf87 100644
--- a/modules/pam_sepermit/Makefile.am
+++ b/modules/pam_sepermit/Makefile.am
@@ -8,11 +8,9 @@ MAINTAINERCLEANFILES = $(MANS) README
 
 EXTRA_DIST = README $(XMLS) pam_sepermit.8 sepermit.conf sepermit.conf.5 tst-pam_sepermit
 
-if HAVE_LIBSELINUX
-  TESTS = tst-pam_sepermit
+TESTS = tst-pam_sepermit
 if HAVE_DOC
-  man_MANS = pam_sepermit.8 sepermit.conf.5
-endif
+man_MANS = pam_sepermit.8 sepermit.conf.5
 endif
 
 XMLS = README.xml pam_sepermit.8.xml sepermit.conf.5.xml
@@ -32,13 +30,12 @@ if HAVE_VERSIONING
   pam_sepermit_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
 endif
 
-if HAVE_LIBSELINUX
-  secureconf_DATA = sepermit.conf
-  securelib_LTLIBRARIES = pam_sepermit.la
+secureconf_DATA = sepermit.conf
+securelib_LTLIBRARIES = pam_sepermit.la
 
 install-data-local:
 	mkdir -p $(DESTDIR)$(sepermitlockdir)
-endif
+
 if ENABLE_REGENERATE_MAN
 noinst_DATA = README pam_sepermit.8 sepermit.conf.5
 README: pam_sepermit.8.xml