build-sys: meson: Merge system_conf config data from default_conf

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/547>
This commit is contained in:
Patrick Gaskin 2021-04-22 09:04:43 -04:00
parent 1c1d0c7827
commit d21d0d89a5

View 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',