changeset:   79780:7e879a453bb3
branch:      2.7
parent:      79773:5b062bb56037
user:        Trent Nelson <trent@trent.me>
date:        Wed Oct 17 04:32:49 2012 -0400
files:       Makefile.pre.in configure configure.ac
description:
Issue #15819: use standard autoconf preset output variables.

Reported by: Roumen Petrov


diff -r 5b062bb56037 -r 7e879a453bb3 Makefile.pre.in
--- a/Makefile.pre.in	Tue Oct 16 23:02:27 2012 +0200
+++ b/Makefile.pre.in	Wed Oct 17 04:32:49 2012 -0400
@@ -27,7 +27,8 @@
 VERSION=	@VERSION@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
-BUILDDIR=	@BUILDDIR@
+abs_srcdir=	@abs_srcdir@
+abs_builddir=	@abs_builddir@
 
 CC=		@CC@
 CXX=		@CXX@
diff -r 5b062bb56037 -r 7e879a453bb3 configure
--- a/configure	Tue Oct 16 23:02:27 2012 +0200
+++ b/configure	Wed Oct 17 04:32:49 2012 -0400
@@ -649,7 +649,6 @@
 HGTAG
 HGVERSION
 BASECPPFLAGS
-BUILDDIR
 SVNVERSION
 ARFLAGS
 AR
@@ -5177,10 +5176,8 @@
 	SVNVERSION="echo Unversioned directory"
 fi
 
-BUILDDIR="`pwd`"
-
-
-if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
+
+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.
diff -r 5b062bb56037 -r 7e879a453bb3 configure.ac
--- a/configure.ac	Tue Oct 16 23:02:27 2012 +0200
+++ b/configure.ac	Wed Oct 17 04:32:49 2012 -0400
@@ -854,10 +854,8 @@
 	SVNVERSION="echo Unversioned directory"
 fi
 
-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 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.