From 6f3b0bd108aee3078fa25557f8831d12afd42ea1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 8 Feb 2021 15:51:46 +0000
Subject: Bugfix in TIP #430 implementation: tcl_findLibrary should use the
 same zip-file naming as the configure scripts do

---
 library/auto.tcl  | 7 +++----
 unix/configure    | 2 +-
 unix/configure.ac | 2 +-
 win/configure     | 2 +-
 win/configure.ac  | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/library/auto.tcl b/library/auto.tcl
index db7952a..51d4ef1 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -77,7 +77,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 	catch {
 	    set found 0
 	    set root [zipfs root]
-	    set mountpoint [file join $root lib [string tolower $basename]]
+	    set mountpoint [file join $root lib $basename]
 	    lappend dirs [file join $root app ${basename}_library]
 	    lappend dirs [file join $root lib $mountpoint ${basename}_library]
 	    lappend dirs [file join $root lib $mountpoint]
@@ -86,7 +86,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 		set found 0
 		foreach pkgdat [info loaded] {
 		    lassign $pkgdat dllfile dllpkg
-		    if {[string tolower $dllpkg] ne [string tolower $basename]} continue
+		    if {$dllpkg ne $basename} continue
 		    if {$dllfile eq {}} {
 			# Loaded statically
 			break
@@ -101,8 +101,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 		    lappend paths [::${basename}::pkgconfig get libdir,runtime]
 		    lappend paths [::${basename}::pkgconfig get bindir,runtime]
 		    if {[catch {::${basename}::pkgconfig get zipfile,runtime} zipfile]} {
-			set zipfile [string tolower \
-			"lib${basename}_[join [list {*}[split $version .] {*}$patch] _].zip"]
+			set zipfile "lib${basename}[join [split $patch .] _].zip"
 		    }
 		    lappend paths [file dirname [file join [pwd] [info nameofexecutable]]]
 		    foreach path $paths {
diff --git a/unix/configure b/unix/configure
index 26de9a8..70e46d7 100755
--- a/unix/configure
+++ b/unix/configure
@@ -11149,7 +11149,7 @@ printf "%s\n" "No zip found on PATH. Building minizip" >&6; }
 
 
 	ZIPFS_BUILD=1
-	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}_${TCL_PATCH_LEVEL}.zip
+	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
diff --git a/unix/configure.ac b/unix/configure.ac
index 9967ef8..55ce886 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -888,7 +888,7 @@ if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then
     #
     SC_ZIPFS_SUPPORT
 	ZIPFS_BUILD=1
-	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}_${TCL_PATCH_LEVEL}.zip
+	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
diff --git a/win/configure b/win/configure
index ae9e666..33716bc 100755
--- a/win/configure
+++ b/win/configure
@@ -5135,7 +5135,7 @@ printf "%s\n" "No zip found on PATH building minizip" >&6; }
 
 
 	ZIPFS_BUILD=1
-	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}_${TCL_PATCH_LEVEL}.zip
+	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
diff --git a/win/configure.ac b/win/configure.ac
index 02b6363..6184144 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -180,7 +180,7 @@ if test "$tcl_ok" = "yes" ; then
     SC_PROG_TCLSH
     SC_ZIPFS_SUPPORT
 	ZIPFS_BUILD=1
-	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}_${TCL_PATCH_LEVEL}.zip
+	TCL_ZIP_FILE=libtcl_${TCL_MAJOR_VERSION}_${TCL_MINOR_VERSION}${TCL_PATCH_LEVEL}.zip
 else
 	ZIPFS_BUILD=0
 	TCL_ZIP_FILE=
-- 
cgit v0.12