From 739fc541b197ed4dbb55be7a7d6925dc5f5ac5d8 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@trent.me>
Date: Wed, 17 Oct 2012 04:45:30 -0400
Subject: [PATCH] Issue #15819: use standard autoconf preset output variables.

Reported by: Roumen Petrov
---
 Makefile.pre.in | 3 ++-
 configure       | 5 +----
 configure.ac    | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1b6965592e8..91e28d2b503 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 b90c6617688..c6223f6b090 100755
--- a/configure
+++ b/configure
@@ -652,7 +652,6 @@ HGBRANCH
 HGTAG
 HGVERSION
 BASECPPFLAGS
-BUILDDIR
 SVNVERSION
 ARFLAGS
 AR
@@ -5207,10 +5206,8 @@ else
 	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 --git a/configure.ac b/configure.ac
index 116e03e471b..f2951a27fcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -830,10 +830,8 @@ else
 	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