diff options
| author | Arun Raghavan <arun@arunraghavan.net> | 2019-08-05 10:30:50 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2019-08-05 10:30:50 +0530 |
| commit | 34a8c3aa700aa7f4357b8746584a8f6d0bd40ea8 (patch) | |
| tree | 5661b142051fda1902455d461179131403e6e33f | |
| parent | 7f44a623e0a8a91cd14bcf13ec67da1bd53e5dff (diff) | |
| download | pulseaudio-34a8c3aa700aa7f4357b8746584a8f6d0bd40ea8.tar.gz | |
build-sys: meson: Fix some defines for default.pa generation
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.
| -rw-r--r-- | src/daemon/meson.build | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/daemon/meson.build b/src/daemon/meson.build index 571c5e2c..7f075b06 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -93,6 +93,9 @@ default_conf.merge_from(cdata) default_conf.set('PA_BINARY', cdata.get_unquoted('PA_BINARY')) 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('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( input : 'default.pa.in', |