* README: Bump version number to 8.4.16

* generic/tcl.h: * tools/tcl.wse.in: * unix/configure.in: * unix/tcl.spec: * win/README.binary: * win/configure.in: * unix/configure: autoconf-2.13 * win/configure:
author: dgp <dgp@users.sourceforge.net> 2007-05-30 14:05:15 (GMT)
committer: dgp <dgp@users.sourceforge.net> 2007-05-30 14:05:15 (GMT)
commit: 47eb01dd6c11df908cd26c814d3cf6cb80abd4dd (patch)
tree: bf7b559e2540877bb091cd903ed724565df140cf
parent: dff8712f9e6e1998564fb828021902a37a3fcf36 (diff)
download: tcl-47eb01dd6c11df908cd26c814d3cf6cb80abd4dd.zip
tcl-47eb01dd6c11df908cd26c814d3cf6cb80abd4dd.tar.gz
tcl-47eb01dd6c11df908cd26c814d3cf6cb80abd4dd.tar.bz2
10 files changed, 85 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 47365c5..a387cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-05-30  Don Porter  <dgp@users.sourceforge.net>
+
+	* README:		Bump version number to 8.4.16
+	* generic/tcl.h:
+	* tools/tcl.wse.in:
+	* unix/configure.in:
+	* unix/tcl.spec:
+	* win/README.binary:
+	* win/configure.in:
+
+	* unix/configure:	autoconf-2.13
+	* win/configure:
+
 2007-05-29  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* unix/tclUnixThrd.c (Tcl_JoinThread): fix for 64-bit handling of
diff --git a/README b/README
index f3dd44a..fed15bc 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tcl
-    This is the Tcl 8.4.15 source distribution.
+    This is the Tcl 8.4.16 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.49.2.18 2006/10/23 17:53:23 dgp Exp $
+RCS: @(#) $Id: README,v 1.49.2.19 2007/05/30 14:05:17 dgp Exp $
 
 Contents
 --------
diff --git a/generic/tcl.h b/generic/tcl.h
index 128b83c..5d0dbab 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -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: tcl.h,v 1.153.2.30 2006/10/23 17:53:26 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.153.2.31 2007/05/30 14:05:18 dgp Exp $
  */
 
 #ifndef _TCL
@@ -59,10 +59,10 @@ extern "C" {
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   4
 #define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  15
+#define TCL_RELEASE_SERIAL  16
 
 #define TCL_VERSION	    "8.4"
-#define TCL_PATCH_LEVEL	    "8.4.15"
+#define TCL_PATCH_LEVEL	    "8.4.16"
 
 /*
  * The following definitions set up the proper options for Windows
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 7918eca..7cddf44 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -12,7 +12,7 @@ item: Global
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
-  Disk Label=tcl8.4.15
+  Disk Label=tcl8.4.16
   Disk Filename=setup
   Patch Flags=0000000000000001
   Patch Threshold=85
diff --git a/unix/configure b/unix/configure
index 99246a6..3a8f124 100755
--- a/unix/configure
+++ b/unix/configure
@@ -554,7 +554,7 @@ fi
 TCL_VERSION=8.4
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=4
-TCL_PATCH_LEVEL=".15"
+TCL_PATCH_LEVEL=".16"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
@@ -9318,15 +9318,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 
 # Without the "./", some shells look in PATH for config.status.
diff --git a/unix/configure.in b/unix/configure.in
index 8d7dc2f..b950dd7 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 Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.106.2.35 2007/04/29 02:20:38 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.106.2.36 2007/05/30 14:05:21 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.13)
@@ -11,7 +11,7 @@ AC_PREREQ(2.13)
 TCL_VERSION=8.4
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=4
-TCL_PATCH_LEVEL=".15"
+TCL_PATCH_LEVEL=".16"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/tcl.spec b/unix/tcl.spec
index bce0c4c..9eba641 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -1,7 +1,7 @@
-# $Id: tcl.spec,v 1.16.2.15 2006/10/23 17:53:28 dgp Exp $
+# $Id: tcl.spec,v 1.16.2.16 2007/05/30 14:05:21 dgp Exp $
 # This file is the basis for a binary Tcl RPM for Linux.
 
-%define version 8.4.15
+%define version 8.4.16
 %define directory /usr/local
 
 Summary: Tcl scripting language development environment
diff --git a/win/README.binary b/win/README.binary
index ddcdc78..c1267f7 100644
--- a/win/README.binary
+++ b/win/README.binary
@@ -1,11 +1,11 @@
 Tcl/Tk 8.4 for Windows, Binary Distribution
 
-RCS: @(#) $Id: README.binary,v 1.33.2.15 2006/10/23 17:53:28 dgp Exp $ 
+RCS: @(#) $Id: README.binary,v 1.33.2.16 2007/05/30 14:05:21 dgp Exp $ 
 
 1. Introduction
 --------------- 
 
-This directory contains the binary distribution of Tcl/Tk 8.4.15 for
+This directory contains the binary distribution of Tcl/Tk 8.4.16 for
 Windows.  It was compiled with Microsoft Visual C++ 6.0 using Win32
 API, so that it will run under Windows NT, 95, 98 and 2000.
 
diff --git a/win/configure b/win/configure
index 47427bb..4216bc6 100755
--- a/win/configure
+++ b/win/configure
@@ -534,7 +534,7 @@ fi
 TCL_VERSION=8.4
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=4
-TCL_PATCH_LEVEL=".15"
+TCL_PATCH_LEVEL=".16"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.2
@@ -2164,15 +2164,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 
 # Without the "./", some shells look in PATH for config.status.
diff --git a/win/configure.in b/win/configure.in
index 2d604fa..5191f93 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.68.2.19 2006/10/23 17:53:28 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.68.2.20 2007/05/30 14:05:22 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.13)
@@ -11,7 +11,7 @@ AC_PREREQ(2.13)
 TCL_VERSION=8.4
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=4
-TCL_PATCH_LEVEL=".15"
+TCL_PATCH_LEVEL=".16"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.2
author	dgp <dgp@users.sourceforge.net>	2007-05-30 14:05:15 (GMT)
committer	dgp <dgp@users.sourceforge.net>	2007-05-30 14:05:15 (GMT)
commit	47eb01dd6c11df908cd26c814d3cf6cb80abd4dd (patch)
tree	bf7b559e2540877bb091cd903ed724565df140cf
parent	dff8712f9e6e1998564fb828021902a37a3fcf36 (diff)
download	tcl-47eb01dd6c11df908cd26c814d3cf6cb80abd4dd.zip tcl-47eb01dd6c11df908cd26c814d3cf6cb80abd4dd.tar.gz tcl-47eb01dd6c11df908cd26c814d3cf6cb80abd4dd.tar.bz2