diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-10-09 23:43:08 +0300 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-11-19 23:21:07 +0300 |
| commit | b93e37592a3ccc0eaece1c8fef2d362b1e5fe685 (patch) | |
| tree | 1e870cde7cd040e27bf94e7a520e775cb765fc86 /meson.build | |
| parent | a24ef929a4b0107964390931da5dcb234035a105 (diff) | |
Fix zlib detection when there is no pkg-config file
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meson.build b/meson.build index d4bcc55bd..22342a2db 100644 --- a/meson.build +++ b/meson.build @@ -304,13 +304,19 @@ if build_gstgl endforeach endif -zlib_dep = dependency('zlib', fallback: ['zlib', 'zlib_dep']) +zlib_dep = dependency('zlib', required : false) +if not zlib_dep.found() + zlib_dep = cc.find_library('z', required : false) + if not zlib_dep.found() + zlib_dep = subproject('zlib').get_variable('zlib_dep') + endif +endif +cdata.set('HAVE_ZLIB', true) + 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', zlib_dep.found()) - gst_plugins_good_args = ['-DHAVE_CONFIG_H'] configinc = include_directories('.') libsinc = include_directories('gst-libs') |