Allow ttrace.tcl to be mounted through zipfs in a static executable

Author: jan.nijtmans

configure

@@ -9470,11 +9470,11 @@ esac
 fi
 
     if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then
-        ZIPFS_BUILD=1
-        THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
+	ZIPFS_BUILD=1
+	THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
     else
-        ZIPFS_BUILD=0
-        THREAD_ZIP_FILE=
+	ZIPFS_BUILD=0
+	THREAD_ZIP_FILE=
     fi
 fi
 

configure.ac

@@ -206,14 +206,14 @@ TEA_PROG_TCLSH
 #--------------------------------------------------------------------
 if test "${TCL_MAJOR_VERSION}" -gt 8; then
     AC_ARG_ENABLE(zipfs,
-        AS_HELP_STRING([--enable-zipfs],[build with Zipfs support (default: on)]),
-        [tcl_ok=$enableval], [tcl_ok=yes])
+	AS_HELP_STRING([--enable-zipfs],[build with Zipfs support (default: on)]),
+		[tcl_ok=$enableval], [tcl_ok=yes])
     if test "$tcl_ok" = "yes" -a "x$enable_framework" != "xyes"; then
-        ZIPFS_BUILD=1
-        THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
+	ZIPFS_BUILD=1
+	THREAD_ZIP_FILE=lib${PACKAGE_NAME}${PACKAGE_VERSION}.zip
     else
-        ZIPFS_BUILD=0
-        THREAD_ZIP_FILE=
+	ZIPFS_BUILD=0
+	THREAD_ZIP_FILE=
     fi
 fi
 

pkgIndex.tcl.in

@@ -30,16 +30,19 @@ package ifneeded [string totitle @PACKAGE_NAME@] @PACKAGE_VERSION@ \
 # package ttrace uses some support machinery.
 
 package ifneeded ttrace @PACKAGE_VERSION@ [list ::apply {{dir} {
-    if {[info exists ::env(TCL_THREAD_LIBRARY)] &&
-	[file readable $::env(TCL_THREAD_LIBRARY)/ttrace.tcl]} {
+    if {[info exists ::env(TCL_THREAD_LIBRARY)]
+	    && [file readable $::env(TCL_THREAD_LIBRARY)/ttrace.tcl]} {
 	source $::env(TCL_THREAD_LIBRARY)/ttrace.tcl
     } elseif {[file readable [file join $dir .. lib ttrace.tcl]]} {
 	source [file join $dir .. lib ttrace.tcl]
     } elseif {[file readable [file join $dir ttrace.tcl]]} {
 	source [file join $dir ttrace.tcl]
-    } elseif {[file exists //zipfs:/lib/thread/ttrace.tcl] ||
-              ![catch {zipfs mount [file join $dir @PKG_LIB_FILE9@] //zipfs:/lib/thread}]} {
+    } elseif {[file exists //zipfs:/lib/thread/ttrace.tcl]
+	    || ![catch {zipfs mount [file join $dir @PKG_LIB_FILE9@] //zipfs:/lib/thread}]} {
 	source //zipfs:/lib/thread/ttrace.tcl
+    } elseif {[file exists //zipfs:/app/thread_library/ttrace.tcl]
+	    || ![catch {zipfs mount [file join $dir @PKG_LIB_FILE9@] //zipfs:/app/thread_library}]} {
+	source //zipfs:/app/thread_library/ttrace.tcl
     }
     if {[namespace which ::ttrace::update] ne ""} {
 	::ttrace::update