luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'libz-fallback' into 'master'

Browse Source 
Check for 'z' library before fallbacking to subproject

See merge request GNOME/glib!482
This commit is contained in:
Philip Withnall 2018-11-19 22:38:57 +00:00
commit 23f286e040
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meson.build
View File

@ -1752,26 +1752,25 @@ endif
libm = cc.find_library('m', required : false)
libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep'])
if cc.get_id() != 'msvc'
libz_dep = dependency('zlib', fallback : ['zlib', 'zlib_dep'])
else
# MSVC: Don't use the bundled ZLib sources until we are sure that we can't
# find the ZLib .lib
libz_dep = dependency('zlib', required : false)
# MSVC: Search for the ZLib .lib, which corresponds to the results of
# of using ZLib's win32/makefile.msc.
if not libz_dep.found()
# Don't use the bundled ZLib sources until we are sure that we can't find it on
# the system
libz_dep = dependency('zlib', required : false)
if not libz_dep.found()
if cc.get_id() != 'msvc'
libz_dep = cc.find_library('z', required : false)
else
libz_dep = cc.find_library('zlib1', required : false)
if not libz_dep.found()
libz_dep = cc.find_library('zlib', required : false)
if not libz_dep.found()
libz_dep = subproject('zlib').get_variable('zlib_dep')
endif
endif
endif
endif
if not libz_dep.found()
libz_dep = subproject('zlib').get_variable('zlib_dep')
endif
# First check in libc, fallback to libintl, and as last chance build
# proxy-libintl subproject.
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible