From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 18 Feb 2017 16:28:12 +0000 (-0500)
Subject: build-sys: make environment.d support conditional
X-Git-Tag: v233~59^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51e76f7cd137bd57c035f96f447c08991226999d;p=thirdparty%2Fsystemd.git

build-sys: make environment.d support conditional

We have ./configure switches for various parts of non-essential functionality,
let's add one for this new stuff too. Support for environment generators is
not conditional — if you don't want them, just don't install any.
---

diff --git a/Makefile.am b/Makefile.am
index 337a053eade..96382baffa9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -345,12 +345,14 @@ install-touch-usr-hook:
 INSTALL_EXEC_HOOKS += \
 	install-target-wants-hook \
 	install-directories-hook \
-	install-environment-conf-hook \
 	install-aliases-hook \
-	install-touch-usr-hook
+	install-touch-usr-hook \
+	install-busnames-target-wants-hook
 
+if ENABLE_ENVIRONMENT_D
 INSTALL_EXEC_HOOKS += \
-	install-busnames-target-wants-hook
+	install-environment-conf-hook
+endif
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -432,8 +434,10 @@ systemgenerator_PROGRAMS = \
 	systemd-system-update-generator \
 	systemd-debug-generator
 
+if ENABLE_ENVIRONMENT_D
 userenvgenerator_PROGRAMS = \
 	30-systemd-environment-d-generator
+endif
 
 dist_bashcompletion_data = \
 	shell-completion/bash/busctl \
diff --git a/configure.ac b/configure.ac
index ab1d17c5317..01bbf993828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1040,6 +1040,14 @@ if test "x$enable_tmpfiles" != "xno"; then
 fi
 AM_CONDITIONAL(ENABLE_TMPFILES, [test "$have_tmpfiles" = "yes"])
 
+# ------------------------------------------------------------------------------
+have_environment_d=no
+AC_ARG_ENABLE(environment-d, AS_HELP_STRING([--disable-environment-d], [disable environment.d support]))
+if test "x$enable_environment_d" != "xno"; then
+        have_environment_d=yes
+fi
+AM_CONDITIONAL(ENABLE_ENVIRONMENT_D, [test "$have_environment_d" = "yes"])
+
 # ------------------------------------------------------------------------------
 have_sysusers=no
 AC_ARG_ENABLE(sysusers, AS_HELP_STRING([--disable-sysusers], [disable sysusers support]))
@@ -1655,6 +1663,7 @@ AC_MSG_RESULT([
         vconsole:                          ${have_vconsole}
         quotacheck:                        ${have_quotacheck}
         tmpfiles:                          ${have_tmpfiles}
+        environment.d:                     ${have_environment_d}
         sysusers:                          ${have_sysusers}
         firstboot:                         ${have_firstboot}
         randomseed:                        ${have_randomseed}