changeset:   103757:9cabcb4411ac
branch:      2.7
parent:      103747:f30a76f0d477
user:        Martin Panter <vadmium+py@gmail.com>
date:        Tue Sep 13 11:41:45 2016 +0000
files:       Misc/NEWS configure configure.ac
description:
Issue #15819: Drop dead code; -IInclude already added unconditionally


diff -r f30a76f0d477 -r 9cabcb4411ac Misc/NEWS
--- a/Misc/NEWS	Mon Sep 12 23:43:03 2016 -0700
+++ b/Misc/NEWS	Tue Sep 13 11:41:45 2016 +0000
@@ -179,6 +179,9 @@
 Build
 -----
 
+- Issue #15819: The Include directory in the build tree is already searched;
+  drop unused code trying to add it again.
+
 - Issue #27566: Fix clean target in freeze makefile (patch by Lisa Roach)
 
 - Issue #27983: Cause lack of llvm-profdata tool when using clang as
diff -r f30a76f0d477 -r 9cabcb4411ac configure
--- a/configure	Mon Sep 12 23:43:03 2016 -0700
+++ b/configure	Tue Sep 13 11:41:45 2016 +0000
@@ -687,7 +687,6 @@
 HGBRANCH
 HGTAG
 HGVERSION
-BASECPPFLAGS
 SVNVERSION
 ARFLAGS
 ac_ct_AR
@@ -5748,20 +5747,6 @@
 fi
 
 
-if test "$abs_srcdir" != "$abs_builddir"; then
-    # If we're building out-of-tree make sure Include (in the current dir)
-    # gets picked up before its $srcdir counterpart in order for Python-ast.h
-    # and graminit.h to get picked up from the correct directory.
-    # (A side effect of this is that these resources will automatically be
-    #  regenerated when building out-of-tree, regardless of whether or not
-    #  the $srcdir counterpart is up-to-date.  This is an acceptable trade
-    #  off.)
-    BASECPPFLAGS="-IInclude"
-else
-    BASECPPFLAGS=""
-fi
-
-
 
 
 # Extract the first word of "hg", so it can be a program name with args.
diff -r f30a76f0d477 -r 9cabcb4411ac configure.ac
--- a/configure.ac	Mon Sep 12 23:43:03 2016 -0700
+++ b/configure.ac	Tue Sep 13 11:41:45 2016 +0000
@@ -988,20 +988,6 @@
 	SVNVERSION="echo Unversioned directory"
 fi
 
-AC_SUBST(BASECPPFLAGS)
-if test "$abs_srcdir" != "$abs_builddir"; then
-    # If we're building out-of-tree make sure Include (in the current dir)
-    # gets picked up before its $srcdir counterpart in order for Python-ast.h
-    # and graminit.h to get picked up from the correct directory.
-    # (A side effect of this is that these resources will automatically be
-    #  regenerated when building out-of-tree, regardless of whether or not
-    #  the $srcdir counterpart is up-to-date.  This is an acceptable trade
-    #  off.)
-    BASECPPFLAGS="-IInclude"
-else
-    BASECPPFLAGS=""
-fi
-
 AC_SUBST(HGVERSION)
 AC_SUBST(HGTAG)
 AC_SUBST(HGBRANCH)