shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

build-sys: make environment.d support conditional

Browse Source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-18 11:28:12 -05:00
parent 184d190473
commit 51e76f7cd1
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -345,13 +345,15 @@ 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_EXEC_HOOKS += \
install-touch-usr-hook \
install-busnames-target-wants-hook
if ENABLE_ENVIRONMENT_D
INSTALL_EXEC_HOOKS += \
install-environment-conf-hook
endif
# ------------------------------------------------------------------------------
AM_V_M4 = $(AM_V_M4_$(V))
AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
@ -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 \

9
configure.ac
View File

@ -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}