aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-04-18 10:28:53 +0000
committerbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2008-04-18 10:28:53 +0000
commit6a88da5180a2ade6788bf52bbd631528c9d52b71 (patch)
tree53b9f41975e0e2efe7840dd73c924b249e441134 /libcpp
parentf6d714a315209c1181abe7f1fc064a8b12456069 (diff)
2008-04-18 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/35457 * configure.ac: Include override.m4. * configure: Regenerate. libgomp: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libdecnumber: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. gcc: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libstdc++-v3: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libobjc: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. intl: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libgfortran: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libmudflap: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. boehm-gc: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libiberty: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Add override.m4. * configure: Regenerate. libffi: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libssp: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. config: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * confsubdir.m4: Rename to... * override.m4: ... this. Make sure aclocal always picks it. Add more lenient precious variable check, backported from autoconf trunk. libjava/libltdl: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libjava/classpath: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libjava: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. libcpp: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * aclocal.m4: Regenerate. * configure: Regenerate. fixincludes: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * Makefile.in: Rewrite aclocal.m4 rule. * aclocal.m4: Regenerate. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134434 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/ChangeLog6
-rw-r--r--libcpp/aclocal.m48
-rwxr-xr-xlibcpp/configure43
3 files changed, 43 insertions, 14 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 0826b628a9b..0bd2aad74c5 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-18 Paolo Bonzini <bonzini@gnu.org>
+
+ PR bootstrap/35457
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2008-04-17 Tom Tromey <tromey@redhat.com>
PR libcpp/34866:
diff --git a/libcpp/aclocal.m4 b/libcpp/aclocal.m4
index ad1d0ce7bac..308bb49e2e1 100644
--- a/libcpp/aclocal.m4
+++ b/libcpp/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005 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.
@@ -20,4 +20,6 @@ m4_include([../config/lead-dot.m4])
m4_include([../config/lib-ld.m4])
m4_include([../config/lib-link.m4])
m4_include([../config/lib-prefix.m4])
+m4_include([../config/override.m4])
+m4_include([../config/proginstall.m4])
m4_include([../config/warnings.m4])
diff --git a/libcpp/configure b/libcpp/configure
index 8b286e9febe..0f43267d0b1 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -1257,13 +1257,22 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ ac_cache_corrupted=:
+ else
+ { echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
@@ -1482,6 +1491,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
@@ -1515,8 +1525,18 @@ case $as_dir/ in
# program-specific install script used by HP pwplus--don't use.
:
else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
fi
fi
done
@@ -1525,15 +1545,16 @@ case $as_dir/ in
esac
done
+rm -rf conftest.one conftest.two conftest.dir
fi
if test "${ac_cv_path_install+set}" = set; then
INSTALL=$ac_cv_path_install
else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
- # removed, or if the path is relative.
+ # removed, or if the value is a relative name.
INSTALL=$ac_install_sh
fi
fi