[3.5] bpo-30232: Support Git worktree in configure.ac (#1398) (#1401)

* bpo-30232: Support Git worktree in configure.ac (#1391)

Don't test if .git/HEAD file exists, but only if the .git file (or
directory) exists.
(cherry picked from commit 5facdbb29169c2799c42f887cef4cd9d087b0167)

* bpo-30232: Regenerate configure (#1396)

Run autoconf.
(cherry picked from commit 9ed34a89532763cf89f5e11fffb91ef7dee29fed)

(cherry picked from commit 4dae0d111dd7bb34ec730eea2327a3219acff211)

diff --git a/configure b/configure
index f5fe5f459c394f85d1f24615825ed7747761c338..a6d83f266008c9e9c1d80e7b958c15a275446aeb 100755 (executable)
--- a/configure
+++ b/configure
@@ -2840,7 +2840,7 @@ fi
 
 
 
-if test -e $srcdir/.git/HEAD
+if test -e $srcdir/.git
 then
 # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2

diff --git a/configure.ac b/configure.ac
index 21284d01684587e38ee75ec62f0f9ab6a3b544dd..22ac805a66a3f66dfc62feaa2fc180c21c2e0dfb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_SUBST(GITVERSION)
 AC_SUBST(GITTAG)
 AC_SUBST(GITBRANCH)
 
-if test -e $srcdir/.git/HEAD
+if test -e $srcdir/.git
 then
 AC_CHECK_PROG(HAS_GIT, git, found, not-found)
 else