Issue #15819: use standard autoconf preset output variables.
Reported by: Roumen Petrov
This commit is contained in:
parent
3ed2cb5520
commit
739fc541b1
|
@ -27,7 +27,8 @@ MODLIBS= _MODLIBS_
|
||||||
VERSION= @VERSION@
|
VERSION= @VERSION@
|
||||||
srcdir= @srcdir@
|
srcdir= @srcdir@
|
||||||
VPATH= @srcdir@
|
VPATH= @srcdir@
|
||||||
BUILDDIR= @BUILDDIR@
|
abs_srcdir= @abs_srcdir@
|
||||||
|
abs_builddir= @abs_builddir@
|
||||||
|
|
||||||
|
|
||||||
CC= @CC@
|
CC= @CC@
|
||||||
|
|
|
@ -652,7 +652,6 @@ HGBRANCH
|
||||||
HGTAG
|
HGTAG
|
||||||
HGVERSION
|
HGVERSION
|
||||||
BASECPPFLAGS
|
BASECPPFLAGS
|
||||||
BUILDDIR
|
|
||||||
SVNVERSION
|
SVNVERSION
|
||||||
ARFLAGS
|
ARFLAGS
|
||||||
AR
|
AR
|
||||||
|
@ -5207,10 +5206,8 @@ else
|
||||||
SVNVERSION="echo Unversioned directory"
|
SVNVERSION="echo Unversioned directory"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BUILDDIR="`pwd`"
|
|
||||||
|
|
||||||
|
if test "$abs_srcdir" != "$abs_builddir"; then
|
||||||
if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then
|
|
||||||
# If we're building out-of-tree, we need to make sure the following
|
# If we're building out-of-tree, we need to make sure the following
|
||||||
# resources get picked up before their $srcdir counterparts.
|
# resources get picked up before their $srcdir counterparts.
|
||||||
# Objects/ -> typeslots.inc
|
# Objects/ -> typeslots.inc
|
||||||
|
|
|
@ -830,10 +830,8 @@ else
|
||||||
SVNVERSION="echo Unversioned directory"
|
SVNVERSION="echo Unversioned directory"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BUILDDIR="`pwd`"
|
|
||||||
AC_SUBST(BUILDDIR)
|
|
||||||
AC_SUBST(BASECPPFLAGS)
|
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
|
# If we're building out-of-tree, we need to make sure the following
|
||||||
# resources get picked up before their $srcdir counterparts.
|
# resources get picked up before their $srcdir counterparts.
|
||||||
# Objects/ -> typeslots.inc
|
# Objects/ -> typeslots.inc
|
||||||
|
|
Loading…
Reference in New Issue