- Issue #16262: fix out-of-src-tree builds, if mercurial is not installed.

diff --cc Makefile.pre.in
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc configure
index c44c8b6caf934ab700353c122cf6c663698b6bd3,3dd173bf6f179e46fe1813f831537c2aa13421a3..9f593d021d805e749c24dafe7609a17c05d3facf
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for python 3.4.
 -# Generated by GNU Autoconf 2.68 for python 3.3.
++# Generated by GNU Autoconf 2.68 for python 3.4.
  #
  # Report bugs to <http://bugs.python.org/>.
  #
@@@ -1558,10 -1540,10 +1540,10 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 -python configure 3.3
 +python configure 3.4
- generated by GNU Autoconf 2.69
+ generated by GNU Autoconf 2.68
  
- Copyright (C) 2012 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -2397,8 -2371,8 +2371,8 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
 -It was created by python $as_me 3.3, which was
 +It was created by python $as_me 3.4, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    $ $0 $@
  
@@@ -15594,8 -15584,8 +15584,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
 -This file was extended by python $as_me 3.3, which was
 +This file was extended by python $as_me 3.4, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -15656,11 -15646,11 +15646,11 @@@ _ACEO
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
 -python config.status 3.3
 +python config.status 3.4
- configured by $0, generated by GNU Autoconf 2.69,
+ configured by $0, generated by GNU Autoconf 2.68,
    with options \\"\$ac_cs_config\\"
  
- Copyright (C) 2012 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  

diff --cc configure.ac
Simple merge