1c94c1ae4e
* Fri Jul 20 2012 David Malcolm <dmalcolm@redhat.com> - 3.3.0-0.1.b1 - 3.2 -> 3.3: https://fedoraproject.org/wiki/Features/Python_3.3 - 3.3.0b1: refresh patches 3, 55, 102, 111, 113, 114, 134, 157; drop upstream patch 147; regenenerate autotools patch; drop "--with-wide-unicode" from configure (PEP 393); "plat-linux2" -> "plat-linux" (upstream issue 12326); "bz2" -> "_bz2" and "crypt" -> "_crypt"; egg-info files are no longer shipped for stdlib (upstream issues 10645 and 12218); email/test moved to test/test_email; add /usr/bin/pyvenv[-3.3] and venv module (PEP 405); add _decimal and _lzma modules; make collections modules explicit in payload again (upstream issue 11085); add _testbuffer module to tests subpackage (added in upstream commit 3f9b3b6f7ff0)
731 lines
26 KiB
Diff
731 lines
26 KiB
Diff
diff -up ./configure.autotool-intermediates ./configure
|
|
--- ./configure.autotool-intermediates 2012-07-20 14:09:54.811590526 -0400
|
|
+++ ./configure 2012-07-20 14:10:00.525519093 -0400
|
|
@@ -1,11 +1,13 @@
|
|
#! /bin/sh
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated by GNU Autoconf 2.69 for python 3.3.
|
|
+# Generated by GNU Autoconf 2.68 for python 3.3.
|
|
#
|
|
# Report bugs to <http://bugs.python.org/>.
|
|
#
|
|
#
|
|
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
|
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
|
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
|
|
+# Foundation, Inc.
|
|
#
|
|
#
|
|
# This configure script is free software; the Free Software Foundation
|
|
@@ -134,31 +136,6 @@ export LANGUAGE
|
|
# CDPATH.
|
|
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
|
|
|
-# Use a proper internal environment variable to ensure we don't fall
|
|
- # into an infinite loop, continuously re-executing ourselves.
|
|
- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
|
|
- _as_can_reexec=no; export _as_can_reexec;
|
|
- # We cannot yet assume a decent shell, so we have to provide a
|
|
-# neutralization value for shells without unset; and this also
|
|
-# works around shells that cannot unset nonexistent variables.
|
|
-# Preserve -v and -x to the replacement shell.
|
|
-BASH_ENV=/dev/null
|
|
-ENV=/dev/null
|
|
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
-case $- in # ((((
|
|
- *v*x* | *x*v* ) as_opts=-vx ;;
|
|
- *v* ) as_opts=-v ;;
|
|
- *x* ) as_opts=-x ;;
|
|
- * ) as_opts= ;;
|
|
-esac
|
|
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
|
|
-# Admittedly, this is quite paranoid, since all the known shells bail
|
|
-# out after a failed `exec'.
|
|
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
|
|
-as_fn_exit 255
|
|
- fi
|
|
- # We don't want this to propagate to other subprocesses.
|
|
- { _as_can_reexec=; unset _as_can_reexec;}
|
|
if test "x$CONFIG_SHELL" = x; then
|
|
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
|
|
emulate sh
|
|
@@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test
|
|
else
|
|
exitcode=1; echo positional parameters were not saved.
|
|
fi
|
|
-test x\$exitcode = x0 || exit 1
|
|
-test -x / || exit 1"
|
|
+test x\$exitcode = x0 || exit 1"
|
|
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
|
|
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
|
|
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
|
|
@@ -238,25 +214,21 @@ IFS=$as_save_IFS
|
|
|
|
|
|
if test "x$CONFIG_SHELL" != x; then :
|
|
- export CONFIG_SHELL
|
|
- # We cannot yet assume a decent shell, so we have to provide a
|
|
-# neutralization value for shells without unset; and this also
|
|
-# works around shells that cannot unset nonexistent variables.
|
|
-# Preserve -v and -x to the replacement shell.
|
|
-BASH_ENV=/dev/null
|
|
-ENV=/dev/null
|
|
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
-case $- in # ((((
|
|
- *v*x* | *x*v* ) as_opts=-vx ;;
|
|
- *v* ) as_opts=-v ;;
|
|
- *x* ) as_opts=-x ;;
|
|
- * ) as_opts= ;;
|
|
-esac
|
|
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
|
|
-# Admittedly, this is quite paranoid, since all the known shells bail
|
|
-# out after a failed `exec'.
|
|
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
|
|
-exit 255
|
|
+ # We cannot yet assume a decent shell, so we have to provide a
|
|
+ # neutralization value for shells without unset; and this also
|
|
+ # works around shells that cannot unset nonexistent variables.
|
|
+ # Preserve -v and -x to the replacement shell.
|
|
+ BASH_ENV=/dev/null
|
|
+ ENV=/dev/null
|
|
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
|
|
+ export CONFIG_SHELL
|
|
+ case $- in # ((((
|
|
+ *v*x* | *x*v* ) as_opts=-vx ;;
|
|
+ *v* ) as_opts=-v ;;
|
|
+ *x* ) as_opts=-x ;;
|
|
+ * ) as_opts= ;;
|
|
+ esac
|
|
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
|
|
fi
|
|
|
|
if test x$as_have_required = xno; then :
|
|
@@ -359,14 +331,6 @@ $as_echo X"$as_dir" |
|
|
|
|
|
|
} # as_fn_mkdir_p
|
|
-
|
|
-# as_fn_executable_p FILE
|
|
-# -----------------------
|
|
-# Test if FILE is an executable regular file.
|
|
-as_fn_executable_p ()
|
|
-{
|
|
- test -f "$1" && test -x "$1"
|
|
-} # as_fn_executable_p
|
|
# as_fn_append VAR VALUE
|
|
# ----------------------
|
|
# Append the text in VALUE to the end of the definition contained in VAR. Take
|
|
@@ -488,10 +452,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
|
|
chmod +x "$as_me.lineno" ||
|
|
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
|
|
|
|
- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
|
|
- # already done that, so ensure we don't try to do so again and fall
|
|
- # in an infinite loop. This has already happened in practice.
|
|
- _as_can_reexec=no; export _as_can_reexec
|
|
# Don't try to exec as it changes $[0], causing all sort of problems
|
|
# (the dirname of $[0] is not the place where we might find the
|
|
# original and so on. Autoconf is especially sensitive to this).
|
|
@@ -526,16 +486,16 @@ if (echo >conf$$.file) 2>/dev/null; then
|
|
# ... but there are two gotchas:
|
|
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -pR'.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
as_ln_s=ln
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
rmdir conf$$.dir 2>/dev/null
|
|
@@ -547,8 +507,28 @@ else
|
|
as_mkdir_p=false
|
|
fi
|
|
|
|
-as_test_x='test -x'
|
|
-as_executable_p=as_fn_executable_p
|
|
+if test -x / >/dev/null 2>&1; then
|
|
+ as_test_x='test -x'
|
|
+else
|
|
+ if ls -dL / >/dev/null 2>&1; then
|
|
+ as_ls_L_option=L
|
|
+ else
|
|
+ as_ls_L_option=
|
|
+ fi
|
|
+ as_test_x='
|
|
+ eval sh -c '\''
|
|
+ if test -d "$1"; then
|
|
+ test -d "$1/.";
|
|
+ else
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
+ esac;
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
+ ???[sx]*):;;*)false;;esac;fi
|
|
+ '\'' sh
|
|
+ '
|
|
+fi
|
|
+as_executable_p=$as_test_x
|
|
|
|
# Sed expression to map a string onto a valid CPP name.
|
|
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
@@ -793,6 +773,8 @@ with_thread
|
|
enable_ipv6
|
|
with_doc_strings
|
|
with_tsc
|
|
+with_count_allocs
|
|
+with_call_profile
|
|
with_pymalloc
|
|
with_valgrind
|
|
with_systemtap
|
|
@@ -1266,6 +1248,8 @@ target=$target_alias
|
|
if test "x$host_alias" != x; then
|
|
if test "x$build_alias" = x; then
|
|
cross_compiling=maybe
|
|
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
|
|
+ If a cross compiler is detected then cross compile mode will be used" >&2
|
|
elif test "x$build_alias" != "x$host_alias"; then
|
|
cross_compiling=yes
|
|
fi
|
|
@@ -1469,6 +1453,8 @@ Optional Packages:
|
|
deprecated; use --with(out)-threads
|
|
--with(out)-doc-strings disable/enable documentation strings
|
|
--with(out)-tsc enable/disable timestamp counter profile
|
|
+ --with(out)count-allocs enable/disable per-type instance accounting
|
|
+ --with(out)-call-profile enable/disable statistics on function call invocation
|
|
--with(out)-pymalloc disable/enable specialized mallocs
|
|
--with-valgrind Enable Valgrind support
|
|
--with(out)-systemtap disable/enable SystemTap support
|
|
@@ -1556,9 +1542,9 @@ test -n "$ac_init_help" && exit $ac_stat
|
|
if $ac_init_version; then
|
|
cat <<\_ACEOF
|
|
python configure 3.3
|
|
-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
|
|
@@ -1634,7 +1620,7 @@ $as_echo "$ac_try_echo"; } >&5
|
|
test ! -s conftest.err
|
|
} && test -s conftest$ac_exeext && {
|
|
test "$cross_compiling" = yes ||
|
|
- test -x conftest$ac_exeext
|
|
+ $as_test_x conftest$ac_exeext
|
|
}; then :
|
|
ac_retval=0
|
|
else
|
|
@@ -1932,8 +1918,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -1987,8 +1972,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -2004,8 +1988,7 @@ main ()
|
|
{
|
|
static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
|
|
< ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -2055,8 +2038,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !(($2) >= 0)];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -2072,8 +2054,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -2099,8 +2080,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !(($2) < 0)];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -2116,8 +2096,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !(($2) >= $ac_mid)];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -2151,8 +2130,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !(($2) <= $ac_mid)];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -2395,7 +2373,7 @@ This file contains any messages produced
|
|
running configure, to aid debugging if configure makes a mistake.
|
|
|
|
It was created by python $as_me 3.3, which was
|
|
-generated by GNU Autoconf 2.69. Invocation command line was
|
|
+generated by GNU Autoconf 2.68. Invocation command line was
|
|
|
|
$ $0 $@
|
|
|
|
@@ -2765,7 +2743,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ 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
|
|
@@ -3508,7 +3486,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -3548,7 +3526,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_ac_ct_CC="gcc"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -3601,7 +3579,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="${ac_tool_prefix}cc"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -3642,7 +3620,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
|
ac_prog_rejected=yes
|
|
continue
|
|
@@ -3700,7 +3678,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -3744,7 +3722,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_ac_ct_CC="$ac_prog"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -4190,7 +4168,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
|
|
/* end confdefs.h. */
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
-struct stat;
|
|
+#include <sys/types.h>
|
|
+#include <sys/stat.h>
|
|
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
|
struct buf { int x; };
|
|
FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
|
@@ -4329,7 +4308,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
|
|
@@ -4370,7 +4349,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
|
|
@@ -4411,7 +4390,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
|
|
@@ -4460,7 +4439,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_CXX="$ac_prog"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -4691,7 +4670,7 @@ do
|
|
for ac_prog in grep ggrep; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
- as_fn_executable_p "$ac_path_GREP" || continue
|
|
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
# Check for GNU ac_path_GREP and select it if it is found.
|
|
# Check for GNU $ac_path_GREP
|
|
case `"$ac_path_GREP" --version 2>&1` in
|
|
@@ -4757,7 +4736,7 @@ do
|
|
for ac_prog in egrep; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
- as_fn_executable_p "$ac_path_EGREP" || continue
|
|
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
# Check for GNU ac_path_EGREP and select it if it is found.
|
|
# Check for GNU $ac_path_EGREP
|
|
case `"$ac_path_EGREP" --version 2>&1` in
|
|
@@ -4964,8 +4943,8 @@ else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
-# define __EXTENSIONS__ 1
|
|
- $ac_includes_default
|
|
+# define __EXTENSIONS__ 1
|
|
+ $ac_includes_default
|
|
int
|
|
main ()
|
|
{
|
|
@@ -5359,7 +5338,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -5399,7 +5378,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_ac_ct_RANLIB="ranlib"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -5453,7 +5432,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_AR="$ac_prog"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -5504,7 +5483,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ 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_PYTHON="found"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -5577,7 +5556,7 @@ case $as_dir/ in #((
|
|
# by default.
|
|
for ac_prog in ginstall scoinst install; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
|
if test $ac_prog = install &&
|
|
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
|
# AIX install. It has an incompatible calling convention.
|
|
@@ -5646,7 +5625,7 @@ do
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_prog in mkdir gmkdir; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
|
|
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
|
|
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
|
|
'mkdir (GNU coreutils) '* | \
|
|
'mkdir (coreutils) '* | \
|
|
@@ -8538,7 +8517,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_path_PKG_CONFIG="$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
|
|
@@ -8581,7 +8560,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_path_ac_pt_PKG_CONFIG="$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
|
|
@@ -9591,6 +9570,50 @@ $as_echo "no" >&6; }
|
|
fi
|
|
|
|
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-count-allocs" >&5
|
|
+$as_echo_n "checking for --with-count-allocs... " >&6; }
|
|
+
|
|
+# Check whether --with-count-allocs was given.
|
|
+if test "${with_count_allocs+set}" = set; then :
|
|
+ withval=$with_count_allocs;
|
|
+if test "$withval" != no
|
|
+then
|
|
+
|
|
+$as_echo "#define COUNT_ALLOCS 1" >>confdefs.h
|
|
+
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
+
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-call-profile" >&5
|
|
+$as_echo_n "checking for --with-call-profile... " >&6; }
|
|
+
|
|
+# Check whether --with-call-profile was given.
|
|
+if test "${with_call_profile+set}" = set; then :
|
|
+ withval=$with_call_profile;
|
|
+if test "$withval" != no
|
|
+then
|
|
+
|
|
+$as_echo "#define CALL_PROFILE 1" >>confdefs.h
|
|
+
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
+$as_echo "yes" >&6; }
|
|
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
+else
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
+$as_echo "no" >&6; }
|
|
+fi
|
|
+
|
|
+
|
|
# Check for Python-specific malloc support
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5
|
|
$as_echo_n "checking for --with-pymalloc... " >&6; }
|
|
@@ -10208,7 +10231,7 @@ do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
ac_cv_prog_TRUE="$ac_prog"
|
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
break 2
|
|
@@ -11645,8 +11668,7 @@ int
|
|
main ()
|
|
{
|
|
static int test_array [1 - 2 * !(((char) -1) < 0)];
|
|
-test_array [0] = 0;
|
|
-return test_array [0];
|
|
+test_array [0] = 0
|
|
|
|
;
|
|
return 0;
|
|
@@ -11677,11 +11699,11 @@ else
|
|
int
|
|
main ()
|
|
{
|
|
-
|
|
+/* FIXME: Include the comments suggested by Paul. */
|
|
#ifndef __cplusplus
|
|
- /* Ultrix mips cc rejects this sort of thing. */
|
|
+ /* Ultrix mips cc rejects this. */
|
|
typedef int charset[2];
|
|
- const charset cs = { 0, 0 };
|
|
+ const charset cs;
|
|
/* SunOS 4.1.1 cc rejects this. */
|
|
char const *const *pcpcc;
|
|
char **ppc;
|
|
@@ -11698,9 +11720,8 @@ main ()
|
|
++pcpcc;
|
|
ppc = (char**) pcpcc;
|
|
pcpcc = (char const *const *) ppc;
|
|
- { /* SCO 3.2v4 cc rejects this sort of thing. */
|
|
- char tx;
|
|
- char *t = &tx;
|
|
+ { /* SCO 3.2v4 cc rejects this. */
|
|
+ char *t;
|
|
char const *s = 0 ? (char *) 0 : (char const *) 0;
|
|
|
|
*t++ = 0;
|
|
@@ -11716,10 +11737,10 @@ main ()
|
|
iptr p = 0;
|
|
++p;
|
|
}
|
|
- { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
|
|
+ { /* AIX XL C 1.02.0.0 rejects this saying
|
|
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
|
|
- struct s { int j; const int *ap[3]; } bx;
|
|
- struct s *b = &bx; b->j = 5;
|
|
+ struct s { int j; const int *ap[3]; };
|
|
+ struct s *b; b->j = 5;
|
|
}
|
|
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
|
|
const int foo = 10;
|
|
@@ -15008,16 +15029,16 @@ if (echo >conf$$.file) 2>/dev/null; then
|
|
# ... but there are two gotchas:
|
|
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
|
|
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
|
|
- # In both cases, we have to default to `cp -pR'.
|
|
+ # In both cases, we have to default to `cp -p'.
|
|
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
elif ln conf$$.file conf$$ 2>/dev/null; then
|
|
as_ln_s=ln
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
else
|
|
- as_ln_s='cp -pR'
|
|
+ as_ln_s='cp -p'
|
|
fi
|
|
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
|
|
rmdir conf$$.dir 2>/dev/null
|
|
@@ -15077,16 +15098,28 @@ else
|
|
as_mkdir_p=false
|
|
fi
|
|
|
|
-
|
|
-# as_fn_executable_p FILE
|
|
-# -----------------------
|
|
-# Test if FILE is an executable regular file.
|
|
-as_fn_executable_p ()
|
|
-{
|
|
- test -f "$1" && test -x "$1"
|
|
-} # as_fn_executable_p
|
|
-as_test_x='test -x'
|
|
-as_executable_p=as_fn_executable_p
|
|
+if test -x / >/dev/null 2>&1; then
|
|
+ as_test_x='test -x'
|
|
+else
|
|
+ if ls -dL / >/dev/null 2>&1; then
|
|
+ as_ls_L_option=L
|
|
+ else
|
|
+ as_ls_L_option=
|
|
+ fi
|
|
+ as_test_x='
|
|
+ eval sh -c '\''
|
|
+ if test -d "$1"; then
|
|
+ test -d "$1/.";
|
|
+ else
|
|
+ case $1 in #(
|
|
+ -*)set "./$1";;
|
|
+ esac;
|
|
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
|
|
+ ???[sx]*):;;*)false;;esac;fi
|
|
+ '\'' sh
|
|
+ '
|
|
+fi
|
|
+as_executable_p=$as_test_x
|
|
|
|
# Sed expression to map a string onto a valid CPP name.
|
|
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
|
|
@@ -15108,7 +15141,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
|
|
# values after options handling.
|
|
ac_log="
|
|
This file was extended by python $as_me 3.3, 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
|
|
@@ -15170,10 +15203,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
|
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
|
ac_cs_version="\\
|
|
python config.status 3.3
|
|
-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."
|
|
|
|
@@ -15263,7 +15296,7 @@ fi
|
|
_ACEOF
|
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
|
if \$ac_cs_recheck; then
|
|
- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
|
|
shift
|
|
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
|
|
CONFIG_SHELL='$SHELL'
|
|
diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
|