* generic/tkConsole.c: Relax the runtime version requirements on Tcl

        * generic/tkMain.c:     so that Tk 8.5.8 can [load] into Tcl 8.6 (and
        * generic/tkWindow.c:   later 8.*) interps.
        * library/tk.tcl
        * unix/Makefile.in:
        * win/Makefile.in:
        * win/makefile.vc:

8 files changed, 24 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 38e829f..376cb75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-15  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tkConsole.c:	Relax the runtime version requirements on Tcl
+	* generic/tkMain.c:	so that Tk 8.5.8 can [load] into Tcl 8.6 (and
+	* generic/tkWindow.c:	later 8.*) interps.
+	* library/tk.tcl
+	* unix/Makefile.in:
+	* win/Makefile.in:
+	* win/makefile.vc:
+
 2009-10-10  Donal K. Fellows  <dkf@users.sf.net>
 
 	* unix/tkUnixRFont.c (InitFont,TkpGetFontFromAttributes,Tk_DrawChars):
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 4b0f6b8..bdf6ccd 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkConsole.c,v 1.35 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkConsole.c,v 1.35.2.1 2009/10/15 17:48:50 dgp Exp $
  */
 
 #include "tk.h"
@@ -233,7 +233,7 @@ Tk_InitConsoleChannels(
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
         return;
     }
 
diff --git a/generic/tkMain.c b/generic/tkMain.c
index df3e215..a97e282 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMain.c,v 1.28 2007/12/13 15:24:15 dgp Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.28.2.1 2009/10/15 17:48:50 dgp Exp $
  */
 
 #include <ctype.h>
@@ -110,7 +110,7 @@ Tk_MainEx(
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
 	abort();
     }
 
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 161cdcb..6b03c4f 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWindow.c,v 1.89.2.3 2009/02/27 22:59:30 patthoyts Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.89.2.4 2009/10/15 17:48:50 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -2955,7 +2955,7 @@ Initialize(
      * only an issue when Tk is loaded dynamically.
      */
 
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
 	return TCL_ERROR;
     }
 
diff --git a/library/tk.tcl b/library/tk.tcl
index 80a5257..a2fb11c 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -3,7 +3,7 @@
 # Initialization script normally executed in the interpreter for each
 # Tk-based application.  Arranges class bindings for widgets.
 #
-# RCS: @(#) $Id: tk.tcl,v 1.73.2.10 2009/04/10 18:13:05 dgp Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.73.2.11 2009/10/15 17:48:50 dgp Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -15,7 +15,7 @@
 package require Tcl 8.5	;# Guard against [source] in an 8.4- interp
 			;# before using 8.5 [package] features.
 # Insist on running with compatible version of Tcl
-package require Tcl 8.5.0-8.6
+package require Tcl 8.5.0
 # Verify that we have Tk binary and script components from the same release
 package require -exact Tk  8.5.7
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index f1ddf0c..06be531 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.143.2.5 2009/04/24 15:40:06 stwo Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.143.2.6 2009/10/15 17:48:50 dgp Exp $
 
 # Current Tk version;  used in various names.
 
@@ -710,7 +710,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
 	    echo "Creating package index $(PKG_INDEX)"; \
 	    rm -f "$(PKG_INDEX)"; \
 	    (\
-	    echo "if {[catch {package present Tcl 8.5.0-8.6}]} { return }";\
+	    echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
 	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
 	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
 		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
diff --git a/win/Makefile.in b/win/Makefile.in
index 3b91efe..26783a8 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.78.2.2 2009/04/10 11:07:32 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.78.2.3 2009/10/15 17:48:50 dgp Exp $
 
 TCLVERSION		= @TCL_VERSION@
 TCLPATCHL		= @TCL_PATCH_LEVEL@
@@ -479,7 +479,7 @@ install-binaries: binaries
 	@echo "Creating package index $(PKG_INDEX)"; 
 	@$(RM) $(PKG_INDEX);
 	@(\
-	echo "if {[catch {package present Tcl 8.5.0-8.6}]} { return }";\
+	echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
 	echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL)\
 		[list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\
 	) > $(PKG_INDEX);
diff --git a/win/makefile.vc b/win/makefile.vc
index 8fad4b0..fdc534d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.117.2.1 2008/10/10 18:55:31 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.117.2.2 2009/10/15 17:48:50 dgp Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -897,7 +897,7 @@ install-binaries:
 !if !$(STATIC_BUILD)
 	@echo creating package index
 	@type << > $(OUT_DIR)\pkgIndex.tcl
-if {[catch {package present Tcl 8.5.0-8.6}]} { return }
+if {[catch {package present Tcl 8.5.0}]} { return }
 package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk]
 <<
 	@$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\"