Merge issue #15819: tweak logic in previous commit.

This commit is contained in:
Trent Nelson 2012-10-16 11:07:31 -04:00
commit 56d4c03cb2
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -2724,7 +2724,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
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

View File

@ -12,7 +12,7 @@ AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
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