mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2012-10-16 09:52:02 -04:00
commit ba6a6cfbbc
3 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile.pre.in
View file

@ -27,6 +27,7 @@ MODLIBS= _MODLIBS_
VERSION= @VERSION@ VERSION= @VERSION@
srcdir= @srcdir@ srcdir= @srcdir@
VPATH= @srcdir@ VPATH= @srcdir@
BUILDDIR= @BUILDDIR@
CC= @CC@ CC= @CC@
CXX= @CXX@ CXX= @CXX@

18
configure vendored
View file

@ -648,6 +648,8 @@ HAS_HG
HGBRANCH HGBRANCH
HGTAG HGTAG
HGVERSION HGVERSION
BASECPPFLAGS
BUILDDIR
SVNVERSION SVNVERSION
ARFLAGS ARFLAGS
AR AR
@ -5175,6 +5177,22 @@ else
SVNVERSION="echo Unversioned directory" SVNVERSION="echo Unversioned directory"
fi fi
BUILDDIR="`pwd`"
if test "$srcdir" != "$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

16
configure.ac
View file

@ -854,6 +854,22 @@ else
SVNVERSION="echo Unversioned directory" SVNVERSION="echo Unversioned directory"
fi fi
BUILDDIR="`pwd`"
AC_SUBST(BUILDDIR)
AC_SUBST(BASECPPFLAGS)
if test "$srcdir" != "$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(HGVERSION)
AC_SUBST(HGTAG) AC_SUBST(HGTAG)
AC_SUBST(HGBRANCH) AC_SUBST(HGBRANCH)