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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aba9a1a1b1f3fbd06e65b33208467dd546ad4591..6e1e9048ca5dbcd00cd878091fab675cb33f9b36 100644 (file)
--- 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 74ccfb0e18e2e495532913eee5fe2a75ee279bfe..70c23e80c05e3c6db5b6b4d914e0e499766300b2 100755 (executable)
--- 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