From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Date: Tue, 17 Mar 2015 15:37:07 +0000 (+0100)
Subject: resolved: Do not add .busname dependencies, when compiling without kdbus.
X-Git-Tag: v219.0~267
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=defa8e675b2903ad53e093bb2847c7256f0779a5

resolved: Do not add .busname dependencies, when compiling without kdbus.
---

diff --git a/Makefile.am b/Makefile.am
index 856accb0d..dd8b82500 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5611,7 +5611,7 @@ dist_dbussystemservice_DATA += \
 	src/resolve/org.freedesktop.resolve1.service
 
 EXTRA_DIST += \
-	units/systemd-resolved.service.in
+	units/systemd-resolved.service.m4.in
 
 SYSTEM_UNIT_ALIASES += \
 	systemd-resolved.service dbus-org.freedesktop.resolve1.service
diff --git a/units/.gitignore b/units/.gitignore
index 26ae96585..ad469c104 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -56,6 +56,7 @@
 /systemd-reboot.service
 /systemd-remount-fs.service
 /systemd-resolved.service
+/systemd-resolved.service.m4
 /systemd-hibernate-resume@.service
 /systemd-rfkill@.service
 /systemd-shutdownd.service
diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.m4.in
similarity index 96%
rename from units/systemd-resolved.service.in
rename to units/systemd-resolved.service.m4.in
index b643da9a7..d133847d5 100644
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.m4.in
@@ -10,11 +10,13 @@ Description=Network Name Resolution
 Documentation=man:systemd-resolved.service(8)
 After=systemd-networkd.service network.service
 
+m4_ifdef(`ENABLE_KDBUS',
 # On kdbus systems we pull in the busname explicitly, because it
 # carries policy that allows the daemon to acquire its name.
 Wants=org.freedesktop.resolve1.busname
 After=org.freedesktop.resolve1.busname
 
+)m4_dnl
 [Service]
 Type=notify
 Restart=always