From: Trent Nelson <trent@trent.me>
Date: Tue, 16 Oct 2012 15:04:04 +0000 (-0400)
Subject: Issue #15819: tweak logic in previous commit (617591e7d708).
X-Git-Tag: v3.2.4rc1~438
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6603118125164b927d79eab89263a07a12406481;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/configure b/configure
index 8ba3dec51fd2..b90c6617688c 100755
--- a/configure
+++ b/configure
@@ -5210,7 +5210,7 @@ fi
 BUILDDIR="`pwd`"
 
 
-if test "$srcdir" != "$BUILDDIR"; then
+if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
     # If we're building out-of-tree, we need to make sure the following
     # resources get picked up before their $srcdir counterparts.
     #   Objects/ -> typeslots.inc
diff --git a/configure.ac b/configure.ac
index 9222c887c30c..116e03e471b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -833,7 +833,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, we need to make sure the following
     # resources get picked up before their $srcdir counterparts.
     #   Objects/ -> typeslots.inc