From 841717b3c561a35d53041f23da2f969a752abb91 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Jun 2013 09:22:04 +0000
Subject: Static Cygwin wish.exe cannot link with win32's static libtk85.a
 (because it expects a different runtime), so configure shouldn't even try to
 do this. (On a dynamic wish.exe this works, this is exactly how wish can run
 even without X11)

---
 unix/configure    | 13 +++++++------
 unix/configure.in | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/unix/configure b/unix/configure
index 28f564b..0a5a862 100755
--- a/unix/configure
+++ b/unix/configure
@@ -11476,14 +11476,15 @@ else
     fi
     # libdir must be a fully qualified path and not ${exec_prefix}/lib
     eval libdir="$libdir"
-    if test "${ac_cv_cygwin}" != "yes" -a "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-        TK_LIB_FLAG="-ltk${TK_VERSION}"
-    else
-        TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
-    fi
     if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
-	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}"
+	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
     else
+	if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+	    TK_LIB_FLAG="-ltk${TK_VERSION}"
+	else
+	    TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+	fi
 	TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
     fi
     TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
diff --git a/unix/configure.in b/unix/configure.in
index febc702..89efe52 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -720,14 +720,15 @@ else
     fi
     # libdir must be a fully qualified path and not ${exec_prefix}/lib
     eval libdir="$libdir"
-    if test "${ac_cv_cygwin}" != "yes" -a "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-        TK_LIB_FLAG="-ltk${TK_VERSION}"
-    else
-        TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
-    fi
     if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
-	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}"
+	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
     else
+	if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+	    TK_LIB_FLAG="-ltk${TK_VERSION}"
+	else
+	    TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+	fi
 	TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
     fi
     TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
-- 
cgit v0.12


From e050cf7ed22790b5d95108c5d01d507d852f888c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Jun 2013 10:12:37 +0000
Subject: Don't use deprecated stricmp/strnicmp any more, but underscored
 variant for non-GNU compilers.

---
 win/tkWinPort.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 14f949c..8d7778c 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -63,8 +63,8 @@
 
 
 #ifndef __GNUC__
-#    define strncasecmp strnicmp
-#    define strcasecmp stricmp
+#    define strncasecmp _strnicmp
+#    define strcasecmp _stricmp
 #endif
 
 #define NBBY 8
-- 
cgit v0.12