Backout [9bc120ced2] and part of [ea8d772054] (change-log entry for [9bc120ced2] only)

5 files changed, 7 insertions, 19 deletions

diff --git a/changes b/changes
index cc5ad63..36c9720 100644
--- a/changes
+++ b/changes
@@ -6884,6 +6884,4 @@ Many revisions to better support a Cygwin environment (nijtmans)
 
 2013-03-13 (enhancement) better build support for Debian arch (shadura)
 
-2013-03-22 (enhancement) support builds against Tcl 8.6+ (nijtmans,porter)
-
 --- Released 8.5.14, March 27, 2013 --- See ChangeLog for details ---
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 2901256..ac69455 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3275,6 +3275,10 @@ Initialize(
 
     Tcl_SetMainLoop(Tk_MainLoop);
 
+#undef Tk_InitStubs
+
+    Tk_InitStubs(interp, TK_VERSION, 1);
+
     /*
      * Initialized the themed widget set
      */
diff --git a/unix/Makefile.in b/unix/Makefile.in
index bfa4bc0..1da2d72 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -372,7 +372,7 @@ TTK_OBJS = \
 	ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \
 	ttkWidget.o ttkStubInit.o
 
-STUB_OBJS = tkStubInit.o
+STUB_OBJS = tkStubInit.o tkStubLib.o
 
 STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o
 
diff --git a/unix/configure b/unix/configure
index de43530..ed0693c 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1585,16 +1585,7 @@ echo "${ECHO_T}$BUILD_TCLSH" >&6
 
 
 
-if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
-    { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5
-echo "$as_me: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then
+if test "${TCL_VERSION}" != "${TK_VERSION}"; then
     { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
 Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
 Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5
diff --git a/unix/configure.in b/unix/configure.in
index 9f59778..85f0a1a 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -39,12 +39,7 @@ SC_LOAD_TCLCONFIG
 SC_PROG_TCLSH
 SC_BUILD_TCLSH
 
-if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
-    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.])
-fi
-if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then
+if test "${TCL_VERSION}" != "${TK_VERSION}"; then
     AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
 Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
 Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.])