summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorTrent Nelson <trent@trent.me>2012-10-16 12:53:13 (GMT)
committerTrent Nelson <trent@trent.me>2012-10-16 12:53:13 (GMT)
commitcd02b3f781b0a0d545bffb47741a2f5bb37c9a41 (patch)
treea42cb2b46823328c22b3065e1c4442c02ff78cab /configure.ac
parentb16269e375ec3b9dd656d64469f3810b4a0eec81 (diff)
parent4d4ec6502d6aec31284cf2f68d81c64fcedb1049 (diff)
downloadcpython-cd02b3f781b0a0d545bffb47741a2f5bb37c9a41.zip
cpython-cd02b3f781b0a0d545bffb47741a2f5bb37c9a41.tar.gz
cpython-cd02b3f781b0a0d545bffb47741a2f5bb37c9a41.tar.bz2
Merge issue #15819: additional fixes for out-of-tree builds from read-only src.
Specifically, make sure the 'Object', 'Python' and 'Include' directories in the build directory take precedence over the source directory if we're an out-of-tree build. Fix typeslots.inc so that it gets generated into the build directory. In addition, for 3.3, make sure importlib.h gets generated into the build directory.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index df0b004..1762bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,24 @@ AC_PREREQ(2.65)
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
+BUILDDIR="`pwd`"
+AC_SUBST(BUILDDIR)
+AC_SUBST(BASECPPFLAGS)
+if test "$srcdir" != "$BUILDDIR"; 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
+ # Include/ -> Python-ast.h, graminit.h
+ # Python/ -> importlib.h
+ # (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="-IObjects -IInclude -IPython"
+else
+ BASECPPFLAGS=""
+fi
+
AC_SUBST(HGVERSION)
AC_SUBST(HGTAG)
AC_SUBST(HGBRANCH)