* README: Bump version number to 8.6a0

* generic/tk.h: * library/tk.tcl: * macosx/Wish-Common.xcconfig: * unix/configure.in: * unix/tk.spec: * win/README: * win/configure.in: * win/tcl.m4: * unix/configure: autoconf-2.59 * win/configure: * generic/tkConsole.c: Relax Tcl_InitStubs() calls so that a Tk 8.6 * generic/tkMain.c: might [load] into a Tcl 8.5 interp. * generic/tkWindow.c: * generic/tkStubLib.c: Update to compatibility with a libtcl.so that contains no "tclStubsPtr" [Tcl Bug 1819422]. * generic/tkDecls.h: make genstubs * generic/tkIntDecls.h: * generic/tkIntPlatDecls.h: * generic/tkIntXlibDecls.h: * generic/tkPlatDecls.h:
author: dgp <dgp@users.sourceforge.net> 2008-04-01 16:30:51 (GMT)
committer: dgp <dgp@users.sourceforge.net> 2008-04-01 16:30:51 (GMT)
commit: 5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25 (patch)
tree: add0631b057edf9490c467e2c9847231e0c5379e
parent: 05d2b1f699928197cd82a59538c4b55d22f2df7c (diff)
download: tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.zip
tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.tar.gz
tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.tar.bz2
21 files changed, 124 insertions, 97 deletions
diff --git a/ChangeLog b/ChangeLog
index 75487b9..47e1053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2008-04-01  Don Porter  <dgp@users.sourceforge.net>
+
+	* README:		Bump version number to 8.6a0
+	* generic/tk.h:
+	* library/tk.tcl:
+	* macosx/Wish-Common.xcconfig:
+	* unix/configure.in:
+	* unix/tk.spec:
+	* win/README:
+	* win/configure.in:
+	* win/tcl.m4:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
+	* generic/tkConsole.c:	Relax Tcl_InitStubs() calls so that a Tk 8.6
+	* generic/tkMain.c:	might [load] into a Tcl 8.5 interp.
+	* generic/tkWindow.c:
+
+	* generic/tkStubLib.c:	Update to compatibility with a libtcl.so
+	that contains no "tclStubsPtr" [Tcl Bug 1819422].
+
+	* generic/tkDecls.h:		make genstubs
+	* generic/tkIntDecls.h:
+	* generic/tkIntPlatDecls.h:
+	* generic/tkIntXlibDecls.h:
+	* generic/tkPlatDecls.h:
+
 2008-03-28  Don Porter  <dgp@users.sourceforge.net>
 
 	*** 8.5.2 TAGGED FOR RELEASE ***
diff --git a/README b/README
index 8690a55..aaf9008 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tk
-    This is the Tk 8.5.2 source distribution.
+    This is the Tk 8.6a0 source distribution.
     Tcl/Tk is also available through NetCVS:
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
 
-RCS: @(#) $Id: README,v 1.53 2008/03/28 18:13:39 dgp Exp $
+RCS: @(#) $Id: README,v 1.54 2008/04/01 16:30:52 dgp Exp $
 
 1. Introduction
 ---------------
@@ -14,9 +14,9 @@ This directory contains the sources and documentation for Tk, an X11
 toolkit implemented with the Tcl scripting language.
 
 For details on features, incompatibilities, and potential problems with
-this release, see the Tcl/Tk 8.5 Web page at
+this release, see the Tcl/Tk 8.6 Web page at
 
-	http://www.tcl.tk/software/tcltk/8.5.html
+	http://www.tcl.tk/software/tcltk/8.6.html
 
 or refer to the "changes" file in this directory, which contains a
 historical record of all changes to Tk.
diff --git a/generic/tk.h b/generic/tk.h
index 86693dc..ad89478 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,15 +12,15 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk.h,v 1.109 2008/03/28 18:13:39 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.110 2008/04/01 16:30:52 dgp Exp $
  */
 
 #ifndef _TK
 #define _TK
 
 #include <tcl.h>
-#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5)
-#	error Tk 8.5 must be compiled with tcl.h from Tcl 8.5
+#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 5)
+#	error Tk 8.6 must be compiled with tcl.h from Tcl 8.5 or better
 #endif
 
 /*
@@ -51,12 +51,12 @@ extern "C" {
  */
 
 #define TK_MAJOR_VERSION	8
-#define TK_MINOR_VERSION	5
-#define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	2
+#define TK_MINOR_VERSION	6
+#define TK_RELEASE_LEVEL	TCL_ALPHA_RELEASE
+#define TK_RELEASE_SERIAL	0
 
-#define TK_VERSION		"8.5"
-#define TK_PATCH_LEVEL		"8.5.2"
+#define TK_VERSION		"8.6"
+#define TK_PATCH_LEVEL		"8.6a0"
 
 /*
  * A special definition used to allow this header file to be included from
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 4b0f6b8..0ea2051 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.36 2008/04/01 16:30:52 dgp Exp $
  */
 
 #include "tk.h"
@@ -229,11 +229,11 @@ Tk_InitConsoleChannels(
     Tcl_Channel consoleChannel;
 
     /*
-     * Ensure that we are getting the matching version of Tcl. This is really
+     * Ensure that we are getting a compatible version of Tcl. This is really
      * 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/tkDecls.h b/generic/tkDecls.h
index 4071501..b0dca8b 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkDecls.h,v 1.30 2007/05/14 20:58:26 dgp Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.31 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKDECLS
@@ -1982,6 +1982,8 @@ typedef struct TkStubs {
     void (*tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat * formatPtr); /* 273 */
 } TkStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1990,6 +1992,8 @@ extern TkStubs *tkStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index e4df446..5729545 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -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: tkIntDecls.h,v 1.31 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.32 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -1222,6 +1222,8 @@ typedef struct TkIntStubs {
     int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp * interp, int argc, CONST char ** argv); /* 157 */
 } TkIntStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1230,6 +1232,8 @@ extern TkIntStubs *tkIntStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index e21516e..95881cd 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.29 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.30 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -670,6 +670,8 @@ typedef struct TkIntPlatStubs {
 #endif /* X11 */
 } TkIntPlatStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -678,6 +680,8 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index aadd545..759f162 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.23 2007/12/13 15:24:15 dgp Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.24 2008/04/01 16:30:53 dgp Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -1419,6 +1419,8 @@ typedef struct TkIntXlibStubs {
 #endif /* AQUA */
 } TkIntXlibStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1427,6 +1429,8 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkMain.c b/generic/tkMain.c
index df3e215..9f6a73c 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.29 2008/04/01 16:30:54 dgp Exp $
  */
 
 #include <ctype.h>
@@ -106,11 +106,11 @@ Tk_MainEx(
     Tcl_DString appName;
 
     /*
-     * Ensure that we are getting the matching version of Tcl. This is really
+     * Ensure that we are getting a compatible version of Tcl. This is really
      * 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/tkPlatDecls.h b/generic/tkPlatDecls.h
index e311c12..8502923 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlatDecls.h,v 1.15 2007/12/13 15:24:16 dgp Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.16 2008/04/01 16:30:54 dgp Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -156,6 +156,8 @@ typedef struct TkPlatStubs {
 #endif /* AQUA */
 } TkPlatStubs;
 
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -164,6 +166,8 @@ extern TkPlatStubs *tkPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index fbf1ed1..e54c3ef 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.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: tkStubLib.c,v 1.20 2008/03/19 17:31:35 das Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.21 2008/04/01 16:30:54 dgp Exp $
  */
 
 /*
@@ -20,11 +20,6 @@
  * including the rest of the stub functions.
  */
 
-#ifndef USE_TCL_STUBS
-#define USE_TCL_STUBS
-#endif
-#undef USE_TCL_STUB_PROCS
-
 #ifndef USE_TK_STUBS
 #define USE_TK_STUBS
 #endif
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 0c5e3e9..4063819 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 2007/12/13 15:24:21 dgp Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.90 2008/04/01 16:30:54 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -2944,11 +2944,11 @@ Initialize(
     ThreadSpecificData *tsdPtr;
 
     /*
-     * Ensure that we are getting the matching version of Tcl. This is really
+     * Ensure that we are getting a compatible version of Tcl. This is really
      * 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 7c31b92..c0e0e25 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 2008/03/28 18:13:39 dgp Exp $
+# RCS: @(#) $Id: tk.tcl,v 1.74 2008/04/01 16:30:54 dgp Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -15,9 +15,9 @@
 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.2
+package require -exact Tk  8.6a0
 
 # Create a ::tk namespace
 namespace eval ::tk {
diff --git a/macosx/Wish-Common.xcconfig b/macosx/Wish-Common.xcconfig
index 7d210c3..33ed148 100644
--- a/macosx/Wish-Common.xcconfig
+++ b/macosx/Wish-Common.xcconfig
@@ -9,7 +9,7 @@
 // See the file "license.terms" for information on usage and redistribution
 // of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.10 2008/03/12 22:18:01 das Exp $
+// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.11 2008/04/01 16:30:54 dgp Exp $
 //
 
 HEADER_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TK_SRCROOT)/xlib "$(DERIVED_FILE_DIR)/tcl" "$(DERIVED_FILE_DIR)/tk" $(HEADER_SEARCH_PATHS)
@@ -48,4 +48,4 @@ TCL_PACKAGE_PATH = "$(LIBDIR)"
 TCL_DEFS = HAVE_TCL_CONFIG_H
 TK_LIBRARY = $(LIBDIR)/tk$(VERSION)
 TK_DEFS = HAVE_TK_CONFIG_H TCL_NO_DEPRECATED
-VERSION = 8.5
+VERSION = 8.6
diff --git a/unix/configure b/unix/configure
index 71b4a73..feee89d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for tk 8.5.
+# Generated by GNU Autoconf 2.59 for tk 8.6.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='tk'
 PACKAGE_TARNAME='tk'
-PACKAGE_VERSION='8.5'
-PACKAGE_STRING='tk 8.5'
+PACKAGE_VERSION='8.6'
+PACKAGE_STRING='tk 8.6'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -777,7 +777,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tk 8.5 to adapt to many kinds of systems.
+\`configure' configures tk 8.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -838,7 +838,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tk 8.5:";;
+     short | recursive ) echo "Configuration of tk 8.6:";;
    esac
   cat <<\_ACEOF
 
@@ -980,7 +980,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-tk configure 8.5
+tk configure 8.6
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -994,7 +994,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tk $as_me 8.5, which was
+It was created by tk $as_me 8.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1334,10 +1334,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-TK_VERSION=8.5
+TK_VERSION=8.6
 TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".2"
+TK_MINOR_VERSION=6
+TK_PATCH_LEVEL="a0"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
@@ -1583,16 +1583,6 @@ echo "${ECHO_T}$BUILD_TCLSH" >&6
 
 
 
-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
-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
-
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
 #------------------------------------------------------------------------
@@ -11172,7 +11162,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by tk $as_me 8.5, which was
+This file was extended by tk $as_me 8.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11230,7 +11220,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-tk config.status 8.5
+tk config.status 8.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/unix/configure.in b/unix/configure.in
index d2ca8d1..05b4cdb 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,9 +3,9 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.153 2008/03/28 18:13:41 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.154 2008/04/01 16:30:55 dgp Exp $
 
-AC_INIT([tk],[8.5])
+AC_INIT([tk],[8.6])
 AC_PREREQ(2.59)
 
 dnl This is only used when included from macosx/configure.ac
@@ -24,10 +24,10 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
     #endif /* _TKCONFIG */])
 ])
 
-TK_VERSION=8.5
+TK_VERSION=8.6
 TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".2"
+TK_MINOR_VERSION=6
+TK_PATCH_LEVEL="a0"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
@@ -41,12 +41,6 @@ SC_LOAD_TCLCONFIG
 SC_PROG_TCLSH
 SC_BUILD_TCLSH
 
-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}.])
-fi
-
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
 #------------------------------------------------------------------------
diff --git a/unix/tk.spec b/unix/tk.spec
index d93a62a..977b37e 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,19 +1,19 @@
-# $Id: tk.spec,v 1.34 2008/03/28 18:13:42 dgp Exp $
+# $Id: tk.spec,v 1.35 2008/04/01 16:30:56 dgp Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       8.5.2
+Version:       8.6a0
 Release:       2
 License:       BSD
 Group:         Development/Languages
 Source:        http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz
 URL:           http://www.tcl.tk/
 Buildroot:     /var/tmp/%{name}%{version}
-Buildrequires: XFree86-devel tcl = %version
-Requires:      tcl = %version
+Buildrequires: XFree86-devel tcl >= 8.5
+Requires:      tcl >= 8.5
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
diff --git a/win/README b/win/README
index a7781bc..98e58e9 100644
--- a/win/README
+++ b/win/README
@@ -1,8 +1,8 @@
-Tk 8.5 for Windows
+Tk 8.6 for Windows
 
 Originally by Scott Stanton while at Sun Microsystems Labs
 
-RCS: @(#) $Id: README,v 1.17 2003/03/04 23:50:45 dgp Exp $
+RCS: @(#) $Id: README,v 1.18 2008/04/01 16:30:56 dgp Exp $
 
 This is the directory where you configure and compile the Windows
 version of Tk.  This directory also contains source files for Tk
diff --git a/win/configure b/win/configure
index 5932de2..c9f2be5 100755
--- a/win/configure
+++ b/win/configure
@@ -1306,10 +1306,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # /bin/sh. The bash shell seems to suffer from some strange failures.
 SHELL=/bin/sh
 
-TK_VERSION=8.5
+TK_VERSION=8.6
 TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".2"
+TK_MINOR_VERSION=6
+TK_PATCH_LEVEL="a0"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index ff948ec..48ee9ed 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.77 2008/03/28 18:13:42 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.78 2008/04/01 16:30:56 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.59)
@@ -13,10 +13,10 @@ AC_PREREQ(2.59)
 # /bin/sh. The bash shell seems to suffer from some strange failures.
 SHELL=/bin/sh
 
-TK_VERSION=8.5
+TK_VERSION=8.6
 TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=5
-TK_PATCH_LEVEL=".2"
+TK_MINOR_VERSION=6
+TK_PATCH_LEVEL="a0"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/tcl.m4 b/win/tcl.m4
index 833680f..59b51c9 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -20,15 +20,15 @@
 AC_DEFUN([SC_PATH_TCLCONFIG], [
     AC_MSG_CHECKING([the location of tclConfig.sh])
 
-    if test -d ../../tcl8.5$1/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.5$1/win
-    elif test -d ../../tcl8.5/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.5/win
+    if test -d ../../tcl8.6$1/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.6$1/win
+    elif test -d ../../tcl8.6/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.6/win
     else
 	TCL_BIN_DIR_DEFAULT=../../tcl/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.5 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.6 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
@@ -60,15 +60,15 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
 AC_DEFUN([SC_PATH_TKCONFIG], [
     AC_MSG_CHECKING([the location of tkConfig.sh])
 
-    if test -d ../../tk8.5$1/win;  then
-	TK_BIN_DIR_DEFAULT=../../tk8.5$1/win
-    elif test -d ../../tk8.5/win;  then
-	TK_BIN_DIR_DEFAULT=../../tk8.5/win
+    if test -d ../../tk8.6$1/win;  then
+	TK_BIN_DIR_DEFAULT=../../tk8.6$1/win
+    elif test -d ../../tk8.6/win;  then
+	TK_BIN_DIR_DEFAULT=../../tk8.6/win
     else
 	TK_BIN_DIR_DEFAULT=../../tk/win
     fi
     
-    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.5 binaries from DIR],
+    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.6 binaries from DIR],
 	    TK_BIN_DIR=$withval, TK_BIN_DIR=`cd $TK_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TK_BIN_DIR; then
 	AC_MSG_ERROR(Tk directory $TK_BIN_DIR does not exist)
@@ -796,13 +796,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_WITH_TCL], [
-    if test -d ../../tcl8.5$1/win;  then
-	TCL_BIN_DEFAULT=../../tcl8.5$1/win
+    if test -d ../../tcl8.6$1/win;  then
+	TCL_BIN_DEFAULT=../../tcl8.6$1/win
     else
-	TCL_BIN_DEFAULT=../../tcl8.5/win
+	TCL_BIN_DEFAULT=../../tcl8.6/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.5 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.6 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
author	dgp <dgp@users.sourceforge.net>	2008-04-01 16:30:51 (GMT)
committer	dgp <dgp@users.sourceforge.net>	2008-04-01 16:30:51 (GMT)
commit	5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25 (patch)
tree	add0631b057edf9490c467e2c9847231e0c5379e
parent	05d2b1f699928197cd82a59538c4b55d22f2df7c (diff)
download	tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.zip tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.tar.gz tk-5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25.tar.bz2