[glib: 1/2] Meson: Remove unused zlib_libname variable



commit 9229f96fd6f68175749f0defef8db6409b1f1717
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Tue Jun 5 10:51:03 2018 -0400

    Meson: Remove unused zlib_libname variable

 meson.build | 9 ++-------
 1 file 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]