Commit d9854577 authored by David Henningsson's avatar David Henningsson

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

This reverts commit 7276faca.

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.
parent 1d3fd4f8
......@@ -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?]))
......
......@@ -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>
......
......@@ -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,
......
......@@ -24,7 +24,7 @@
; default-server =
; default-dbus-server =
; autospawn = @PA_DEFAULT_AUTOSPAWN@
; autospawn = yes
; daemon-binary = @PA_BINARY@
; extra-arguments = --log-target=syslog
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment