summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Nelson <trent@trent.me>2012-10-17 08:47:31 (GMT)
committerTrent Nelson <trent@trent.me>2012-10-17 08:47:31 (GMT)
commit5595ab564cd0a01b1efdba5a03b2521e393fe7a4 (patch)
treea46882397ecc56520346c67fdf36ec2fa4d56cb6
parentee528cccde02a5b0382e47a709f8a8311415dad1 (diff)
parent739fc541b197ed4dbb55be7a7d6925dc5f5ac5d8 (diff)
downloadcpython-5595ab564cd0a01b1efdba5a03b2521e393fe7a4.zip
cpython-5595ab564cd0a01b1efdba5a03b2521e393fe7a4.tar.gz
cpython-5595ab564cd0a01b1efdba5a03b2521e393fe7a4.tar.bz2
Issue #15819: use standard autoconf preset output variables.
Reported by: Roumen Petrov
-rw-r--r--Makefile.pre.in3
-rwxr-xr-xconfigure5
-rw-r--r--configure.ac4
3 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 4ff801b..9c83248 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -27,7 +27,8 @@ MODLIBS= _MODLIBS_
VERSION= @VERSION@
srcdir= @srcdir@
VPATH= @srcdir@
-BUILDDIR= @BUILDDIR@
+abs_srcdir= @abs_srcdir@
+abs_builddir= @abs_builddir@
CC= @CC@
diff --git a/configure b/configure
index a619bb3..6e1825f 100755
--- a/configure
+++ b/configure
@@ -715,7 +715,6 @@ HGBRANCH
HGTAG
HGVERSION
BASECPPFLAGS
-BUILDDIR
target_alias
host_alias
build_alias
@@ -2721,10 +2720,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-BUILDDIR="`pwd`"
-
-if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
+if test "$abs_srcdir" != "$abs_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
diff --git a/configure.ac b/configure.ac
index 04413e9..4eb6c43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,8 @@ AC_PREREQ(2.65)
AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
-BUILDDIR="`pwd`"
-AC_SUBST(BUILDDIR)
AC_SUBST(BASECPPFLAGS)
-if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
+if test "$abs_srcdir" != "$abs_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