[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: meson: fix build with simple

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
f5f474dc by David Heidelberg at 2019-04-10T17:09:40Z
meson: fix build with simple

Signed-off-by: David Heidelberg <david at ixit.cz>

- - - - -
44c15e60 by David Heidelberg at 2019-04-10T17:09:40Z
meson: when avahi is disabled, do not build it's code

Signed-off-by: David Heidelberg <david at ixit.cz>

- - - - -


1 changed file:

- meson.build


Changes:

=====================================
meson.build
=====================================
@@ -249,6 +249,8 @@ if get_option('database') == 'tdb'
   database_dep = dependency('tdb')
 elif get_option('database') == 'gdbm'
   database_dep = cc.find_library('gdbm', required : true)
+else
+  database_dep = dependency('', required:false)
 endif
 
 if get_option('ipv6')
@@ -333,7 +335,7 @@ if get_option('hal-compat')
   cdata.set('HAVE_HAL_COMPAT', 1)
 endif
 
-avahi_dep = dependency('avahi-client', version : '>= 0.6.0', required : get_option('avahi'))
+avahi_dep = dependency('avahi-client', version : '>= 0.6.0', required : get_option('avahi'), disabler : true)
 if avahi_dep.found()
   cdata.set('HAVE_AVAHI', 1)
 endif



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/363b1ae69ca0c8fe0304e70825025708864942bc...44c15e6001fce0f5988612dc1eed4b1c0226e52c

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/363b1ae69ca0c8fe0304e70825025708864942bc...44c15e6001fce0f5988612dc1eed4b1c0226e52c
You're receiving this email because of your account on gitlab.freedesktop.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20190410/d78e6706/attachment.html>