default.pa: add module-gsettings

This also makes the module-gconf section conditional on HAVE_GCONF,
because if only gsettings support is built, the gconf section in the
configuration file would be redundant and confusing.

diff --git a/configure.ac b/configure.ac
index bdaaef2..5720c28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -925,6 +925,7 @@ AS_IF([test "x$enable_gconf" = "xyes" && test "x$HAVE_GCONF" = "x0"],
     [AC_MSG_ERROR([*** GConf support not found])])
 
 AM_CONDITIONAL([HAVE_GCONF], [test "x$HAVE_GCONF" = x1])
+AC_SUBST([HAVE_GCONF])
 
 #### GSettings support (optional) ####
 
@@ -939,6 +940,7 @@ AS_IF([test "x$enable_gsettings" = "xyes" && test "x$HAVE_GSETTINGS" = "x0"],
     [AC_MSG_ERROR([*** GSettings support not found])])
 
 AM_CONDITIONAL([HAVE_GSETTINGS], [test "x$HAVE_GSETTINGS" = x1])
+AC_SUBST([HAVE_GSETTINGS])
 
 if test "x$enable_gsettings" = "xyes" && test "x$HAVE_GSETTINGS" = "x1" ; then
     GLIB_GSETTINGS

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 7a68653..14b6a6f 100755 (executable)
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -110,6 +110,18 @@ ifelse(@OS_IS_WIN32@, 0, [dnl
 #load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
 #load-module module-rtp-send source=rtp.monitor
 
+ifelse(@HAVE_GSETTINGS@, 1, [dnl
+### Load additional modules from GSettings. This can be configured with the paprefs tool.
+### Please keep in mind that the modules configured by paprefs might conflict with manually
+### loaded modules.
+.ifexists module-gsettings@PA_SOEXT@
+.nofail
+load-module module-gsettings
+.fail
+.endif
+])dnl
+
+ifelse(@HAVE_GCONF@, 1, [dnl
 ### Load additional modules from GConf settings. This can be configured with the paprefs tool.
 ### Please keep in mind that the modules configured by paprefs might conflict with manually
 ### loaded modules.
@@ -118,6 +130,7 @@ ifelse(@OS_IS_WIN32@, 0, [dnl
 load-module module-gconf
 .fail
 .endif
+])dnl
 
 ### Automatically restore the default sink/source when changed by the user
 ### during runtime