mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-09 09:39:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix zlib detection when there is no pkg-config file

Browse source
This commit is contained in:
Xavier Claessens 2018-10-09 16:43:08 -04:00
parent a24ef929a4
commit b93e37592a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
meson.build
View 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')