aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2008-04-18 11:07:31 +0000
committerPaolo Bonzini <bonzini@gnu.org>2008-04-18 11:07:31 +0000
commit266df637a89fce6f2d0adbbee3361a2ea4f25af2 (patch)
tree8aa6015eb45a2b86c3222f2c610e2cc6d468b97d /configure
parente0c880965cab990eed0a9236b677b5a7bf5d5559 (diff)
downloadgdb-266df637a89fce6f2d0adbbee3361a2ea4f25af2.zip
gdb-266df637a89fce6f2d0adbbee3361a2ea4f25af2.tar.gz
gdb-266df637a89fce6f2d0adbbee3361a2ea4f25af2.tar.bz2
2008-04-18 Paolo Bonzini <bonzini@gnu.org>
Sync with gcc: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * configure.ac: Include override.m4. * configure: Regenerate. 2008-04-18 Paolo Bonzini <bonzini@gnu.org> * Makefile.tpl (restrap): Call `make all' using double-colon rules. * Makefile.in: Regenerate. 2008-04-11 Eric B. Weddington <eweddington@cso.atmel.com> * configure.ac: Do not build libssp for the AVR. * configure: Regenerate. config: 2008-04-18 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/35457 * override.m4: Add this. Make sure aclocal always picks it. Add more lenient precious variable check, backported from autoconf trunk.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure23
1 files changed, 16 insertions, 7 deletions
diff --git a/configure b/configure
index 66d941f..92f62a3 100755
--- a/configure
+++ b/configure
@@ -1415,13 +1415,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.
@@ -2326,7 +2335,7 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
;;
avr-*-*)
- noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
+ noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp"
;;
bfin-*-*)
noconfigdirs="$noconfigdirs gdb"