From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Feb 2022 20:26:59 +0000 (-0800)
Subject: Robustify merge-gnulib a bit
X-Git-Tag: emacs-29.0.90~2107
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9372e543a92306dabfb03a3c1f97ceb5cb4d8608;p=emacs.git

Robustify merge-gnulib a bit

* admin/merge-gnulib: Fail if autogen.sh fails.
Remove autom4te.cache before running gnulib-tool.
---

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 4aabffa0dcd..fec469c0179 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