[Python-checkins] cpython (merge 3.3 -> default): Issue #15819: use standard autoconf preset output variables.

[trent.nelson]

http://hg.python.org/cpython/rev/f9eb516bea88
changeset:   79783:f9eb516bea88
parent:      79779:429774e8d9f9
parent:      79782:b78e97b84f35
user:        Trent Nelson <trent at trent.me>
date:        Wed Oct 17 04:49:26 2012 -0400
summary:
  Issue #15819: use standard autoconf preset output variables.

Reported by: Roumen Petrov

files:
  Makefile.pre.in |  3 ++-
  configure       |  7 ++-----
  configure.ac    |  4 +---
  3 files changed, 5 insertions(+), 9 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -27,7 +27,8 @@
 VERSION=	@VERSION@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
-BUILDDIR=	@BUILDDIR@
+abs_srcdir=	@abs_srcdir@
+abs_builddir=	@abs_builddir@
 
 
 CC=		@CC@
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -735,7 +735,6 @@
 HGTAG
 HGVERSION
 BASECPPFLAGS
-BUILDDIR
 target_alias
 host_alias
 build_alias
@@ -2747,10 +2746,8 @@
 
 
 
-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
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,8 @@
 
 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

-- 
Repository URL: http://hg.python.org/cpython