From b93e37592a3ccc0eaece1c8fef2d362b1e5fe685 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 9 Oct 2018 16:43:08 -0400 Subject: Fix zlib detection when there is no pkg-config file --- meson.build | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'meson.build') 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') -- cgit v1.2.3