summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorSanchayan Maity <sanchayan@asymptotic.io>2020-09-02 19:19:07 +0530
committerArun Raghavan <arun@arunraghavan.net>2020-11-23 22:07:36 +0000
commit45abd0b43c7901b375afcba6d9b0e1cca2f349a8 (patch)
treeae94702b02361a514a02a04b92bf336f64db1bf8 /meson.build
parenta28f2e7293a055588f7bba568b5049ff91b3aad0 (diff)
Add default.pa.d folder support
The .include meta command already supports specifying a directory and when including a directory, all files with the extension '.pa' in that directory will be parsed in alphabetical order. This feature can be used to add support for default.pa.d directory, so that packages for other applications or users can just drop in a file for configuration without changing the default.pa which is shipped. We use the PA_DEFAULT_CONFIG_DIR for this, however, since meson quotes this build variable, introduce an unquoted version for this purpose and use it with .include. Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/909 Signed-off-by: Sanchayan Maity <sanchayan@asymptotic.io>
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build1
1 files changed, 1 insertions, 0 deletions
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'))