0031178: Configuration, genproj - fix searching for zlib on Linux platform

zlib library is called libz on Linux.

diff --git a/adm/genconf.tcl b/adm/genconf.tcl
index 799945e3babda74a4fa982a7e56705f268bfbfbf..401656495d8c939743f85c3d7e1914132d0d0d92 100644 (file)
--- a/adm/genconf.tcl
+++ b/adm/genconf.tcl
@@ -198,7 +198,11 @@ proc wokdep:gui:UpdateList {} {
   }
 
   if { "$::HAVE_ZLIB" == "true" } {
-    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "zlib" {"zlib"}
+    set aCheckLib "z"
+    if { "$::tcl_platform(platform)" == "windows" } {
+      set aCheckLib "zlib"
+    }
+    wokdep:SearchStandardLibrary  anIncErrs anLib32Errs anLib64Errs anBin32Errs anBin64Errs "zlib" "zlib.h" "$aCheckLib" {"zlib"}
   }
   if { "$::HAVE_LIBLZMA" == "true" } {
     set aCheckLib "lzma"

diff --git a/adm/genproj.tcl b/adm/genproj.tcl
index b95166d1b3076215a9e74aac9d129848b1549f50..513fe1dd7f0ffec081387a87a5c7dcfd860e47c4 100644 (file)
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
@@ -1371,7 +1371,7 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
     }
   }
   if { "$::HAVE_ZLIB" == "true" } {
-    set aLibsMap(CSF_ZLIB) "zlib"
+    set aLibsMap(CSF_ZLIB) "z"
   }
   if { "$::HAVE_LIBLZMA" == "true" } {
     set aLibsMap(CSF_LIBLZMA) "liblzma"
@@ -1408,6 +1408,10 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
 
     # tbb headers define different pragma lib depending on debug/release
     set aLibsMap(CSF_TBB) ""
+
+    if { "$::HAVE_ZLIB" == "true" } {
+      set aLibsMap(CSF_ZLIB) "zlib"
+    }
   } else {
     set aLibsMap(CSF_dl)           "dl"
     if { "$theOS" == "mac" || "$theOS" == "ios" } {