diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-12-30 01:52:13 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-12-30 01:52:13 +0000 |
| commit | 5efc48977e1777feec9614f31da88e1c84a2e22e (patch) | |
| tree | b3f20781f71d68dbb34342574ce032a321aab490 | |
| parent | 10ff3c8e14e8fba9e0a5d696dce0bea27de644d7 (diff) | |
meson: zlib is not actually a hard requirement
| -rw-r--r-- | meson.build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meson.build b/meson.build index f322ed0f6..c62cba707 100644 --- a/meson.build +++ b/meson.build @@ -189,16 +189,14 @@ gsttag_dep = dependency('gstreamer-tag-1.0', version : gst_req, gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_req, fallback : ['gst-plugins-base', 'video_dep']) -zlib_dep = dependency('zlib') +zlib_dep = dependency('zlib', required : false) bz2lib = cc.find_library('bz2', required : false) glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']), dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])] gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep']) -cdata.set('HAVE_ZLIB', 1) -if bz2lib.found() - cdata.set('HAVE_BZ2', 1) -endif +cdata.set('HAVE_ZLIB', zlib_dep.found()) +cdata.set('HAVE_BZ2', bz2lib.found()) # Check all of the things. # TODO: None of these are actually used yet because |