[Python-checkins] cpython (merge 3.2 -> 3.3): Merge issue #15819: tweak logic in previous commit.

[trent.nelson]

http://hg.python.org/cpython/rev/85863c4a93db
changeset:   79760:85863c4a93db
branch:      3.3
parent:      79753:1280b38fe583
parent:      79759:5707c8a36cc0
user:        Trent Nelson <trent at trent.me>
date:        Tue Oct 16 11:07:31 2012 -0400
summary:
  Merge issue #15819: tweak logic in previous commit.

files:
  configure    |  2 +-
  configure.ac |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -2724,7 +2724,7 @@
 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
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 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

-- 
Repository URL: http://hg.python.org/cpython