From af4a77f3e35d39964eeae9c3636a42d6d29f4d5d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 9 Feb 2021 12:07:09 +0000
Subject: Change TCL_ZIP_FILE name, just using dots in stead of underscores

---
 tests/zipfs.test  | 2 +-
 unix/configure    | 2 +-
 unix/configure.ac | 2 +-
 unix/tcl.pc.in    | 1 -
 win/configure     | 2 +-
 win/configure.ac  | 2 +-
 win/tcl.m4        | 2 --
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/zipfs.test b/tests/zipfs.test
index fd40f9e..8689268 100644
--- a/tests/zipfs.test
+++ b/tests/zipfs.test
@@ -39,7 +39,7 @@ if {![string match ${ziproot}* $tcl_library]} {
     # Hack the environment to pretend we did pull tcl_library from a zip
     # archive
     ###
-    set tclzip [file join $CWD [::tcl::pkgconfig get dllfile,runtime]]
+    set tclzip [file join $CWD libtcl[info patchlevel].zip]
     testConstraint zipfslib [file isfile $tclzip]
     if {[testConstraint zipfslib]} {
         zipfs mount /lib/tcl $tclzip
diff --git a/unix/configure b/unix/configure
index 34500ba..f54edf9 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 ad837b9..6b97f7e 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/unix/tcl.pc.in b/unix/tcl.pc.in
index a343707..2693cd8 100644
--- a/unix/tcl.pc.in
+++ b/unix/tcl.pc.in
@@ -5,7 +5,6 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 libfile=@TCL_LIB_FILE@
-zipfile=@TCL_ZIP_FILE@
 
 Name: Tool Command Language
 Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
diff --git a/win/configure b/win/configure
index 090e040..2fd5ecc 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 7dc9c6d..a3c4c30 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=
diff --git a/win/tcl.m4 b/win/tcl.m4
index b9a164c..76711dd 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -251,7 +251,6 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
 #		TCL_BIN_DIR
 #		TCL_SRC_DIR
 #		TCL_LIB_FILE
-#		TCL_ZIP_FILE
 #
 #------------------------------------------------------------------------
 
@@ -288,7 +287,6 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
     AC_SUBST(TCL_BIN_DIR)
     AC_SUBST(TCL_SRC_DIR)
 
-    AC_SUBST(TCL_ZIP_FILE)
     AC_SUBST(TCL_LIB_FILE)
     AC_SUBST(TCL_LIB_FLAG)
     AC_SUBST(TCL_LIB_SPEC)
-- 
cgit v0.12