build-sys: meson: Merge system_conf config data from default_conf
authorPatrick Gaskin <patrick@pgaskin.net>
Thu, 22 Apr 2021 13:04:43 +0000 (09:04 -0400)
committerPatrick Gaskin <patrick@pgaskin.net>
Fri, 23 Apr 2021 05:52:55 +0000 (01:52 -0400)
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/547>

src/daemon/meson.build

index 42bf59e..e19b290 100644 (file)
@@ -121,9 +121,7 @@ custom_target('default.pa',
 )
 
 system_conf = configuration_data()
-system_conf.merge_from(cdata)
-system_conf.set('PA_BINARY', cdata.get_unquoted('PA_BINARY'))
-system_conf.set('PA_SOEXT', cdata.get_unquoted('PA_SOEXT'))
+system_conf.merge_from(default_conf)
 
 system_template_file = configure_file(
   input : 'system.pa.in',