diff options
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 39 | ||||
| -rw-r--r-- | unix/configure.in | 4 | ||||
| -rw-r--r-- | unix/tcl.spec | 4 |
3 files changed, 33 insertions, 14 deletions
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 |