More flexible search for win32 tclConfig.sh, backported from TEA.

Don't use deprecated "case" any more. 
Don't do unnecessary Tcl_PkgRequire(..., "Tcl", ...), the preceding Tcl_InitStubs() call already does that, both for dynamic loaded as wel as the static case. 
Disallow Tk 8.6.x to be loaded in any Tcl 8.6 alpha/beta release.

3 files changed, 4 insertions, 10 deletions

diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index eb67fa4..d7a6261 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -224,7 +224,7 @@ Tk_InitConsoleChannels(
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6.0", 0) == NULL) {
         return;
     }
 
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 6129548..3171ebf 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -188,7 +188,7 @@ Tk_MainEx(
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6.0", 0) == NULL) {
 	abort();
     }
 
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index db9b40f..a283855 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3047,11 +3047,10 @@ Initialize(
     ThreadSpecificData *tsdPtr;
 
     /*
-     * Ensure that we are getting a compatible version of Tcl. This is really
-     * only an issue when Tk is loaded dynamically.
+     * Ensure that we are getting the matching version of Tcl.
      */
 
-    if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6.0", 0) == NULL) {
 	return TCL_ERROR;
     }
 
@@ -3287,11 +3286,6 @@ Initialize(
 	geometry = NULL;
     }
 
-    if (Tcl_PkgRequire(interp, "Tcl", "8.6", 0) == NULL) {
-	code = TCL_ERROR;
-	goto done;
-    }
-
     /*
      * Provide Tk and its stub table.
      */