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

Merge branch 'zlib' into 'master'

Browse Source 
Check for zlib header

See merge request GNOME/glib!486
This commit is contained in:
Philip Withnall 2018-11-23 09:28:03 +00:00
commit 10be7824a1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -1765,10 +1765,9 @@ if not libz_dep.found()
libz_dep = cc.find_library('zlib', required : false)
endif
endif
endif
if not libz_dep.found()
libz_dep = subproject('zlib').get_variable('zlib_dep')
if not libz_dep.found() or not cc.has_header('zlib.h')
libz_dep = subproject('zlib').get_variable('zlib_dep')
endif
endif
# First check in libc, fallback to libintl, and as last chance build