master 9372e543a9: Robustify merge-gnulib a bit

[Paul Eggert]

branch: master
commit 9372e543a92306dabfb03a3c1f97ceb5cb4d8608
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    Robustify merge-gnulib a bit
    
    * admin/merge-gnulib: Fail if autogen.sh fails.
    Remove autom4te.cache before running gnulib-tool.
---
 admin/merge-gnulib | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 4aabffa0dc..fec469c017 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -103,7 +103,10 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
 }
 
 # gnulib-tool has problems with a bare checkout (Bug#32452#65).
-test -f configure || ./autogen.sh
+test -f configure || ./autogen.sh || exit
+
+# Old caches can confuse autoconf when some Gnulib-related changes take effect.
+rm -fr autom4te.cache || exit
 
 avoided_flags=
 for module in $AVOIDED_MODULES; do