From d9854577c3046d631ac47fb84c800e3e87aea397 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Fri, 19 Dec 2014 13:46:11 +0100
Subject: Revert "launch: Disable autospawn by default when systemd daemon
 support is enabled."

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.
---
 configure.ac                   | 3 ---
 man/pulse-client.conf.5.xml.in | 2 +-
 src/pulse/client-conf.c        | 4 ----
 src/pulse/client.conf.in       | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index a888c9986..68437297f 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 7025df76a..45f02da98 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -69,7 +69,7 @@ USA.
 
     <option>
       <p><opt>autospawn=</opt> Autospawn a PulseAudio daemon when
-      needed. Takes a boolean value, defaults to <opt>@PA_DEFAULT_AUTOSPAWN@</opt>.</p>
+      needed. Takes a boolean value, defaults to <opt>yes</opt>.</p>
     </option>
 
     <option>
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 80ddae02f..e0acc237d 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -65,11 +65,7 @@ static const pa_client_conf default_conf = {
     .cookie_from_x11_valid = false,
     .cookie_file_from_application = NULL,
     .cookie_file_from_client_conf = NULL,
-#ifdef HAVE_SYSTEMD_DAEMON
-    .autospawn = false,
-#else
     .autospawn = true,
-#endif
     .disable_shm = false,
     .shm_size = 0,
     .auto_connect_localhost = false,
diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in
index 446e22a3a..17753b02e 100644
--- a/src/pulse/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -24,7 +24,7 @@
 ; default-server =
 ; default-dbus-server =
 
-; autospawn = @PA_DEFAULT_AUTOSPAWN@
+; autospawn = yes
 ; daemon-binary = @PA_BINARY@
 ; extra-arguments = --log-target=syslog
 
-- 
cgit v1.2.3