From c94d0732e04682c624269d62965cf8605d514b4e Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Tue, 1 Aug 2023 13:01:25 +0000
Subject: Bug [76d45ec836] - mingw - tommath not copied on install

---
 win/Makefile.in     | 3 ++-
 win/configure       | 6 ++++++
 win/configure.ac    | 6 +++++-
 win/tclConfig.sh.in | 3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index e648d3f..0dff715 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -206,6 +206,7 @@ SHLIB_LD	= @SHLIB_LD@
 SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_SUFFIX	= @SHLIB_SUFFIX@
+TOMMATH_LIBS	= @TOMMATH_LIBS@
 LIBS		= @LIBS@ $(shell $(CYGPATH) '@ZLIB_LIBS@') $(shell $(CYGPATH) '@TOMMATH_LIBS@')
 
 RMDIR		= rm -rf
@@ -852,7 +853,7 @@ install-binaries: binaries
 		$(COPY) $$i "$(BIN_INSTALL_DIR)"; \
 	    fi; \
 	    done
-	@for i in tclConfig.sh tclooConfig.sh $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE); \
+	@for i in tclConfig.sh tclooConfig.sh $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TOMMATH_LIBS); \
 	    do \
 	    if [ -f $$i ]; then \
 		echo "Installing $$i to $(LIB_INSTALL_DIR)/"; \
diff --git a/win/configure b/win/configure
index 23c1dda..c951ecd 100755
--- a/win/configure
+++ b/win/configure
@@ -739,6 +739,7 @@ ZIP_PROG
 TCLSH_PROG
 EXEEXT_FOR_BUILD
 CC_FOR_BUILD
+TCL_TOMMATH_LIB_NAME
 TOMMATH_OBJS
 ZLIB_OBJS
 TOMMATH_LIBS
@@ -4865,6 +4866,7 @@ else $as_nop
   tcl_ok=yes
 
 fi
+tommath_lib_name=tommath.lib
 if test "$tcl_ok" = "yes"
 then :
 
@@ -4889,6 +4891,7 @@ then :
 
         ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64-arm/libz.dll.a
 
+        tommath_lib_name=libtommath.dll.a
         TOMMATH_LIBS=\${TOMMATH_DIR_NATIVE}/win64-arm/libtommath.dll.a
 
 
@@ -4896,6 +4899,7 @@ else $as_nop
 
         ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64-arm/zdll.lib
 
+        tommath_lib_name=libtommath.dll.a
         TOMMATH_LIBS=\${TOMMATH_DIR_NATIVE}/win64-arm/tommath.lib
 
 
@@ -4908,6 +4912,7 @@ then :
 
         ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/libz.dll.a
 
+        tommath_lib_name=libtommath.dll.a
         TOMMATH_LIBS=\${TOMMATH_DIR_NATIVE}/win64/libtommath.dll.a
 
 
@@ -4942,6 +4947,7 @@ fi
 
 printf "%s\n" "#define HAVE_ZLIB 1" >>confdefs.h
 
+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 c6ff202..ed28d91 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -121,6 +121,7 @@ AS_IF([test "${enable_shared+set}" = "set"], [
 ], [
   tcl_ok=yes
 ])
+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}])
@@ -130,14 +131,17 @@ AS_IF([test "$tcl_ok" = "yes"], [
     AS_IF([test "$do64bit" = "arm64"], [
       AS_IF([test "$GCC" == "yes"],[
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64-arm/libz.dll.a])
+        tommath_lib_name=libtommath.dll.a
         AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64-arm/libtommath.dll.a])
       ], [
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64-arm/zdll.lib])
+        tommath_lib_name=libtommath.dll.a
         AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64-arm/tommath.lib])
       ])
     ], [
       AS_IF([test "$GCC" == "yes"],[
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
+        tommath_lib_name=libtommath.dll.a
         AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64/libtommath.dll.a])
       ], [
         AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib])
@@ -153,7 +157,7 @@ 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_TOMMATH_LIB_NAME, $tommath_lib_name)
 AC_CHECK_TYPES([intptr_t, uintptr_t],,,[[
 #include <stdint.h>
 ]])
diff --git a/win/tclConfig.sh.in b/win/tclConfig.sh.in
index 4883f2c..d5e1bc7 100644
--- a/win/tclConfig.sh.in
+++ b/win/tclConfig.sh.in
@@ -174,3 +174,6 @@ 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 tommath library that extensions should use
+TCL_TOMMATH_LIB_NAME='@TCL_TOMMATH_LIB_NAME@'
-- 
cgit v0.12