Merge 8.6

4 files changed, 27 insertions, 1 deletions

diff --git a/win/configure b/win/configure
index 4db921a..9042743 100755
--- a/win/configure
+++ b/win/configure
@@ -739,6 +739,8 @@ ZIP_PROG
 TCLSH_PROG
 EXEEXT_FOR_BUILD
 CC_FOR_BUILD
+TCL_TOMMATH_LIB_NAME
+TCL_ZLIB_LIB_NAME
 TOMMATH_OBJS
 ZLIB_OBJS
 TOMMATH_LIBS
@@ -4887,6 +4889,8 @@ else $as_nop
   tcl_ok=yes
 
 fi
+zlib_lib_name=zdll.lib
+tommath_lib_name=tommath.lib
 if test "$tcl_ok" = "yes"
 then :
 
@@ -4913,6 +4917,8 @@ then :
 
         TOMMATH_LIBS=\${TOMMATH_DIR_NATIVE}/win64-arm/libtommath.dll.a
 
+        zlib_lib_name=libz.dll.a
+        tommath_lib_name=libtommath.dll.a
 
 else $as_nop
 
@@ -4932,6 +4938,8 @@ then :
 
         TOMMATH_LIBS=\${TOMMATH_DIR_NATIVE}/win64/libtommath.dll.a
 
+        zlib_lib_name=libz.dll.a
+        tommath_lib_name=libtommath.dll.a
 
 else $as_nop
 
@@ -4964,6 +4972,9 @@ fi
 
 printf "%s\n" "#define HAVE_ZLIB 1" >>confdefs.h
 
+TCL_ZLIB_LIB_NAME=$zlib_lib_name
+
+TCL_TOMMATH_LIB_NAME=$tommath_lib_name
 
 ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "
 #include <stdint.h>
diff --git a/win/configure.ac b/win/configure.ac
index 01f70b4..b1fb98e 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -135,6 +135,8 @@ AS_IF([test "${enable_shared+set}" = "set"], [
 ], [
   tcl_ok=yes
 ])
+zlib_lib_name=zdll.lib
+tommath_lib_name=tommath.lib
 AS_IF([test "$tcl_ok" = "yes"], [
   AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
   AC_SUBST(TOMMATH_DLL_FILE,[\${TOMMATH_DLL_FILE}])
@@ -145,6 +147,8 @@ AS_IF([test "$tcl_ok" = "yes"], [
       AS_IF([test "$GCC" == "yes"],[
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64-arm/libz.dll.a])
         AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64-arm/libtommath.dll.a])
+        zlib_lib_name=libz.dll.a
+        tommath_lib_name=libtommath.dll.a
       ], [
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64-arm/zdll.lib])
         AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64-arm/tommath.lib])
@@ -153,6 +157,8 @@ AS_IF([test "$tcl_ok" = "yes"], [
       AS_IF([test "$GCC" == "yes"],[
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
         AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64/libtommath.dll.a])
+        zlib_lib_name=libz.dll.a
+        tommath_lib_name=libtommath.dll.a
       ], [
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib])
         AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64/tommath.lib])
@@ -167,7 +173,8 @@ AS_IF([test "$tcl_ok" = "yes"], [
   AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}])
 ])
 AC_DEFINE(HAVE_ZLIB, 1, [Is there an installed zlib?])
-
+AC_SUBST(TCL_ZLIB_LIB_NAME, $zlib_lib_name)
+AC_SUBST(TCL_TOMMATH_LIB_NAME, $tommath_lib_name)
 AC_CHECK_TYPES([intptr_t, uintptr_t],,,[[
 #include <stdint.h>
 ]])
diff --git a/win/makefile.vc b/win/makefile.vc
index 625337d..99dbadc 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -783,6 +783,8 @@ $(OUT_DIR)\tclConfig.sh: $(WIN_DIR)\tclConfig.sh.in
 !else

 @TCL_SHARED_BUILD@   1

 !endif

+@TCL_ZLIB_LIB_NAME@ zdll.lib

+@TCL_TOMMATH_LIB_NAME@ tommath.lib

 <<

 

 

diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in
index 776dcb0..dffa0b6 100644
--- a/win/tclConfig.sh.in
+++ b/win/tclConfig.sh.in
@@ -179,3 +179,9 @@ TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
 
 # Path to the Tcl stub library in the install directory.
 TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
+
+# Name of the zlib library that extensions should use
+TCL_ZLIB_LIB_NAME='@TCL_ZLIB_LIB_NAME@'
+
+# Name of the tommath library that extensions should use
+TCL_TOMMATH_LIB_NAME='@TCL_TOMMATH_LIB_NAME@'