From: Felipe Sateler <fsateler@gmail.com>
Date: Wed, 12 Oct 2016 14:56:27 +0000 (-0300)
Subject: build-sys: Allow disabling installation of pam config snippet
X-Git-Tag: v232~102^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4358%2Fhead;p=thirdparty%2Fsystemd.git

build-sys: Allow disabling installation of pam config snippet
---

diff --git a/DISTRO_PORTING b/DISTRO_PORTING
index 9f61bd6de65..51a244389dc 100644
--- 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 b09b0cf1671..e740512f98b 100644
--- 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 ccd212ef138..0e87adc38f6 100644
--- 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],