From 8199b8f4d45b2240d09142f1df70849dda2cc638 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 14 Jun 2018 18:38:23 -0400 Subject: [PATCH] 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. --- gdb/ChangeLog | 5 +++++ gdb/gnulib/update-gnulib.sh | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aba9a1a1b1f..6e1e9048ca5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-06-14 Simon Marchi + + * gnulib/update-gnulib.sh: Print expected versions of + autoconf/aclocal. + 2018-06-14 Simon Marchi * 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 74ccfb0e18e..70c23e80c05 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 -- 2.30.2