build-sys: Allow disabling installation of pam config snippet

diff --git a/DISTRO_PORTING b/DISTRO_PORTING
index 9f61bd6de65aaf0d1a3914b61594d1c61390f9f7..51a244389dc036645993beb49fa1f3e89deb0699 100644 (file)
--- a/DISTRO_PORTING
+++ b/DISTRO_PORTING
@@ -48,6 +48,9 @@ PAM:
         /etc/security/limits.conf will not be read unless you load pam_limits.
         Make sure you add modules your distro expects from user services.
 
+        Pass --with-pamconfdir=no to ./configure to avoid installing this file
+        and instead install your own.
+
 CONTRIBUTING UPSTREAM:
 
         We generally do no longer accept distribution-specific

diff --git a/Makefile.am b/Makefile.am
index b09b0cf1671c9674ca75ee4a3396dbd4f99c93e9..e740512f98b479bb322ca1f474dc982226fea8a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5902,8 +5902,10 @@ pam_systemd_la_LIBADD = \
 pamlib_LTLIBRARIES = \
        pam_systemd.la
 
+if ENABLE_PAM_CONFIG
 dist_pamconf_DATA = \
        src/login/systemd-user
+endif
 
 EXTRA_DIST += \
        src/login/systemd-user.m4

diff --git a/configure.ac b/configure.ac
index ccd212ef138b9807e620f5d355cf57d129ec8002..0e87adc38f6c039b8325bbb834ce843af1bb7170 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1507,9 +1507,10 @@ AC_ARG_WITH([pamlibdir],
 AX_NORMALIZE_PATH([with_pamlibdir])
 
 AC_ARG_WITH([pamconfdir],
-        AS_HELP_STRING([--with-pamconfdir=DIR], [Directory for PAM configuration]),
+        AS_HELP_STRING([--with-pamconfdir=DIR], [Directory for PAM configuration (pass no to disable installing)]),
         [],
         [with_pamconfdir=${sysconfdir}/pam.d])
+AM_CONDITIONAL(ENABLE_PAM_CONFIG, [test "$with_pamconfdir" != "no"])
 AX_NORMALIZE_PATH([with_pamconfdir])
 
 AC_ARG_ENABLE([split-usr],