Merge issue #15819: tweak logic in previous commit.

diff --cc configure
index 843b141212b380613898e4af35a040f1f42956d5,b90c6617688cbc4e9d0d3beffeea0ddac449a6f7..a619bb38343c315bf6c5b9dfe11d40d179002e14
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2721,83 -2706,6 +2721,83 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  
  
  
- if test "$srcdir" != "$BUILDDIR"; then
 +BUILDDIR="`pwd`"
 +
 +
++if test "$srcdir" != "." -a "$srcdir" != "$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
 +    #   Include/ -> Python-ast.h, graminit.h
 +    #   Python/  -> importlib.h
 +    # (A side effect of this is that these resources will automatically be
 +    #  regenerated when building out-of-tree, regardless of whether or not
 +    #  the $srcdir counterpart is up-to-date.  This is an acceptable trade
 +    #  off.)
 +    BASECPPFLAGS="-IObjects -IInclude -IPython"
 +else
 +    BASECPPFLAGS=""
 +fi
 +
 +
 +
 +
 +
 +if test -e $srcdir/.hg/dirstate
 +then
 +# Extract the first word of "hg", so it can be a program name with args.
 +set dummy hg; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_HAS_HG+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$HAS_HG"; then
 +  ac_cv_prog_HAS_HG="$HAS_HG" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_HAS_HG="found"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +  test -z "$ac_cv_prog_HAS_HG" && ac_cv_prog_HAS_HG="not-found"
 +fi
 +fi
 +HAS_HG=$ac_cv_prog_HAS_HG
 +if test -n "$HAS_HG"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_HG" >&5
 +$as_echo "$HAS_HG" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +else
 +HAS_HG=no-repository
 +fi
 +if test $HAS_HG = found
 +then
 +    HGVERSION="hg id -i \$(srcdir)"
 +    HGTAG="hg id -t \$(srcdir)"
 +    HGBRANCH="hg id -b \$(srcdir)"
 +else
 +    HGVERSION=""
 +    HGTAG=""
 +    HGBRANCH=""
 +fi
 +
 +
  ac_config_headers="$ac_config_headers pyconfig.h"
  
  

diff --cc configure.ac
index 0633a97aea2f5303b6eb5f8d52789ab222f92989,116e03e471b57d687371dfcfb5eaa9629c5dafea..04413e905d2e795d4a1db2e1ce7fa436f9a0f613
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,51 -3,19 +3,51 @@@ dnl * Please run autoreconf to test you
  dnl ***********************************************
  
  # Set VERSION so we only need to edit in one place (i.e., here)
 -m4_define(PYTHON_VERSION, 3.2)
 -
 -dnl Some m4 magic to ensure that the configure script is generated
 -dnl by the correct autoconf version.
 -m4_define([version_required],
 -[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), 0,
 -       [],
 -       [m4_fatal([Autoconf version $1 is required for Python], 63)])
 -])
 +m4_define(PYTHON_VERSION, 3.3)
 +
  AC_PREREQ(2.65)
  
 -AC_REVISION($Revision$)
  AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
- if test "$srcdir" != "$BUILDDIR"; then
 +
 +BUILDDIR="`pwd`"
 +AC_SUBST(BUILDDIR)
 +AC_SUBST(BASECPPFLAGS)
++if test "$srcdir" != "." -a "$srcdir" != "$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
 +    #   Include/ -> Python-ast.h, graminit.h
 +    #   Python/  -> importlib.h
 +    # (A side effect of this is that these resources will automatically be
 +    #  regenerated when building out-of-tree, regardless of whether or not
 +    #  the $srcdir counterpart is up-to-date.  This is an acceptable trade
 +    #  off.)
 +    BASECPPFLAGS="-IObjects -IInclude -IPython"
 +else
 +    BASECPPFLAGS=""
 +fi
 +
 +AC_SUBST(HGVERSION)
 +AC_SUBST(HGTAG)
 +AC_SUBST(HGBRANCH)
 +
 +if test -e $srcdir/.hg/dirstate
 +then
 +AC_CHECK_PROG(HAS_HG, hg, found, not-found)
 +else
 +HAS_HG=no-repository
 +fi
 +if test $HAS_HG = found
 +then
 +    HGVERSION="hg id -i \$(srcdir)"
 +    HGTAG="hg id -t \$(srcdir)"
 +    HGBRANCH="hg id -b \$(srcdir)"
 +else
 +    HGVERSION=""
 +    HGTAG=""
 +    HGBRANCH=""
 +fi
 +
  AC_CONFIG_SRCDIR([Include/object.h])
  AC_CONFIG_HEADER(pyconfig.h)