changeset:   103676:c26dce72a4da
branch:      3.5
parent:      103674:3f7e4ae9eba3
user:        Martin Panter <vadmium+py@gmail.com>
date:        Mon Sep 12 01:32:03 2016 +0000
files:       Misc/NEWS configure configure.ac
description:
Issue #28066: Fix include search directory logic for out-of-tree builds


diff -r 3f7e4ae9eba3 -r c26dce72a4da Misc/NEWS
--- a/Misc/NEWS	Sun Sep 11 21:39:31 2016 -0400
+++ b/Misc/NEWS	Mon Sep 12 01:32:03 2016 +0000
@@ -322,6 +322,9 @@
 Build
 -----
 
+- Issue #28066: Fix the logic that searches build directories for generated
+  include files when building outside the source tree.
+
 - Issue #27566: Fix clean target in freeze makefile (patch by Lisa Roach)
 
 - Issue #27705: Update message in validate_ucrtbase.py
diff -r 3f7e4ae9eba3 -r c26dce72a4da configure
--- a/configure	Sun Sep 11 21:39:31 2016 -0400
+++ b/configure	Mon Sep 12 01:32:03 2016 +0000
@@ -2820,7 +2820,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 -r 3f7e4ae9eba3 -r c26dce72a4da configure.ac
--- a/configure.ac	Sun Sep 11 21:39:31 2016 -0400
+++ b/configure.ac	Mon Sep 12 01:32:03 2016 +0000
@@ -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