summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-02-18 21:35:44 (GMT)
committernijtmans <nijtmans>2010-02-18 21:35:44 (GMT)
commit97a2349055115fbd99ae55711aa782ec9136b167 (patch)
tree5559b148f43be0752c75c0255218a4a77c246856
parent0fbbcb2ed23322f6f244d0a46f98ed27b35ecd3e (diff)
downloadtcl-97a2349055115fbd99ae55711aa782ec9136b167.zip
tcl-97a2349055115fbd99ae55711aa782ec9136b167.tar.gz
tcl-97a2349055115fbd99ae55711aa782ec9136b167.tar.bz2
Fix sh quoting error reported in bash-3.1+ [Bug 1377619] (schafer)
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m46
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e1e9d27..24cb5dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-18 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/tcl.m4, unix/configure: Fix sh quoting error reported in
+ bash-3.1+ [Bug 1377619] (schafer)
+
2003-10-03 Jeff Hobbs <jeffh@ActiveState.com>
* generic/tclCompile.c (TclCompileScript): backport fix for crash
diff --git a/unix/configure b/unix/configure
index 7d8dabd..38fa747 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4767,7 +4767,7 @@ echo "configure:4758: checking system version (for dynamic loading)" >&5
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print }' /etc/.relid'`
+ system=MP-RAS-`awk '{print }' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
@@ -6197,7 +6197,7 @@ echo "configure:6189: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print }' /etc/.relid'`
+ system=MP-RAS-`awk '{print }' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 5921420..6a6f128 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -639,7 +639,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
@@ -778,7 +778,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
if test "$do64bit" = "yes" ; then
if test "$GCC" = "yes" ; then
AC_MSG_WARN("64bit mode not supported with GCC on $system")
- else
+ else
do64bit_ok=yes
EXTRA_CFLAGS="-q64"
LDFLAGS="-q64"
@@ -1856,7 +1856,7 @@ AC_DEFUN(SC_BLOCKING_STYLE, [
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`