From: Trent Nelson <trent@trent.me>
Date: Tue, 16 Oct 2012 14:52:35 +0000 (-0400)
Subject: Issue #15819: tweak logic in previous commit (e0a2b14a3cf9).
X-Git-Tag: v2.7.4rc1~479
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcb009c9d675b2ca0eafd01d5999cd6038d7d654;p=thirdparty%2FPython%2Fcpython.git

Issue #15819: tweak logic in previous commit (e0a2b14a3cf9).
---

diff --git a/configure b/configure
index f2304f6db705..6b4235cbffb4 100755
--- a/configure
+++ b/configure
@@ -5180,7 +5180,7 @@ fi
 BUILDDIR="`pwd`"
 
 
-if test "$srcdir" != "$BUILDDIR"; then
+if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
     # If we're building out-of-tree make sure Include (in the current dir)
     # gets picked up before its $srcdir counterpart in order for Python-ast.h
     # and graminit.h to get picked up from the correct directory.
diff --git a/configure.ac b/configure.ac
index 094e5a4b2cd7..6f8ed747e9f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -857,7 +857,7 @@ fi
 BUILDDIR="`pwd`"
 AC_SUBST(BUILDDIR)
 AC_SUBST(BASECPPFLAGS)
-if test "$srcdir" != "$BUILDDIR"; then
+if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
     # If we're building out-of-tree make sure Include (in the current dir)
     # gets picked up before its $srcdir counterpart in order for Python-ast.h
     # and graminit.h to get picked up from the correct directory.