summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-10-05 21:49:32 +0200
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-10-05 21:54:03 +0200
commit81974e78e1b16cd6f16317a223f127de0e087246 (patch)
tree3953ab070f992adcda09a66d89a94c5e1ac1dcec
parentbfa2f5fe1f5c3122b0a200683b4a1473f19ac081 (diff)
downloadautomake-81974e78e1b16cd6f16317a223f127de0e087246.tar.gz
automake-81974e78e1b16cd6f16317a223f127de0e087246.tar.bz2
automake-81974e78e1b16cd6f16317a223f127de0e087246.zip
Work around AIX sh quoting issue in AC_PROG_CC_C_O.
* m4/minuso.m4 (AM_PROG_CC_C_O): Work around shell quoting issue with AIX sh; fixes depcomp6.test failure. * NEWS, THANKS: Update. Report by Rainer Tammer. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-rw-r--r--ChangeLog7
-rw-r--r--NEWS3
-rw-r--r--THANKS1
-rw-r--r--m4/minuso.m49
4 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c2a6d24a..895fa3967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-10-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * m4/minuso.m4 (AM_PROG_CC_C_O): Work around shell quoting issue
+ with AIX sh; fixes depcomp6.test failure.
+ * NEWS, THANKS: Update.
+ Report by Rainer Tammer.
+
Print captured output before failing.
* tests/acloca14.test, tests/acloca17.test, tests/acloca18.test,
tests/aclocal.test, tests/acsilent.test, tests/alpha.test,
@@ -7,7 +12,7 @@
tests/fn99subdir.test, tests/help.test, tests/init.test,
tests/lisp8.test, tests/missing3.test, tests/pr220.test,
tests/python11.test, tests/python4.test, tests/python5.test,
- tests/unused.test, tests/version8.test: When Exit is called
+ tests/unused.test, tests/version8.test: When exit is called
after a command that has stdout or stderr redirected to a file
for later inspection, output the file before failing the test.
diff --git a/NEWS b/NEWS
index 294f8e006..dd81fc76a 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ Bugs fixed in 1.10.1a:
- Rebuild rules now also work for a removed `subdir/Makefile.in' in
an otherwise up to date tree.
+ - Work around AIX sh quoting issue in AC_PROG_CC_C_O, leading to
+ unnecessary use of the `compile' script.
+
* Bugs introduced by 1.10.1:
diff --git a/THANKS b/THANKS
index e63715979..0d0b19f61 100644
--- a/THANKS
+++ b/THANKS
@@ -251,6 +251,7 @@ Philip S Tellis philip@ncst.ernet.in
Пухальский Юрий Андреевич pooh@cryptopro.ru
Rainer Orth ro@techfak.uni-bielefeld.de
Rafael Laboissiere laboissiere@psy.mpg.de
+Rainer Tammer tammer@tammer.net
Raja R Harinath harinath@cs.umn.edu
Ralf Corsepius corsepiu@faw.uni-ulm.de
Ralf Menzel menzel@ls6.cs.uni-dortmund.de
diff --git a/m4/minuso.m4 b/m4/minuso.m4
index 925baec79..d8b16200b 100644
--- a/m4/minuso.m4
+++ b/m4/minuso.m4
@@ -1,12 +1,12 @@
## -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 6
# AM_PROG_CC_C_O
# --------------
@@ -18,8 +18,9 @@ AC_REQUIRE_AUX_FILE([compile])dnl
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.