aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2018-06-14 18:38:23 -0400
committerSimon Marchi <simon.marchi@polymtl.ca>2018-06-14 18:38:32 -0400
commit8199b8f4d45b2240d09142f1df70849dda2cc638 (patch)
treea497d0f34bbe8980c1eda6dfd7db18c74a99ab23
parent55c748a1c01f33cec0f762969db1bae457e8bcca (diff)
downloadgdb-8199b8f4d45b2240d09142f1df70849dda2cc638.zip
gdb-8199b8f4d45b2240d09142f1df70849dda2cc638.tar.gz
gdb-8199b8f4d45b2240d09142f1df70849dda2cc638.tar.bz2
update-gnulib.sh: Report required versions of autoconf/aclocal
Update the messages printed when the wrong version of autoconf/aclocal is found to include the expected version too, like we already do for automake. gdb/ChangeLog: * gnulib/update-gnulib.sh: Print expected versions of autoconf/aclocal.
-rw-r--r--gdb/ChangeLog5
-rwxr-xr-xgdb/gnulib/update-gnulib.sh6
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aba9a1a..6e1e904 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-14 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * gnulib/update-gnulib.sh: Print expected versions of
+ autoconf/aclocal.
+
2018-06-14 Simon Marchi <simon.marchi@ericsson.com>
* arch-utils.c (default_type_align): Use type_length_units.
diff --git a/gdb/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh
index 74ccfb0..70c23e8 100755
--- a/gdb/gnulib/update-gnulib.sh
+++ b/gdb/gnulib/update-gnulib.sh
@@ -107,7 +107,8 @@ fi
# Verify that we have the correct version of autoconf.
ver=`autoconf --version 2>&1 | head -1 | sed 's/.*) //'`
if [ "$ver" != "$AUTOCONF_VERSION" ]; then
- echo "Error: Wrong autoconf version: $ver. Aborting."
+ echo "Error: Wrong autoconf version ($ver), we need $AUTOCONF_VERSION."
+ echo "Aborting."
exit 1
fi
@@ -138,7 +139,8 @@ fi
#
ver=`aclocal --version 2>&1 | grep -v "called too early to check prototype" | head -1 | sed 's/.*) //'`
if [ "$ver" != "$ACLOCAL_VERSION" ]; then
- echo "Error: Wrong aclocal version: $ver. Aborting."
+ echo "Error: Wrong aclocal version ($ver), we need $ACLOCAL_VERSION."
+ echo "Aborting."
exit 1
fi