summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac4
-rw-r--r--units/.gitignore2
-rw-r--r--units/user@.service.m4.in (renamed from units/user@.service.in)0
4 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 162a7be45e..7556db8d70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,7 +489,7 @@ EXTRA_DIST += \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
- units/user@.service.in \
+ units/user@.service.m4.in \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
@@ -508,7 +508,8 @@ CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
units/container-getty@.service.m4 \
- units/rescue.service.m4
+ units/rescue.service.m4 \
+ units/user@.service.m4
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
@@ -4612,11 +4613,11 @@ src/%: src/%.m4
$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
units/%: units/%.m4
- $(AM_V_M4)$(MKDIR_P) $(dir $@)
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
units/user/%: units/%.m4
- $(AM_V_M4)$(MKDIR_P) $(dir $@)
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
if ENABLE_POLKIT
diff --git a/configure.ac b/configure.ac
index efca1a7d3a..5e30af3d6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,8 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod])
AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec])
+M4_DEFINES=
+
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],
@@ -808,6 +810,7 @@ AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by de
if test "x$enable_kdbus" == "xyes"; then
AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus support is to be enabled])
have_kdbus=yes
+ M4_DEFINES="$M4_DEFINES -DENABLE_KDBUS"
fi
AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])
@@ -923,7 +926,6 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
# Location of the init scripts as mandated by LSB
SYSTEM_SYSVINIT_PATH=/etc/init.d
SYSTEM_SYSVRCND_PATH=/etc/rc.d
-M4_DEFINES=
AC_ARG_WITH([sysvinit-path],
[AS_HELP_STRING([--with-sysvinit-path=PATH],
diff --git a/units/.gitignore b/units/.gitignore
index 76c4cb39e6..6de2aad5b0 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -65,4 +65,4 @@
/systemd-update-utmp.service
/systemd-user-sessions.service
/systemd-vconsole-setup.service
-/user@.service
+/user@.service.m4
diff --git a/units/user@.service.in b/units/user@.service.m4.in
index 7b7d52b60b..7b7d52b60b 100644
--- a/units/user@.service.in
+++ b/units/user@.service.m4.in