Fix zlib detection when there is no pkg-config file
authorXavier Claessens <xavier.claessens@collabora.com>
Tue, 9 Oct 2018 20:43:08 +0000 (16:43 -0400)
committerXavier Claessens <xavier.claessens@collabora.com>
Mon, 19 Nov 2018 20:21:07 +0000 (15:21 -0500)
meson.build

index d4bcc55..22342a2 100644 (file)
@@ -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')