Issue #28066: Merge srcdir fix from 3.5

3 files changed, 5 insertions, 2 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index a7e648bdcd..5e2836abd5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -872,6 +872,9 @@ C API
 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
index 0924e234d6..110e5760a4 100755
--- a/configure
+++ b/configure
@@ -2679,7 +2679,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-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
index 731b93087d..01d8d8a771 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.65)
 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