diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rwxr-xr-x | src/daemon/default.pa.in | 5 | ||||
| -rwxr-xr-x | src/daemon/system.pa.in | 5 |
4 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index caabef6ed..6e6049fec 100644 --- a/configure.ac +++ b/configure.ac @@ -1394,6 +1394,7 @@ AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension]) AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"]) AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files]) +AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR_UNQUOTED, pulseconfdir, [Location of configuration files]) #### Mac OSX specific stuff ##### diff --git a/meson.build b/meson.build index 1c671d32c..217ba0d85 100644 --- a/meson.build +++ b/meson.build @@ -136,6 +136,7 @@ cdata.set_quoted('PA_SRCDIR', join_paths(meson.current_source_dir(), 'src')) cdata.set_quoted('PA_BUILDDIR', meson.current_build_dir()) cdata.set_quoted('PA_SOEXT', '.so') cdata.set_quoted('PA_DEFAULT_CONFIG_DIR', pulsesysconfdir) +cdata.set('PA_DEFAULT_CONFIG_DIR_UNQUOTED', pulsesysconfdir) cdata.set_quoted('PA_BINARY', join_paths(bindir, 'pulseaudio')) cdata.set_quoted('PA_SYSTEM_RUNTIME_PATH', join_paths(localstatedir, 'run', 'pulse')) cdata.set_quoted('PA_SYSTEM_CONFIG_PATH', join_paths(localstatedir, 'lib', 'pulse')) diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 030334f36..3468a89b9 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -173,3 +173,8 @@ load-module module-filter-apply ### Make some devices default #set-default-sink output #set-default-source input + +### Allow including a default.pa.d directory, which if present, can be used +### for additional configuration snippets. +.nofail +.include @PA_DEFAULT_CONFIG_DIR_UNQUOTED@/default.pa.d diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in index 73e39ec93..1470e2368 100755 --- a/src/daemon/system.pa.in +++ b/src/daemon/system.pa.in @@ -60,3 +60,8 @@ load-module module-suspend-on-idle ### Enable positioned event sounds load-module module-position-event-sounds + +### Allow including a system.pa.d directory, which if present, can be used +### for additional configuration snippets. +.nofail +.include @PA_DEFAULT_CONFIG_DIR_UNQUOTED@/system.pa.d |