diff options
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | generic/tk.h | 4 | ||||
-rwxr-xr-x | unix/configure | 39 | ||||
-rw-r--r-- | unix/configure.in | 2 | ||||
-rw-r--r-- | unix/tk.spec | 4 | ||||
-rwxr-xr-x | win/configure | 39 | ||||
-rw-r--r-- | win/configure.in | 2 |
7 files changed, 65 insertions, 27 deletions
@@ -1,5 +1,5 @@ README: Tk - This is the Tk 8.4.19 source distribution. + This is the Tk 8.4.20 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 diff --git a/generic/tk.h b/generic/tk.h index e777947..55d6968 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -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 19 +#define TK_RELEASE_SERIAL 20 #define TK_VERSION "8.4" -#define TK_PATCH_LEVEL "8.4.19" +#define TK_PATCH_LEVEL "8.4.20" /* * A special definition used to allow this header file to be included diff --git a/unix/configure b/unix/configure index d7c3805..bb6624c 100755 --- a/unix/configure +++ b/unix/configure @@ -559,7 +559,7 @@ fi TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru" @@ -6399,15 +6399,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 a5fef0c..aebef58 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -9,7 +9,7 @@ AC_PREREQ(2.13) TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VERSION=${TK_VERSION} LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru" diff --git a/unix/tk.spec b/unix/tk.spec index 94bbfe7..18dfd28 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,6 +1,6 @@ # This file is the basis for a binary Tk Linux RPM. -%define version 8.4.19 +%define version 8.4.20 %define directory /usr/local Summary: Tk graphical toolkit for the Tcl scripting language. @@ -13,7 +13,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.19 +Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.4.20 %description The Tcl (Tool Command Language) provides a powerful platform for diff --git a/win/configure b/win/configure index 824a754..11748e8 100755 --- a/win/configure +++ b/win/configure @@ -542,7 +542,7 @@ fi TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ @@ -2517,15 +2517,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 5e73318..90b03ab 100644 --- a/win/configure.in +++ b/win/configure.in @@ -9,7 +9,7 @@ AC_PREREQ(2.13) TK_VERSION=8.4 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=4 -TK_PATCH_LEVEL=".19" +TK_PATCH_LEVEL=".20" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ |