From 2f1a477706b06256ddca33739a771e3d97d011f1 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 21 Jan 2012 18:12:30 +0100 Subject: [PATCH] bootstrap: fail when bootstrap_post_import_hook fails Otherwise, it's far too easy to miss diagnostics emitted between gnulib-tool's output and that of running configure. * build-aux/bootstrap: Fail when bootstrap_post_import_hook fails. --- ChangeLog | 7 +++++++ build-aux/bootstrap | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9119d59c..668ce219a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-21 Jim Meyering + + bootstrap: fail when bootstrap_post_import_hook fails + Otherwise, it's far too easy to miss diagnostics emitted + between gnulib-tool's output and that of running configure. + * build-aux/bootstrap: Fail when bootstrap_post_import_hook fails. + 2012-01-17 Jim Meyering maint: enable sc_trailing_blank diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 57202fa6a..6910abfad 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-01-18.21; # UTC +scriptversion=2012-01-21.16; # UTC # Bootstrap this package from checked-out sources. @@ -807,7 +807,8 @@ for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file || exit done -bootstrap_post_import_hook +bootstrap_post_import_hook \ + || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; } # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. -- 2.11.0