changeset:   79758:c35db4960d1c
branch:      2.7
parent:      79755:e0a2b14a3cf9
user:        Trent Nelson <trent@trent.me>
date:        Tue Oct 16 10:52:35 2012 -0400
files:       configure configure.ac
description:
Issue #15819: tweak logic in previous commit (e0a2b14a3cf9).


diff -r e0a2b14a3cf9 -r c35db4960d1c configure
--- a/configure	Tue Oct 16 09:42:45 2012 -0400
+++ b/configure	Tue Oct 16 10:52:35 2012 -0400
@@ -5180,7 +5180,7 @@
 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 -r e0a2b14a3cf9 -r c35db4960d1c configure.ac
--- a/configure.ac	Tue Oct 16 09:42:45 2012 -0400
+++ b/configure.ac	Tue Oct 16 10:52:35 2012 -0400
@@ -857,7 +857,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 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.