summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am17
-rw-r--r--configure.ac8
2 files changed, 10 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index dcf0bb3bb3..3f47bc8e5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1899,6 +1899,7 @@ bus-proxyd-uninstall-hook:
INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+if ENABLE_KDBUS
nodist_systemunit_DATA += \
units/systemd-bus-proxyd@.service
@@ -1910,6 +1911,7 @@ dist_userunit_DATA += \
USER_UNIT_ALIASES += \
$(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+endif
EXTRA_DIST += \
units/systemd-bus-proxyd@.service.in
@@ -3697,7 +3699,14 @@ dist_zshcompletion_DATA += \
endif
-if ENABLE_BUS_DRIVERD
+polkitpolicy_in_files += \
+ src/hostname/org.freedesktop.hostname1.policy.in
+
+EXTRA_DIST += \
+ units/systemd-hostnamed.service.in
+
+# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
systemd_bus_driverd_SOURCES = \
src/bus-driverd/bus-driverd.c
@@ -3711,12 +3720,6 @@ rootlibexec_PROGRAMS += \
systemd-bus-driverd
endif
-polkitpolicy_in_files += \
- src/hostname/org.freedesktop.hostname1.policy.in
-
-EXTRA_DIST += \
- units/systemd-hostnamed.service.in
-
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_SOURCES = \
diff --git a/configure.ac b/configure.ac
index 8d16bd4598..9a32d9c8b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -751,14 +751,6 @@ fi
AM_CONDITIONAL(ENABLE_TIMEDATED, [test "$have_timedated" = "yes"])
# ------------------------------------------------------------------------------
-have_bus_driverd=no
-AC_ARG_ENABLE(bus_driverd, AS_HELP_STRING([--disable-bus-driverd], [disable systemd bus-driver daemon]))
-if test "x$enable_bus_driverd" != "xno"; then
- have_bus_driverd=yes
-fi
-AM_CONDITIONAL(ENABLE_BUS_DRIVERD, [test "$have_bus_driverd" = "yes"])
-
-# ------------------------------------------------------------------------------
have_localed=no
AC_ARG_ENABLE(localed, AS_HELP_STRING([--disable-localed], [disable locale daemon]))
if test "x$enable_localed" != "xno"; then