diff options
| -rw-r--r-- | bus/Makefile.am | 5 | ||||
| -rw-r--r-- | bus/dbus.service.in | 4 | ||||
| -rw-r--r-- | bus/dbus.socket.in | 3 | ||||
| -rw-r--r-- | configure.in | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index a5889ff1..5c4fb15b 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -223,6 +223,11 @@ if HAVE_SYSTEMD # Install dbus.socket as default implementation of a D-Bus stack $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants $(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket +# Unconditionally enable D-Bus on systemd installations + $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants + $(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket + $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants + $(LN_S) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service endif #### Init scripts fun diff --git a/bus/dbus.service.in b/bus/dbus.service.in index 173fcd61..399306f6 100644 --- a/bus/dbus.service.in +++ b/bus/dbus.service.in @@ -8,7 +8,3 @@ ExecStartPre=@EXPANDED_BINDIR@/dbus-uuidgen --ensure ExecStartPre=-/bin/rm -f @DBUS_SYSTEM_PID_FILE@ ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --systemd-activation ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig - -[Install] -WantedBy=multi-user.target -Also=dbus.socket diff --git a/bus/dbus.socket.in b/bus/dbus.socket.in index a4bb5f2c..74cbe582 100644 --- a/bus/dbus.socket.in +++ b/bus/dbus.socket.in @@ -3,6 +3,3 @@ Description=D-Bus System Message Bus Socket [Socket] ListenStream=@DBUS_SYSTEM_SOCKET@ - -[Install] -WantedBy=sockets.target diff --git a/configure.in b/configure.in index 8a7dc6f3..2d6e3ccf 100644 --- a/configure.in +++ b/configure.in @@ -1388,8 +1388,10 @@ AM_CONDITIONAL(DBUS_INIT_SCRIPTS_CYGWIN, test x$with_init_scripts = xcygwin) AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) +if test "x$with_systemdsystemunitdir" != xno; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) ##### Set up location for system bus socket if ! test -z "$with_system_socket"; then |