build-sys: build bus-driverd if kdbus support is enabled

diff --git a/Makefile.am b/Makefile.am
index dcf0bb3bb3fa120799d20b65c740b512e7340502..3f47bc8e5d094ddffb655ebaf6eb0c7c34e018ef 100644 (file)
--- 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
 
 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
 
 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
 
 USER_UNIT_ALIASES += \
        $(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service

+endif

 
 EXTRA_DIST += \
        units/systemd-bus-proxyd@.service.in
 
 EXTRA_DIST += \
        units/systemd-bus-proxyd@.service.in


@@ -3697,7 +3699,14 @@ dist_zshcompletion_DATA += \
 
 endif
 
 
 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
 
 systemd_bus_driverd_SOURCES = \
        src/bus-driverd/bus-driverd.c
 


@@ -3711,12 +3720,6 @@ rootlibexec_PROGRAMS += \
        systemd-bus-driverd
 endif
 
        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 = \
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \

diff --git a/configure.ac b/configure.ac
index 8d16bd459864055451c679e4917e0229946f872e..9a32d9c8b6333db21c5dd8e134db3c0cc61fc11a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -750,14 +750,6 @@ if test "x$enable_timedated" != "xno"; then
 fi
 AM_CONDITIONAL(ENABLE_TIMEDATED, [test "$have_timedated" = "yes"])
 
 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]))
 # ------------------------------------------------------------------------------
 have_localed=no
 AC_ARG_ENABLE(localed, AS_HELP_STRING([--disable-localed], [disable locale daemon]))