* README: Bumped version number to 8.4b3 to distinguishmacosx_8_4_merge_2002_08_20_trunk

        * generic/tk.h:         HEAD from the 8.4b2 release.
        * unix/configure.in:
        * win/configure.in:
        * unix/tk.spec:

        * unix/configure:       autoconf
        * win/configure:

        * generic/tk.h: Added compile-time check that the tcl.h header file
        #included by Tk 8.4 is one from Tcl 8.4.  This is needed to be sure
        that new #defines like CONST84 are available. [Bug 597432].

8 files changed, 32 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index e8c9aa2..e5bd716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2002-08-20  Don Porter <dgp@users.sf.net>
+
+	* README:		Bumped version number to 8.4b3 to distinguish
+	* generic/tk.h:		HEAD from the 8.4b2 release.
+	* unix/configure.in:
+	* win/configure.in:
+	* unix/tk.spec:
+	
+	* unix/configure:	autoconf
+	* win/configure:
+
+	* generic/tk.h:	Added compile-time check that the tcl.h header file
+	#included by Tk 8.4 is one from Tcl 8.4.  This is needed to be sure
+	that new #defines like CONST84 are available. [Bug 597432].
+
 2002-08-16  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* unix/Makefile.in (install-binaries): simplified pkgIndex.tcl
diff --git a/README b/README
index cdaae9c..c79b44b 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tk
-    This is the Tk 8.4b2 source distribution.
+    This is the Tk 8.4b3 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.35 2002/07/14 17:29:57 dgp Exp $
+RCS: @(#) $Id: README,v 1.36 2002/08/20 15:39:13 dgp Exp $
 
 1. Introduction
 ---------------
diff --git a/generic/tk.h b/generic/tk.h
index f6a7e78..1d8a0cd 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,7 +12,7 @@
  * 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.66 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.67 2002/08/20 15:39:13 dgp Exp $
  */
 
 #ifndef _TK
@@ -48,10 +48,10 @@ extern "C" {
 #define TK_MAJOR_VERSION   8
 #define TK_MINOR_VERSION   4
 #define TK_RELEASE_LEVEL   TCL_BETA_RELEASE
-#define TK_RELEASE_SERIAL  2
+#define TK_RELEASE_SERIAL  3
 
 #define TK_VERSION	"8.4"
-#define TK_PATCH_LEVEL	"8.4b2"
+#define TK_PATCH_LEVEL	"8.4b3"
 
 /*
  * The following definitions set up the proper options for Macintosh
@@ -66,6 +66,9 @@ extern "C" {
 
 #ifndef _TCL
 #   include <tcl.h>
+#   if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 4)
+#	error Tk 8.4 must be compiled with tcl.h from Tcl 8.4
+#   endif
 #endif
 
 /* 
diff --git a/unix/configure b/unix/configure
index aae9226..a29117c 100755
--- a/unix/configure
+++ b/unix/configure
@@ -547,7 +547,7 @@ fi
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=4
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 VERSION=${TK_VERSION}
 LOCALES="cs de el en en_gb es fr it nl ru"
 
diff --git a/unix/configure.in b/unix/configure.in
index bbe974c..7b004f8 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ 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.78 2002/07/29 23:03:52 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.79 2002/08/20 15:39:14 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.13)
@@ -11,7 +11,7 @@ AC_PREREQ(2.13)
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=4
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 VERSION=${TK_VERSION}
 LOCALES="cs de el en en_gb es fr it nl ru"
 
diff --git a/unix/tk.spec b/unix/tk.spec
index 88da257..de8576b 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,7 +1,7 @@
-# $Id: tk.spec,v 1.11 2002/07/14 17:29:58 dgp Exp $
+# $Id: tk.spec,v 1.12 2002/08/20 15:39:14 dgp Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
-%define version 8.4b2
+%define version 8.4b3
 %define directory /usr/local
 
 Summary: Tk graphical toolkit for the Tcl scripting language.
@@ -14,7 +14,7 @@ Source: http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz
 URL: http://www.tcl.tk/
 Packager: Carina
 Buildroot: /var/tmp/%{name}%{version}
-Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4b2
+Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4b3
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
diff --git a/win/configure b/win/configure
index cf47d3d..0c439c8 100755
--- a/win/configure
+++ b/win/configure
@@ -536,7 +536,7 @@ fi
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=4
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index dc7ef93..7b5310e 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.44 2002/07/19 20:32:00 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.45 2002/08/20 15:39:14 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.13)
@@ -11,7 +11,7 @@ AC_PREREQ(2.13)
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=4
-TK_PATCH_LEVEL="b2"
+TK_PATCH_LEVEL="b3"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------