changeset:   79781:65b3c41052b6
branch:      3.2
parent:      79769:4c204a61bd79
user:        Trent Nelson <trent@trent.me>
date:        Wed Oct 17 04:45:30 2012 -0400
files:       Makefile.pre.in configure configure.ac
description:
Issue #15819: use standard autoconf preset output variables.

Reported by: Roumen Petrov


diff -r 4c204a61bd79 -r 65b3c41052b6 Makefile.pre.in
--- a/Makefile.pre.in	Tue Oct 16 23:02:27 2012 +0200
+++ b/Makefile.pre.in	Wed Oct 17 04:45:30 2012 -0400
@@ -27,7 +27,8 @@
 VERSION=	@VERSION@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
-BUILDDIR=	@BUILDDIR@
+abs_srcdir=	@abs_srcdir@
+abs_builddir=	@abs_builddir@
 
 
 CC=		@CC@
diff -r 4c204a61bd79 -r 65b3c41052b6 configure
--- a/configure	Tue Oct 16 23:02:27 2012 +0200
+++ b/configure	Wed Oct 17 04:45:30 2012 -0400
@@ -652,7 +652,6 @@
 HGTAG
 HGVERSION
 BASECPPFLAGS
-BUILDDIR
 SVNVERSION
 ARFLAGS
 AR
@@ -5207,10 +5206,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, we need to make sure the following
     # resources get picked up before their $srcdir counterparts.
     #   Objects/ -> typeslots.inc
diff -r 4c204a61bd79 -r 65b3c41052b6 configure.ac
--- a/configure.ac	Tue Oct 16 23:02:27 2012 +0200
+++ b/configure.ac	Wed Oct 17 04:45:30 2012 -0400
@@ -830,10 +830,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, we need to make sure the following
     # resources get picked up before their $srcdir counterparts.
     #   Objects/ -> typeslots.inc