Commit 0a36314b authored by Christoph Reiter's avatar Christoph Reiter 🐍

Merge branch 'meson-unused-zlib-libname' into 'master'

Meson: Remove unused zlib_libname variable

See merge request GNOME/glib!61
parents 68d99c76 9229f96f
......@@ -1667,7 +1667,6 @@ endif
libm = cc.find_library('m', required : false)
libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep'])
zlib_libname = '-lz'
if cc.get_id() != 'msvc'
libz_dep = dependency('zlib', fallback : ['zlib', 'zlib_dep'])
else
......@@ -1679,13 +1678,9 @@ else
# of using ZLib's win32/makefile.msc.
if not libz_dep.found()
libz_dep = cc.find_library('zlib1', required : false)
if libz_dep.found()
zlib_libname = '-lzlib1'
else
if not libz_dep.found()
libz_dep = cc.find_library('zlib', required : false)
if libz_dep.found()
zlib_libname = '-lzlib'
else
if not libz_dep.found()
libz_dep = subproject('zlib').get_variable('zlib_dep')
endif
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment