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

* 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)

diff --git a/configure b/configure
index 227d1d24b379db23592550ec6b452008a87b3f77..3c611d6afa261748b07152cb7ea845776ead1947 100755 (executable)
--- a/configure
+++ b/configure
@@ -2711,7 +2711,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 6978b9090de9f6105923249d3001b90a1aa2560c..eda075dc755844b9226ac0a4ababd5a1aa623da9 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