diff options
| author | dgp@users.sourceforge.net <dgp> | 2007-05-30 14:06:20 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2007-05-30 14:06:20 (GMT) |
| commit | 4bd74f725491c025214a6c88ba532bb8be137857 (patch) | |
| tree | 96de6bff4e573aef428d82a086fbeebe4dffe9f3 /win | |
| parent | cac3032d29200efbf2e2caab2698c854a7cabc6d (diff) | |
| download | tk-4bd74f725491c025214a6c88ba532bb8be137857.zip tk-4bd74f725491c025214a6c88ba532bb8be137857.tar.gz tk-4bd74f725491c025214a6c88ba532bb8be137857.tar.bz2 | |
* README: Bump version number to 8.4.16
* generic/tk.h:
* unix/configure.in:
* unix/tk.spec:
* win/configure.in:
* unix/configure: autoconf-2.13
* win/configure:
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 39 | ||||
| -rw-r--r-- | win/configure.in | 4 |
2 files changed, 31 insertions, 12 deletions
diff --git a/win/configure b/win/configure index 447c41b..2b4a3eb 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=".15" +TK_PATCH_LEVEL=".16" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ @@ -1987,15 +1987,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 053d715..aa3f814 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.20 2006/10/23 17:58:28 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.49.2.21 2007/05/30 14:06:22 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=".15" +TK_PATCH_LEVEL=".16" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ |