[Python-checkins] cpython (merge 3.5 -> default): Issue #28066: Merge srcdir fix from 3.5

[martin.panter]

https://hg.python.org/cpython/rev/3ef078f96494
changeset:   103677:3ef078f96494
parent:      103675:10384c5c18f5
parent:      103676:c26dce72a4da
user:        Martin Panter <vadmium+py at gmail.com>
date:        Mon Sep 12 01:51:44 2016 +0000
summary:
  Issue #28066: Merge srcdir fix from 3.5

files:
  Misc/NEWS    |  3 +++
  configure    |  2 +-
  configure.ac |  2 +-
  3 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -872,6 +872,9 @@
 Build
 -----
 
+- Issue #28066: Fix the logic that searches build directories for generated
+  include files when building outside the source tree.
+
 - Issue #27442: Expose the Android API level that python was built against, in
   sysconfig.get_config_vars() as 'ANDROID_API_LEVEL'.
 
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -2679,7 +2679,7 @@
 
 
 
-if test "$abs_srcdir" != "$abs_builddir"; then
+if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; 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
@@ -10,7 +10,7 @@
 AC_INIT(python, PYTHON_VERSION, https://bugs.python.org/)
 
 AC_SUBST(BASECPPFLAGS)
-if test "$abs_srcdir" != "$abs_builddir"; then
+if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; 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: https://hg.python.org/cpython