mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: meson: Fix some defines for default.pa generation

Browse source 
Removes a warning from HAVE_GCONF not being set, and fixes generation of
a large section that depends on OS_IS_WIN32 being explicitly set to 0.

We can't set OS_IS_WIN32 to 0 by default since a bunch of code uses it
via an ifdef rather than by value.
This commit is contained in:
Arun Raghavan 2019-08-05 10:30:50 +05:30
parent 7f44a623e0
commit 34a8c3aa70
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/daemon/meson.build
View file

@ -93,6 +93,9 @@ default_conf.merge_from(cdata)
default_conf.set('PA_BINARY', cdata.get_unquoted('PA_BINARY')) default_conf.set('PA_BINARY', cdata.get_unquoted('PA_BINARY'))
default_conf.set('PA_SOEXT', cdata.get_unquoted('PA_SOEXT')) default_conf.set('PA_SOEXT', cdata.get_unquoted('PA_SOEXT'))
default_conf.set10('HAVE_AF_UNIX', cc.has_header('sys/un.h')) default_conf.set10('HAVE_AF_UNIX', cc.has_header('sys/un.h'))
default_conf.set10('OS_IS_WIN32', host_machine.system() == 'windows')
# We don't support the deprecated GConf option in meson
default_conf.set10('HAVE_GCONF', 0)
default_template_file = configure_file( default_template_file = configure_file(
input : 'default.pa.in', input : 'default.pa.in',