From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 24 Feb 2022 18:12:50 +0000 (-0800)
Subject: * admin/merge-gnulib: fix bare checkout (Bug#32452#65)
X-Git-Tag: emacs-29.0.90~2119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd17fa2c7565f180cedbfa396c0b159e144178cb;p=emacs.git

* admin/merge-gnulib: fix bare checkout (Bug#32452#65)
---

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 4045eabf4e4..4aabffa0dcd 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -102,6 +102,9 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
   exit 1
 }
 
+# gnulib-tool has problems with a bare checkout (Bug#32452#65).
+test -f configure || ./autogen.sh
+
 avoided_flags=
 for module in $AVOIDED_MODULES; do
   avoided_flags="$avoided_flags --avoid=$module"