Fix [fbcee2b106]: wrong TK_BUILD_LIB_SPEC on Windows platform (mingw64)

tcltk · Sep 13, 2024 · 7162d83 · 7162d83
2 parents e796596 + 4566e27
commit 7162d83
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/win/configure b/win/configure
@@ -5885,15 +5885,19 @@ else
 fi
 fi
 
-eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
+if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
+    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
+else
+    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" ;
+fi
 # FIXME: All of this var junk needs to be done in tcl.m4 !!!!
 # I left out the other vars that also need to get defined here.
 # we also need to double check about spaces in path names
 TK_LIB_FLAG="-l"
 if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
     TK_LIB_FLAG="${TK_LIB_FLAG}tcl9"
 fi
-eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}${VER}${LIBFLAGSUFFIX}\""
+eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}tk${VER}${LIBFLAGSUFFIX}\""
 TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
 eval "TK_BUILD_LIB_SPEC=\"-L`$CYGPATH $(pwd)` ${TK_LIB_FLAG}\""
 

diff --git a/win/configure.ac b/win/configure.ac
@@ -242,15 +242,19 @@ else
 fi
 fi
 
-eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
+if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
+    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${LIBSUFFIX}" ;
+else
+    eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}" ;
+fi
 # FIXME: All of this var junk needs to be done in tcl.m4 !!!!
 # I left out the other vars that also need to get defined here.
 # we also need to double check about spaces in path names
 TK_LIB_FLAG="-l"
 if test "${TCL_MAJOR_VERSION}" -gt 8 ; then
     TK_LIB_FLAG="${TK_LIB_FLAG}tcl9"
 fi
-eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}${VER}${LIBFLAGSUFFIX}\""
+eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}tk${VER}${LIBFLAGSUFFIX}\""
 TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
 eval "TK_BUILD_LIB_SPEC=\"-L`$CYGPATH $(pwd)` ${TK_LIB_FLAG}\""