Revert "launch: Disable autospawn by default when systemd daemon support is enabled."

System Internals / PulseAudio - David Henningsson [canonical.com] - 19 December 2014 06:46 UTC

This reverts commit 7276faca72e9696d4891daff139aee52509f43bf.

Using the new systemd socket activation for PulseAudio will cause PulseAudio to not have any connection with D-Bus, breaking device reservation protocol, module-jackdbus-detect and module-dbus-protocol. Therefore, autospawn is now still enabled by default even if you build with systemd daemon headers.

###

diff --git a/configure.ac b/configure.ac
index a888c99..6843729 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1230,9 +1230,6 @@ AS_IF([test "x$enable_systemd_daemon" != "xno"],
AS_IF([test "x$enable_systemd_daemon" = "xyes" && test "x$HAVE_SYSTEMD_DAEMON" = "x0"],
[AC_MSG_ERROR([*** Needed systemd daemon support not found])])

-AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], [ PA_DEFAULT_AUTOSPAWN=no ], [ PA_DEFAULT_AUTOSPAWN=yes ])
-AC_SUBST(PA_DEFAULT_AUTOSPAWN)
-
AC_SUBST(HAVE_SYSTEMD_DAEMON)
AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = x1])
AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], AC_DEFINE([HAVE_SYSTEMD_DAEMON], 1, [Have SYSTEMDDAEMON?]))
diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in
index 7025df7..45f02da 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -69,7 +69,7 @@ USA.

autospawn= Autospawn a PulseAudio daemon when
- needed. Takes a boolean value, defaults to @PA_DEFAULT_AUTOSPAWN@.


+ needed. Takes a boolean value, defaults to yes.