* README: Bump version number to 8.4.17

* generic/tk.h: * unix/configure.in: Removed "es_ES" entry in LOCALES * unix/tk.spec: * win/configure.in: * unix/configure: autoconf-2.13 * win/configure:
author: dgp <dgp@users.sourceforge.net> 2007-10-02 17:55:52 (GMT)
committer: dgp <dgp@users.sourceforge.net> 2007-10-02 17:55:52 (GMT)
commit: b033f3ea04a23df218576470b7980a523b9117f9 (patch)
tree: c8fa237a3827ee92bdc5e430f524f470761babe4
parent: 0ea7e6b2dd60c03f1f8559e888b181984b6daf6c (diff)
download: tk-b033f3ea04a23df218576470b7980a523b9117f9.zip
tk-b033f3ea04a23df218576470b7980a523b9117f9.tar.gz
tk-b033f3ea04a23df218576470b7980a523b9117f9.tar.bz2
8 files changed, 55 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 4bc8160..fa51347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-02  Don Porter  <dgp@users.sourceforge.net>
+
+	* README:		Bump version number to 8.4.17
+	* generic/tk.h:
+	* unix/configure.in:	Removed "es_ES" entry in LOCALES
+	* unix/tk.spec:
+	* win/configure.in:
+
+	* unix/configure:	autoconf-2.13
+	* win/configure:
+
 2007-09-18  Daniel Steffen  <das@users.sourceforge.net>
 
 	*** 8.4.16 TAGGED FOR RELEASE ***
diff --git a/README b/README
index af675e2..ad664b4 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tk
-    This is the Tk 8.4.16 source distribution.
+    This is the Tk 8.4.17 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.39.2.16 2007/05/30 14:06:20 dgp Exp $
+RCS: @(#) $Id: README,v 1.39.2.17 2007/10/02 17:55:53 dgp Exp $
 
 1. Introduction
 ---------------
diff --git a/generic/tk.h b/generic/tk.h
index e7ed9d2..3d33789 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.74.2.19 2007/05/30 17:34:45 dgp Exp $
+ * RCS: @(#) $Id: tk.h,v 1.74.2.20 2007/10/02 17:55:53 dgp Exp $
  */
 
 #ifndef _TK
@@ -53,10 +53,10 @@ extern "C" {
 #define TK_MAJOR_VERSION   8
 #define TK_MINOR_VERSION   4
 #define TK_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL  16
+#define TK_RELEASE_SERIAL  17
 
 #define TK_VERSION	"8.4"
-#define TK_PATCH_LEVEL	"8.4.16"
+#define TK_PATCH_LEVEL	"8.4.17"
 
 /* 
  * A special definition used to allow this header file to be included
diff --git a/unix/configure b/unix/configure
index 32178dd..ab0340f 100755
--- a/unix/configure
+++ b/unix/configure
@@ -557,9 +557,9 @@ fi
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=4
-TK_PATCH_LEVEL=".16"
+TK_PATCH_LEVEL=".17"
 VERSION=${TK_VERSION}
-LOCALES="cs de el en en_gb eo es es_ES fr it nl pl pt ru"
+LOCALES="cs de el en en_gb eo es fr it nl pl pt ru"
 
 #--------------------------------------------------------------------
 # Find and load the tclConfig.sh file
@@ -6151,15 +6151,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 cf71b2e..a81818c 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.83.2.42 2007/09/11 05:17:07 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.83.2.43 2007/10/02 17:55:55 dgp Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.13)
@@ -11,9 +11,9 @@ AC_PREREQ(2.13)
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=4
-TK_PATCH_LEVEL=".16"
+TK_PATCH_LEVEL=".17"
 VERSION=${TK_VERSION}
-LOCALES="cs de el en en_gb eo es es_ES fr it nl pl pt ru"
+LOCALES="cs de el en en_gb eo es fr it nl pl pt ru"
 
 #--------------------------------------------------------------------
 # Find and load the tclConfig.sh file
diff --git a/unix/tk.spec b/unix/tk.spec
index fc9ae09..4f16fae 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,7 +1,7 @@
-# $Id: tk.spec,v 1.15.2.16 2007/05/30 14:06:21 dgp Exp $
+# $Id: tk.spec,v 1.15.2.17 2007/10/02 17:55:55 dgp Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
-%define version 8.4.16
+%define version 8.4.17
 %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.4.16
+Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4.17
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
diff --git a/win/configure b/win/configure
index 2b4a3eb..530150c 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=".16"
+TK_PATCH_LEVEL=".17"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index aa3f814..ff882d7 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.49.2.21 2007/05/30 14:06:22 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.49.2.22 2007/10/02 17:55:56 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=".16"
+TK_PATCH_LEVEL=".17"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
author	dgp <dgp@users.sourceforge.net>	2007-10-02 17:55:52 (GMT)
committer	dgp <dgp@users.sourceforge.net>	2007-10-02 17:55:52 (GMT)
commit	b033f3ea04a23df218576470b7980a523b9117f9 (patch)
tree	c8fa237a3827ee92bdc5e430f524f470761babe4
parent	0ea7e6b2dd60c03f1f8559e888b181984b6daf6c (diff)
download	tk-b033f3ea04a23df218576470b7980a523b9117f9.zip tk-b033f3ea04a23df218576470b7980a523b9117f9.tar.gz tk-b033f3ea04a23df218576470b7980a523b9117f9.tar.bz2