Issue #28066: Merge srcdir fix from 3.5

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'.
 

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

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