Fix zlib detection when there is no pkg-config file
This commit is contained in:
parent
a24ef929a4
commit
b93e37592a
12
meson.build
12
meson.build
@ -304,13 +304,19 @@ if build_gstgl
|
|||||||
endforeach
|
endforeach
|
||||||
endif
|
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']),
|
glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']),
|
||||||
dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])]
|
dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])]
|
||||||
gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_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']
|
gst_plugins_good_args = ['-DHAVE_CONFIG_H']
|
||||||
configinc = include_directories('.')
|
configinc = include_directories('.')
|
||||||
libsinc = include_directories('gst-libs')
|
libsinc = include_directories('gst-libs')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user