aboutsummaryrefslogtreecommitdiff
path: root/libdecnumber
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2008-04-18 15:14:13 +0000
committerDJ Delorie <dj@redhat.com>2008-04-18 15:14:13 +0000
commit5ae542419de15ad6f48110068c39df08b0750120 (patch)
tree28ec112f521e5c15169211e511429ff6560c6dcd /libdecnumber
parentdae39accc2005cb456ad00d4369b3ccc482f6a7d (diff)
downloadfsf-binutils-gdb-5ae542419de15ad6f48110068c39df08b0750120.zip
fsf-binutils-gdb-5ae542419de15ad6f48110068c39df08b0750120.tar.gz
fsf-binutils-gdb-5ae542419de15ad6f48110068c39df08b0750120.tar.bz2
merge from gcc
Diffstat (limited to 'libdecnumber')
-rw-r--r--libdecnumber/ChangeLog6
-rw-r--r--libdecnumber/aclocal.m41
-rwxr-xr-xlibdecnumber/configure21
3 files changed, 22 insertions, 6 deletions
diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index fefafe6..91c4f08 100644
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-18 Paolo Bonzini <bonzini@gnu.org>
+
+ PR bootstrap/35457
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+
2008-04-18 Ben Elliston <bje@au.ibm.com>
* Makefile.in (distclean): Add gstdint.h.
diff --git a/libdecnumber/aclocal.m4 b/libdecnumber/aclocal.m4
index f35b363..86be19d 100644
--- a/libdecnumber/aclocal.m4
+++ b/libdecnumber/aclocal.m4
@@ -11,5 +11,6 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_include([../config/override.m4])
m4_include([../config/stdint.m4])
m4_include([../config/warnings.m4])
diff --git a/libdecnumber/configure b/libdecnumber/configure
index 19ece0f..ab73f46 100755
--- a/libdecnumber/configure
+++ b/libdecnumber/configure
@@ -1252,13 +1252,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.