Issue #15819: use standard autoconf preset output variables.

Reported by: Roumen Petrov

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1b6965592e862becf1dd29e0ddc8a67474a3187a..91e28d2b503af184a77627464636315168658696 100644 (file)
--- 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 b90c6617688cbc4e9d0d3beffeea0ddac449a6f7..c6223f6b0900b5de573e156bd0f5d08a6f22648b 100755 (executable)
--- 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 116e03e471b57d687371dfcfb5eaa9629c5dafea..f2951a27fcd64395669c3d1cb6ea394eb2cf6b11 100644 (file)
--- 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