From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 25 Sep 2014 23:02:42 +0000 (-0400)
Subject: Revert "only build and install systemd-bus-proxyd if --enable-kdbus"
X-Git-Tag: v217~424
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=440c61c500ead1bdc6f987b8ba7c5e7f7a9c9f59;ds=inline

Revert "only build and install systemd-bus-proxyd if --enable-kdbus"

This reverts commit ef99aec4d25087dec995b3f00b6957dcee6b13e9.

systemd-stdio-bridge is used on non-kdbus systems.
---

diff --git a/Makefile.am b/Makefile.am
index 1bdc91c23..0f54c5c01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -387,6 +387,7 @@ rootlibexec_PROGRAMS = \
 	systemd-ac-power \
 	systemd-sysctl \
 	systemd-sleep \
+	systemd-bus-proxyd \
 	systemd-socket-proxyd \
 	systemd-update-done
 
@@ -2428,10 +2429,6 @@ systemd_run_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-if ENABLE_KDBUS
-rootlibexec_PROGRAMS += \
-	systemd-bus-proxyd
-
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c \
 	src/bus-proxyd/bus-policy.c \
@@ -2453,6 +2450,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