Commit abf20514 authored by Trent Nelson's avatar Trent Nelson

Issue #15819: use standard autoconf preset output variables.

Reported by: Roumen Petrov
parent eadca1de
...@@ -27,7 +27,8 @@ MODLIBS= _MODLIBS_ ...@@ -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@
CXX= @CXX@ CXX= @CXX@
......
...@@ -649,7 +649,6 @@ HGBRANCH ...@@ -649,7 +649,6 @@ HGBRANCH
HGTAG HGTAG
HGVERSION HGVERSION
BASECPPFLAGS BASECPPFLAGS
BUILDDIR
SVNVERSION SVNVERSION
ARFLAGS ARFLAGS
AR AR
...@@ -5177,10 +5176,8 @@ else ...@@ -5177,10 +5176,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 make sure Include (in the current dir) # 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 # gets picked up before its $srcdir counterpart in order for Python-ast.h
# and graminit.h to get picked up from the correct directory. # and graminit.h to get picked up from the correct directory.
......
...@@ -854,10 +854,8 @@ else ...@@ -854,10 +854,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 make sure Include (in the current dir) # 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 # gets picked up before its $srcdir counterpart in order for Python-ast.h
# and graminit.h to get picked up from the correct directory. # and graminit.h to get picked up from the correct directory.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment