diff options
| author | Paul Eggert | 2022-02-25 12:26:59 -0800 |
|---|---|---|
| committer | Paul Eggert | 2022-02-25 12:27:22 -0800 |
| commit | 9372e543a92306dabfb03a3c1f97ceb5cb4d8608 (patch) | |
| tree | d5ecfe5ee43feb0bcc283a5069dd9dc4c5d19a1c /admin | |
| parent | ca3858563c7ba8ee3caa82fbd2b7c386ea60c0d3 (diff) | |
| download | emacs-9372e543a92306dabfb03a3c1f97ceb5cb4d8608.tar.gz emacs-9372e543a92306dabfb03a3c1f97ceb5cb4d8608.zip | |
Robustify merge-gnulib a bit
* admin/merge-gnulib: Fail if autogen.sh fails.
Remove autom4te.cache before running gnulib-tool.
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/merge-gnulib | 5 |
1 files changed, 4 insertions, 1 deletions
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 || { | |||
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | # gnulib-tool has problems with a bare checkout (Bug#32452#65). | 105 | # gnulib-tool has problems with a bare checkout (Bug#32452#65). |
| 106 | test -f configure || ./autogen.sh | 106 | test -f configure || ./autogen.sh || exit |
| 107 | |||
| 108 | # Old caches can confuse autoconf when some Gnulib-related changes take effect. | ||
| 109 | rm -fr autom4te.cache || exit | ||
| 107 | 110 | ||
| 108 | avoided_flags= | 111 | avoided_flags= |
| 109 | for module in $AVOIDED_MODULES; do | 112 | for module in $AVOIDED_MODULES; do |