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

diff --git a/Makefile.am b/Makefile.am
index 856accb0d6cb34dd9a65a6d019afbb5412a0d6f1..dd8b8250045e4d99af60d8f5b8659518e699e51c 100644 (file)
--- 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 26ae96585307c19b251c5a15f1468eb9514f4aa0..ad469c104194d5e8993aa31629fd60fd24eb162a 100644 (file)
--- 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 b643da9a73e064a30445510a6992c77cf23fb27b..d133847d5e4b36ea419e332018e563fda8d68ad2 100644 (file)
--- 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