From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Mon, 29 Oct 2012 17:35:57 +0000 (+0000)
Subject: Merge with 3.2 for issue #16262
X-Git-Tag: v3.3.1rc1~727
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=646eb1e8566821bd0129ce1ef5d300168856010e;p=python

Merge with 3.2 for issue #16262
---

646eb1e8566821bd0129ce1ef5d300168856010e
diff --cc configure
index 3dd173bf6f,010de8f15c..4a861ed2c9
--- a/configure
+++ b/configure
@@@ -1,6 -1,7 +1,6 @@@
  #! /bin/sh
 -# From configure.ac Revision.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.68 for python 3.3.
 -# Generated by GNU Autoconf 2.69 for python 3.2.
++# Generated by GNU Autoconf 2.69 for python 3.3.
  #
  # Report bugs to <http://bugs.python.org/>.
  #
@@@ -1540,10 -1543,10 +1558,10 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 -python configure 3.2
 +python configure 3.3
- generated by GNU Autoconf 2.68
+ generated by GNU Autoconf 2.69
  
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2012 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -2371,8 -2382,8 +2397,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.2, which was
 +It was created by python $as_me 3.3, which was
- generated by GNU Autoconf 2.68.  Invocation command line was
+ generated by GNU Autoconf 2.69.  Invocation command line was
  
    $ $0 $@
  
@@@ -2720,81 -2731,6 +2746,81 @@@ ac_compiler_gnu=$ac_cv_c_compiler_gn
  
  
  
 +
 +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
 +    #   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
++  if as_fn_executable_p "$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"
  
  
@@@ -4413,8 -4105,8 +4438,8 @@@ d
    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
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
 +    ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@@ -4468,8 -4154,8 +4493,8 @@@ d
    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
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_CXX="$ac_prog"
 +    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@@ -4490,286 -4175,27 +4515,286 @@@ $as_echo "no" >&6; 
  fi
  
  
 -  test -n "$CXX" && break
 -done
 -test -n "$CXX" || CXX="notfound"
 -
 -	if test "$CXX" = "notfound"
 -	then
 -		CXX=""
 -	fi
 -fi
 -if test "$preset_cxx" != "$CXX"
 -then
 -        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 -
 -  By default, distutils will build C++ extension modules with \"$CXX\".
 -  If this is not intended, then set CXX on the configure command line.
 -  " >&5
 -$as_echo "$as_me: WARNING:
 -
 -  By default, distutils will build C++ extension modules with \"$CXX\".
 -  If this is not intended, then set CXX on the configure command line.
 -  " >&2;}
 +fi
 +if test -z "$ac_cv_path_CXX"; then
 +  ac_pt_CXX=$CXX
 +  # Extract the first word of "c++", so it can be a program name with args.
 +set dummy c++; 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_path_ac_pt_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  case $ac_pt_CXX in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path.
 +  ;;
 +  *)
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in notfound
 +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
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext"
 +    $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
 +
 +  ;;
 +esac
 +fi
 +ac_pt_CXX=$ac_cv_path_ac_pt_CXX
 +if test -n "$ac_pt_CXX"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
 +$as_echo "$ac_pt_CXX" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_pt_CXX" = x; then
 +    CXX="c++"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CXX=$ac_pt_CXX
 +  fi
 +else
 +  CXX="$ac_cv_path_CXX"
 +fi
 + ;;
 +        clang|*/clang)     if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}clang++", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}clang++; 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_path_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  case $CXX in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
 +  ;;
 +  *)
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in notfound
 +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
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
 +    $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
 +
 +  ;;
 +esac
 +fi
 +CXX=$ac_cv_path_CXX
 +if test -n "$CXX"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
 +$as_echo "$CXX" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_path_CXX"; then
 +  ac_pt_CXX=$CXX
 +  # Extract the first word of "clang++", so it can be a program name with args.
 +set dummy clang++; 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_path_ac_pt_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  case $ac_pt_CXX in
 +  [\\/]* | ?:[\\/]*)
 +  ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path.
 +  ;;
 +  *)
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in notfound
 +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
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_path_ac_pt_CXX="$as_dir/$ac_word$ac_exec_ext"
 +    $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
 +
 +  ;;
 +esac
 +fi
 +ac_pt_CXX=$ac_cv_path_ac_pt_CXX
 +if test -n "$ac_pt_CXX"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5
 +$as_echo "$ac_pt_CXX" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_pt_CXX" = x; then
 +    CXX="clang++"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CXX=$ac_pt_CXX
 +  fi
 +else
 +  CXX="$ac_cv_path_CXX"
 +fi
 + ;;
 +        esac
 +	if test "$CXX" = "notfound"
 +	then
 +		CXX=""
 +	fi
 +fi
 +if test -z "$CXX"
 +then
 +	if test -n "$ac_tool_prefix"; then
 +  for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 +set dummy $ac_tool_prefix$ac_prog; 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_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$CXX"; then
 +  ac_cv_prog_CXX="$CXX" # 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
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 +    $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
 +
 +fi
 +fi
 +CXX=$ac_cv_prog_CXX
 +if test -n "$CXX"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
 +$as_echo "$CXX" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +    test -n "$CXX" && break
 +  done
 +fi
 +if test -z "$CXX"; then
 +  ac_ct_CXX=$CXX
 +  for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; 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_ac_ct_CXX+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_CXX"; then
 +  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # 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
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_CXX="$ac_prog"
 +    $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
 +
 +fi
 +fi
 +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 +if test -n "$ac_ct_CXX"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
 +$as_echo "$ac_ct_CXX" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  test -n "$ac_ct_CXX" && break
 +done
 +
 +  if test "x$ac_ct_CXX" = x; then
 +    CXX="notfound"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CXX=$ac_ct_CXX
 +  fi
 +fi
 +
 +	if test "$CXX" = "notfound"
 +	then
 +		CXX=""
 +	fi
 +fi
 +if test "$preset_cxx" != "$CXX"
 +then
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 +
 +  By default, distutils will build C++ extension modules with \"$CXX\".
 +  If this is not intended, then set CXX on the configure command line.
 +  " >&5
 +$as_echo "$as_me: WARNING:
 +
 +  By default, distutils will build C++ extension modules with \"$CXX\".
 +  If this is not intended, then set CXX on the configure command line.
 +  " >&2;}
  fi
  
  
@@@ -5724,8 -5152,8 +5749,8 @@@ d
    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
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_AR="$ac_prog"
 +    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@@ -5745,65 -5173,9 +5770,65 @@@ $as_echo "no" >&6; 
  fi
  
  
 -  test -n "$AR" && break
 +    test -n "$AR" && break
 +  done
 +fi
 +if test -z "$AR"; then
 +  ac_ct_AR=$AR
 +  for ac_prog in ar aal
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; 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_ac_ct_AR+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_AR"; then
 +  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_AR="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
  done
 -test -n "$AR" || AR="ar"
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
 +if test -n "$ac_ct_AR"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 +$as_echo "$ac_ct_AR" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  test -n "$ac_ct_AR" && break
 +done
 +
 +  if test "x$ac_ct_AR" = x; then
 +    AR="ar"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    AR=$ac_ct_AR
 +  fi
 +fi
  
  
  # tweak ARFLAGS only if the user didn't set it on the command line
@@@ -5832,8 -5202,8 +5857,8 @@@ d
    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
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_SVNVERSION="found"
 +    ac_cv_prog_READELF="$ac_tool_prefix$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@@ -5876,8 -5269,8 +5901,8 @@@ d
    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
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_HAS_HG="found"
 +    ac_cv_prog_ac_ct_READELF="$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@@ -15584,8 -14574,8 +15599,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.2, which was
 +This file was extended by python $as_me 3.3, which was
- generated by GNU Autoconf 2.68.  Invocation command line was
+ generated by GNU Autoconf 2.69.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -15646,11 -14636,11 +15661,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.2
 +python config.status 3.3
- configured by $0, generated by GNU Autoconf 2.68,
+ configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
  
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2012 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."