diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-06-05 15:37:57 +0000 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-06-05 15:37:57 +0000 |
| commit | 0a36314b28f42e20f8885e4a6e6936b228ec8e46 (patch) | |
| tree | 198eacc5b288d9459a511598f4543ad328b1888e | |
| parent | 68d99c766b580e33c43c1ea993f7e94f89a77cfa (diff) | |
| parent | 9229f96fd6f68175749f0defef8db6409b1f1717 (diff) | |
| download | glib-0a36314b28f42e20f8885e4a6e6936b228ec8e46.tar.gz | |
Merge branch 'meson-unused-zlib-libname' into 'master'
Meson: Remove unused zlib_libname variable
See merge request GNOME/glib!61
| -rw-r--r-- | meson.build | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meson.build b/meson.build index a89ca55cd..1ab06a44d 100644 --- a/meson.build +++ b/meson.build @@ -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 |