[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 5facdbb291)

* bpo-30232: Regenerate configure (#1396)

Run autoconf.
(cherry picked from commit 9ed34a8953)

(cherry picked from commit 4dae0d111d)
This commit is contained in:
Victor Stinner
2017-05-03 00:06:17 +02:00
committed by GitHub
parent 9b854debea
commit 360fb81367
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@@ -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

View File

@@ -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