[python26/el5] 2.6.8-1
dmalcolm
dmalcolm at fedoraproject.org
Thu Apr 12 20:54:24 UTC 2012
commit 6da62a4fc2382572a8f784f36ecca562772097f5
Author: David Malcolm <dmalcolm at redhat.com>
Date: Thu Apr 12 16:53:04 2012 -0400
2.6.8-1
* Thu Apr 12 2012 David Malcolm <dmalcolm at redhat.com> - 2.6.8-1
- 2.6.8: refresh patch 102 (lib64), patch 52 (valgrind) and patch 110
(ctypes/SELinux); drop upstream patch 11 (tolower), patch 116 (CVE-2010-1634),
patch 117 (CVE-2010-2089), patch 118 (CVE-2008-5983); add patch 200 (Py_DEBUG
and _Py_HashSecret_Initialized); regenerate the autotool intermediates patch
(patch 300)
.gitignore | 1 +
disable-pymalloc-on-valgrind-py26.patch | 144 +-
python-2.6-ctypes-noexecmem.patch | 85 -
python-2.6.2-CVE-2008-5983.patch | 137 -
python-2.6.2-CVE-2010-1634.patch | 210 --
python-2.6.2-CVE-2010-2089.patch | 349 --
python-2.6.4-autotool-intermediates.patch | 3407 ++++++++++++++++++--
python-2.6.8-ctypes-noexecmem.patch | 85 +
python-2.6-lib64.patch => python-2.6.8-lib64.patch | 69 +-
...y_HashSecret_Initialized-with-if-Py_DEBUG.patch | 26 +
python26.spec | 46 +-
sources | 2 +-
12 files changed, 3399 insertions(+), 1162 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 218a0ed..b6cbbd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Python-2.6.5.tar.bz2
libpython-36a517ef7848cbd0b3dcc7371f32e47ac4c87eba.tar.gz
+/Python-2.6.8.tar.bz2
diff --git a/disable-pymalloc-on-valgrind-py26.patch b/disable-pymalloc-on-valgrind-py26.patch
index de56bdc..b8ddc09 100644
--- a/disable-pymalloc-on-valgrind-py26.patch
+++ b/disable-pymalloc-on-valgrind-py26.patch
@@ -1,8 +1,7 @@
-Index: configure.in
-===================================================================
---- configure.in (revision 61828)
-+++ configure.in (working copy)
-@@ -2232,6 +2232,19 @@ then
+diff -up Python-2.6.8/configure.in.valgrind Python-2.6.8/configure.in
+--- Python-2.6.8/configure.in.valgrind 2012-04-12 13:27:39.301248146 -0400
++++ Python-2.6.8/configure.in 2012-04-12 13:27:39.325247847 -0400
+@@ -2538,6 +2538,19 @@ then
fi
AC_MSG_RESULT($with_pymalloc)
@@ -22,10 +21,24 @@ Index: configure.in
# Check for --with-wctype-functions
AC_MSG_CHECKING(for --with-wctype-functions)
AC_ARG_WITH(wctype-functions,
-Index: Objects/obmalloc.c
-===================================================================
---- Objects/obmalloc.c (revision 61828)
-+++ Objects/obmalloc.c (working copy)
+diff -up Python-2.6.8/Misc/NEWS.valgrind Python-2.6.8/Misc/NEWS
+--- Python-2.6.8/Misc/NEWS.valgrind 2012-04-10 11:32:08.000000000 -0400
++++ Python-2.6.8/Misc/NEWS 2012-04-12 13:27:39.331247771 -0400
+@@ -68,6 +68,11 @@ What's New in Python 2.6.7 rc 2?
+ allowed. Python 2.6.7 and beyond will be source only releases.*
+
+
++- Issue #2422: When compiled with the ``--with-valgrind`` option, the
++ pymalloc allocator will be automatically disabled when running under
++ Valgrind. This gives improved memory leak detection when running
++ under Valgrind, while taking advantage of pymalloc at other times.
++
+ Library
+ -------
+
+diff -up Python-2.6.8/Objects/obmalloc.c.valgrind Python-2.6.8/Objects/obmalloc.c
+--- Python-2.6.8/Objects/obmalloc.c.valgrind 2012-04-10 11:32:10.000000000 -0400
++++ Python-2.6.8/Objects/obmalloc.c 2012-04-12 13:33:21.707967473 -0400
@@ -2,6 +2,21 @@
#ifdef WITH_PYMALLOC
@@ -48,88 +61,71 @@ Index: Objects/obmalloc.c
/* An object allocator for Python.
Here is an introduction to the layers of the Python memory architecture,
-@@ -726,6 +741,13 @@ PyObject_Malloc(size_t nbytes)
- poolp next;
- uint size;
+@@ -737,6 +752,13 @@ PyObject_Malloc(size_t nbytes)
+ if (nbytes > PY_SSIZE_T_MAX)
+ return NULL;
+#ifdef WITH_VALGRIND
-+ if (UNLIKELY(running_on_valgrind == -1))
-+ running_on_valgrind = RUNNING_ON_VALGRIND;
-+ if (UNLIKELY(running_on_valgrind))
-+ goto redirect;
++ if (UNLIKELY(running_on_valgrind == -1))
++ running_on_valgrind = RUNNING_ON_VALGRIND;
++ if (UNLIKELY(running_on_valgrind))
++ goto redirect;
+#endif
+
- /*
- * This implicitly redirects malloc(0).
- */
-@@ -916,6 +938,11 @@ PyObject_Free(void *p)
- if (p == NULL) /* free(NULL) has no effect */
- return;
+ /*
+ * This implicitly redirects malloc(0).
+ */
+@@ -927,6 +949,11 @@ PyObject_Free(void *p)
+ if (p == NULL) /* free(NULL) has no effect */
+ return;
+#ifdef WITH_VALGRIND
-+ if (UNLIKELY(running_on_valgrind > 0))
-+ goto redirect;
++ if (UNLIKELY(running_on_valgrind > 0))
++ goto redirect;
+#endif
+
- pool = POOL_ADDR(p);
- if (Py_ADDRESS_IN_RANGE(p, pool)) {
- /* We allocated this address. */
-@@ -1110,6 +1137,7 @@ PyObject_Free(void *p)
- return;
- }
+ pool = POOL_ADDR(p);
+ if (Py_ADDRESS_IN_RANGE(p, pool)) {
+ /* We allocated this address. */
+@@ -1121,6 +1148,7 @@ PyObject_Free(void *p)
+ return;
+ }
+redirect:
- /* We didn't allocate this address. */
- free(p);
+ /* We didn't allocate this address. */
+ free(p);
}
-@@ -1130,6 +1158,12 @@ PyObject_Realloc(void *p, size_t nbytes)
- if (p == NULL)
- return PyObject_Malloc(nbytes);
+@@ -1150,6 +1178,12 @@ PyObject_Realloc(void *p, size_t nbytes)
+ if (nbytes > PY_SSIZE_T_MAX)
+ return NULL;
+#ifdef WITH_VALGRIND
-+ /* Treat running_on_valgrind == -1 the same as 0 */
-+ if (UNLIKELY(running_on_valgrind > 0))
-+ goto redirect;
++ /* Treat running_on_valgrind == -1 the same as 0 */
++ if (UNLIKELY(running_on_valgrind > 0))
++ goto redirect;
+#endif
+
- pool = POOL_ADDR(p);
- if (Py_ADDRESS_IN_RANGE(p, pool)) {
- /* We're in charge of this block */
-@@ -1157,6 +1191,7 @@ PyObject_Realloc(void *p, size_t nbytes)
- }
- return bp;
- }
-+ redirect:
- /* We're not managing this block. If nbytes <=
- * SMALL_REQUEST_THRESHOLD, it's tempting to try to take over this
- * block. However, if we do, we need to copy the valid data from
-Index: Misc/NEWS
-===================================================================
---- Misc/NEWS (revision 61828)
-+++ Misc/NEWS (working copy)
-@@ -60,6 +60,11 @@ Core and builtins
-
- - Issue #2143: Fix embedded readline() hang on SSL socket EOF.
-
-+- Issue #2422: When compiled with the ``--with-valgrind`` option, the
-+ pymalloc allocator will be automatically disabled when running under
-+ Valgrind. This gives improved memory leak detection when running
-+ under Valgrind, while taking advantage of pymalloc at other times.
-+
- Library
- -------
-
-Index: pyconfig.h.in
-===================================================================
---- pyconfig.h.in (revision 61828)
-+++ pyconfig.h.in (working copy)
-@@ -958,6 +958,9 @@
- /* Define to profile with the Pentium timestamp counter */
- #undef WITH_TSC
+ pool = POOL_ADDR(p);
+ if (Py_ADDRESS_IN_RANGE(p, pool)) {
+ /* We're in charge of this block */
+@@ -1177,6 +1211,7 @@ PyObject_Realloc(void *p, size_t nbytes)
+ }
+ return bp;
+ }
++redirect:
+ /* We're not managing this block. If nbytes <=
+ * SMALL_REQUEST_THRESHOLD, it's tempting to try to take over this
+ * block. However, if we do, we need to copy the valid data from
+diff -up Python-2.6.8/pyconfig.h.in.valgrind Python-2.6.8/pyconfig.h.in
+--- Python-2.6.8/pyconfig.h.in.valgrind 2012-04-10 11:32:11.000000000 -0400
++++ Python-2.6.8/pyconfig.h.in 2012-04-12 13:27:39.332247759 -0400
+@@ -1085,6 +1085,9 @@
+ /* Define to empty if the keyword does not work. */
+ #undef volatile
+/* Define if you want pymalloc to be disabled when running under valgrind */
+#undef WITH_VALGRIND
+
- /* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX).
+ /* Define the macros needed if on a UnixWare 7.x system. */
+ #if defined(__USLC__) && defined(__SCO_VERSION__)
diff --git a/python-2.6.4-autotool-intermediates.patch b/python-2.6.4-autotool-intermediates.patch
index 4c40369..2071eca 100644
--- a/python-2.6.4-autotool-intermediates.patch
+++ b/python-2.6.4-autotool-intermediates.patch
@@ -1,14 +1,264 @@
diff -up ./configure.autotool-intermediates ./configure
---- ./configure.autotool-intermediates 2010-03-22 19:57:14.000000000 -0400
-+++ ./configure 2010-03-22 19:57:21.000000000 -0400
-@@ -1,5 +1,5 @@
+--- ./configure.autotool-intermediates 2012-04-12 16:08:19.044734769 -0400
++++ ./configure 2012-04-12 16:08:20.698714090 -0400
+@@ -1,14 +1,14 @@
#! /bin/sh
--# From configure.in Revision: 78813 .
-+# From configure.in Revision: 78820 .
+-# From configure.in Revision: 80701 .
++# From configure.in Revision.
# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.61 for python 2.6.
+-# Generated by GNU Autoconf 2.65 for python 2.6.
++# Generated by GNU Autoconf 2.68 for python 2.6.
#
-@@ -1347,6 +1347,8 @@ Optional Packages:
+ # Report bugs to <http://www.python.org/python-bugs>.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -92,6 +92,7 @@ fi
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -217,11 +218,18 @@ IFS=$as_save_IFS
+ # 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
+- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++ 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 :
+@@ -320,7 +328,7 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -360,19 +368,19 @@ else
+ fi # as_fn_arith
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -534,7 +542,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+@@ -732,6 +740,7 @@ enable_profiling
+ with_pydebug
+ enable_toolbox_glue
+ with_libs
++with_system_expat
+ with_system_ffi
+ with_signal_module
+ with_dec_threads
+@@ -742,6 +751,7 @@ enable_ipv6
+ with_doc_strings
+ with_tsc
+ with_pymalloc
++with_valgrind
+ with_wctype_functions
+ with_fpectl
+ with_libm
+@@ -819,8 +829,9 @@ do
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -865,7 +876,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -891,7 +902,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1095,7 +1106,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1111,7 +1122,7 @@ do
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1141,8 +1152,8 @@ do
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+ ;;
+
+ *=*)
+@@ -1150,7 +1161,7 @@ Try \`$0 --help' for more information."
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+@@ -1160,7 +1171,7 @@ Try \`$0 --help' for more information."
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+ ;;
+
+ esac
+@@ -1168,13 +1179,13 @@ done
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- as_fn_error "missing argument to $ac_option"
++ as_fn_error $? "missing argument to $ac_option"
+ fi
+
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+@@ -1197,7 +1208,7 @@ do
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1211,8 +1222,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
++ $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
+@@ -1227,9 +1238,9 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- as_fn_error "working directory cannot be determined"
++ as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- as_fn_error "pwd does not report name of working directory"
++ as_fn_error $? "pwd does not report name of working directory"
+
+
+ # Find the source files, if location was not specified.
+@@ -1268,11 +1279,11 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1312,7 +1323,7 @@ Configuration:
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+@@ -1395,6 +1406,8 @@ Optional Packages:
--with-suffix=.exe set executable suffix
--with-pydebug build with Py_DEBUG defined
--with-libs='lib1 ...' link against additional libs
@@ -17,7 +267,7 @@ diff -up ./configure.autotool-intermediates ./configure
--with-system-ffi build _ctypes module using an installed ffi library
--with-signal-module disable/enable signal module
--with-dec-threads use DEC Alpha/OSF1 thread-safe libraries
-@@ -1358,6 +1360,7 @@ Optional Packages:
+@@ -1406,6 +1419,7 @@ Optional Packages:
--with(out)-doc-strings disable/enable documentation strings
--with(out)-tsc enable/disable timestamp counter profile
--with(out)-pymalloc disable/enable specialized mallocs
@@ -25,16 +275,699 @@ diff -up ./configure.autotool-intermediates ./configure
--with-wctype-functions use wctype.h functions
--with-fpectl enable SIGFPE catching
--with-libm=STRING math library
-@@ -3900,7 +3903,7 @@ else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
+@@ -1488,9 +1502,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ python configure 2.6
+-generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.68
+
+-Copyright (C) 2009 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
+@@ -1534,7 +1548,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
fi
--rm -f -r conftest*
-+rm -f conftest*
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_compile
+@@ -1560,7 +1574,7 @@ $as_echo "$ac_try_echo"; } >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -1571,7 +1585,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_cpp
+@@ -1584,10 +1598,10 @@ fi
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -1623,7 +1637,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -1646,17 +1660,15 @@ $as_echo "$as_me: WARNING: $2: see the A
+ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+-( cat <<\_ASBOX
+-## ------------------------------------------------ ##
++( $as_echo "## ------------------------------------------------ ##
+ ## Report this to http://www.python.org/python-bugs ##
+-## ------------------------------------------------ ##
+-_ASBOX
++## ------------------------------------------------ ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -1665,7 +1677,7 @@ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_header_mongrel
+
+@@ -1706,7 +1718,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ ac_retval=$ac_status
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_run
+@@ -1720,7 +1732,7 @@ ac_fn_c_check_header_compile ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1738,7 +1750,7 @@ fi
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_header_compile
+
+@@ -1783,7 +1795,7 @@ fi
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_link
+@@ -1797,7 +1809,7 @@ ac_fn_c_check_type ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=no"
+@@ -1838,7 +1850,7 @@ fi
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_type
+
+@@ -2015,7 +2027,7 @@ rm -f core *.core core.conftest.* gmon.o
+ rm -f conftest.val
+
+ fi
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_compute_int
+@@ -2028,7 +2040,7 @@ ac_fn_c_check_func ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2083,7 +2095,7 @@ fi
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_func
+
+@@ -2096,7 +2108,7 @@ ac_fn_c_check_member ()
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+ $as_echo_n "checking for $2.$3... " >&6; }
+-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$4+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2140,19 +2152,22 @@ fi
+ eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_member
+
+-# ac_fn_c_check_decl LINENO SYMBOL VAR
+-# ------------------------------------
+-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
++# ---------------------------------------------
++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
++# accordingly.
+ ac_fn_c_check_decl ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+-$as_echo_n "checking whether $2 is declared... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ as_decl_name=`echo $2|sed 's/ *(.*//'`
++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
++$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
++if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2161,8 +2176,12 @@ $4
+ int
+ main ()
+ {
+-#ifndef $2
+- (void) $2;
++#ifndef $as_decl_name
++#ifdef __cplusplus
++ (void) $as_decl_use;
++#else
++ (void) $as_decl_name;
++#endif
+ #endif
+
+ ;
+@@ -2179,7 +2198,7 @@ fi
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+ } # ac_fn_c_check_decl
+ cat >config.log <<_ACEOF
+@@ -2187,7 +2206,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by python $as_me 2.6, which was
+-generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.68. Invocation command line was
+
+ $ $0 $@
+
+@@ -2297,11 +2316,9 @@ trap 'exit_status=$?
+ {
+ echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
++ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2335,11 +2352,9 @@ $as_echo "$as_me: WARNING: cache variabl
+ )
+ echo
+
+- cat <<\_ASBOX
+-## ----------------- ##
++ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -2352,11 +2367,9 @@ _ASBOX
+ echo
+
+ if test -n "$ac_subst_files"; then
+- cat <<\_ASBOX
+-## ------------------- ##
++ $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -2370,11 +2383,9 @@ _ASBOX
+ fi
+
+ if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
++ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+@@ -2429,7 +2440,12 @@ _ACEOF
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
++ # We do not want a PATH search for config.site.
++ case $CONFIG_SITE in #((
++ -*) ac_site_file1=./$CONFIG_SITE;;
++ */*) ac_site_file1=$CONFIG_SITE;;
++ *) ac_site_file1=./$CONFIG_SITE;;
++ esac
+ elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+@@ -2444,7 +2460,11 @@ do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file"
++ . "$ac_site_file" \
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ done
+
+@@ -2520,7 +2540,7 @@ if $ac_cache_corrupted; then
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2615,7 +2635,7 @@ if test "${enable_universalsdk+set}" = s
+ UNIVERSALSDK=$enableval
+ if test ! -d "${UNIVERSALSDK}"
+ then
+- as_fn_error "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5
++ as_fn_error $? "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5
+ fi
+ ;;
+ esac
+@@ -2655,7 +2675,7 @@ $as_echo "$withval" >&6; }
+ if test "${enable_universalsdk}" ; then
+ :
+ else
+- as_fn_error "--with-universal-archs without --enable-universalsdk. See Mac/README" "$LINENO" 5
++ as_fn_error $? "--with-universal-archs without --enable-universalsdk. See Mac/README" "$LINENO" 5
+ fi
+
+ else
+@@ -2675,7 +2695,7 @@ if test "${with_framework_name+set}" = s
+ if test "${enable_framework}"; then
+ :
+ else
+- as_fn_error "--with-framework-name without --enable-framework. See Mac/README" "$LINENO" 5
++ as_fn_error $? "--with-framework-name without --enable-framework. See Mac/README" "$LINENO" 5
+ fi
+ PYTHONFRAMEWORK=${withval}
+ PYTHONFRAMEWORKDIR=${withval}.framework
+@@ -3040,7 +3060,7 @@ else
+ OPT="$OPT -O"
+ ;;
+ *)
+- as_fn_error "Unknown BeOS platform \"$BE_HOST_CPU\"" "$LINENO" 5
++ as_fn_error $? "Unknown BeOS platform \"$BE_HOST_CPU\"" "$LINENO" 5
+ ;;
+ esac
+ AR="\$(srcdir)/Modules/ar_beos"
+@@ -3059,7 +3079,7 @@ $as_echo "$without_gcc" >&6; }
+ # If the user switches compilers, we can't believe the cache
+ if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
+ then
+- as_fn_error "cached CC is different -- throw away $cache_file
++ as_fn_error $? "cached CC is different -- throw away $cache_file
+ (it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5
+ fi
+
+@@ -3073,7 +3093,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3113,7 +3133,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3166,7 +3186,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3206,7 +3226,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3265,7 +3285,7 @@ if test -z "$CC"; then
+ 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 test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3309,7 +3329,7 @@ do
+ 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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3363,8 +3383,8 @@ fi
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3478,9 +3498,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3522,8 +3541,8 @@ done
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3580,9 +3599,9 @@ $as_echo "$ac_try_echo"; } >&5
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+ fi
+@@ -3593,7 +3612,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3633,8 +3652,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3644,7 +3663,7 @@ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3681,7 +3700,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -3759,7 +3778,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+@@ -3894,7 +3913,7 @@ then
+ set dummy g++; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_CXX+set}" = set; then :
++if ${ac_cv_path_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $CXX in
+@@ -3935,7 +3954,7 @@ fi
+ 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 test "${ac_cv_path_CXX+set}" = set; then :
++if ${ac_cv_path_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $CXX in
+@@ -3986,7 +4005,7 @@ do
+ 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 test "${ac_cv_prog_CXX+set}" = set; then :
++if ${ac_cv_prog_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CXX"; then
+@@ -4057,7 +4076,7 @@ if test -n "$CPP" && test -d "$CPP"; the
+ CPP=
+ fi
+ if test -z "$CPP"; then
+- if test "${ac_cv_prog_CPP+set}" = set; then :
++ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # Double quotes because CPP needs to be expanded
+@@ -4087,7 +4106,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -4103,11 +4122,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -4146,7 +4165,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -4162,18 +4181,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+
+ ac_ext=c
+@@ -4185,7 +4204,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$GREP"; then
+@@ -4234,7 +4253,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_GREP=$GREP
+@@ -4248,7 +4267,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -4300,7 +4319,7 @@ esac
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -4315,7 +4334,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4432,8 +4451,7 @@ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -4445,7 +4463,7 @@ done
+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
++if test "x$ac_cv_header_minix_config_h" = xyes; then :
+ MINIX=yes
+ else
+ MINIX=
+@@ -4467,7 +4485,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h
-@@ -4191,7 +4194,7 @@ _ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+ $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
++if ${ac_cv_safe_to_define___extensions__+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4761,7 +4779,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
;;
OSF*)
LDLIBRARY='libpython$(VERSION).so'
@@ -43,316 +976,2308 @@ diff -up ./configure.autotool-intermediates ./configure
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
;;
atheos*)
-@@ -5450,7 +5453,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -4793,7 +4811,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_header_stdc=no
+ if test -n "$RANLIB"; then
+@@ -4833,7 +4851,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_RANLIB"; then
+@@ -4887,7 +4905,7 @@ do
+ 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 test "${ac_cv_prog_AR+set}" = set; then :
++if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$AR"; then
+@@ -4930,7 +4948,7 @@ test -n "$AR" || AR="ar"
+ set dummy svnversion; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_SVNVERSION+set}" = set; then :
++if ${ac_cv_prog_SVNVERSION+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$SVNVERSION"; then
+@@ -4981,16 +4999,22 @@ bsdos*|hp*|HP*)
+ esac
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+- for ac_t in install-sh install.sh shtool; do
+- if test -f "$ac_dir/$ac_t"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/$ac_t -c"
+- break 2
+- fi
+- done
++ if test -f "$ac_dir/install-sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install-sh -c"
++ break
++ elif test -f "$ac_dir/install.sh"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/install.sh -c"
++ break
++ elif test -f "$ac_dir/shtool"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/shtool install -c"
++ break
++ fi
+ done
+ if test -z "$ac_aux_dir"; then
+- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
--rm -f -r conftest*
-+rm -f conftest*
+ # These three variables are undocumented and unsupported,
+@@ -5019,7 +5043,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -5298,7 +5322,7 @@ $as_echo "$CC" >&6; }
+ LIPO_64BIT_FLAGS="-extract x86_64"
+
+ else
+- as_fn_error "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++ as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
+
+ fi
+
+@@ -5393,7 +5417,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -OPT:Olimit=0" >&5
+ $as_echo_n "checking whether $CC accepts -OPT:Olimit=0... " >&6; }
+-if test "${ac_cv_opt_olimit_ok+set}" = set; then :
++if ${ac_cv_opt_olimit_ok+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_cc="$CC"
+@@ -5433,7 +5457,7 @@ if test $ac_cv_opt_olimit_ok = yes; then
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Olimit 1500" >&5
+ $as_echo_n "checking whether $CC accepts -Olimit 1500... " >&6; }
+- if test "${ac_cv_olimit_ok+set}" = set; then :
++ if ${ac_cv_olimit_ok+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_cc="$CC"
+@@ -5506,7 +5530,7 @@ fi
+ # options before we can check whether -Kpthread improves anything.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads are available without options" >&5
+ $as_echo_n "checking whether pthreads are available without options... " >&6; }
+-if test "${ac_cv_pthread_is_default+set}" = set; then :
++if ${ac_cv_pthread_is_default+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -5559,7 +5583,7 @@ else
+ # function available.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kpthread" >&5
+ $as_echo_n "checking whether $CC accepts -Kpthread... " >&6; }
+-if test "${ac_cv_kpthread+set}" = set; then :
++if ${ac_cv_kpthread+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_cc="$CC"
+@@ -5608,7 +5632,7 @@ then
+ # function available.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kthread" >&5
+ $as_echo_n "checking whether $CC accepts -Kthread... " >&6; }
+-if test "${ac_cv_kthread+set}" = set; then :
++if ${ac_cv_kthread+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_cc="$CC"
+@@ -5657,7 +5681,7 @@ then
+ # function available.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5
+ $as_echo_n "checking whether $CC accepts -pthread... " >&6; }
+-if test "${ac_cv_thread+set}" = set; then :
++if ${ac_cv_thread+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_cc="$CC"
+@@ -5742,7 +5766,7 @@ CXX="$ac_save_cxx"
+ # checks for header files
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5867,8 +5891,7 @@ bluetooth/bluetooth.h linux/tipc.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5882,7 +5905,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+ $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$as_ac_Header+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5909,8 +5932,7 @@ fi
+ eval ac_res=\$$as_ac_Header
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_Header
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5923,7 +5945,7 @@ done
+ if test $ac_header_dirent = dirent.h; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+ $as_echo_n "checking for library containing opendir... " >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+@@ -5957,11 +5979,11 @@ for ac_lib in '' dir; do
fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+- if test "${ac_cv_search_opendir+set}" = set; then :
++ if ${ac_cv_search_opendir+:} false; then :
+ break
+ fi
+ done
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
-@@ -5471,7 +5474,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
else
- ac_cv_header_stdc=no
+ ac_cv_search_opendir=no
+@@ -5980,7 +6002,7 @@ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+ $as_echo_n "checking for library containing opendir... " >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+@@ -6014,11 +6036,11 @@ for ac_lib in '' x; do
fi
--rm -f -r conftest*
-+rm -f conftest*
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+- if test "${ac_cv_search_opendir+set}" = set; then :
++ if ${ac_cv_search_opendir+:} false; then :
+ break
+ fi
+ done
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
+
+ else
+ ac_cv_search_opendir=no
+@@ -6038,7 +6060,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
+ $as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
+-if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then :
++if ${ac_cv_header_sys_types_h_makedev+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6066,7 +6088,7 @@ $as_echo "$ac_cv_header_sys_types_h_make
+
+ if test $ac_cv_header_sys_types_h_makedev = no; then
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then :
++if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
+
+ $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
+
+@@ -6076,7 +6098,7 @@ fi
+
+ if test $ac_cv_header_sys_mkdev_h = no; then
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
++if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
+
+ $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
+
+@@ -6096,7 +6118,7 @@ do :
+ #endif
+
+ "
+-if test "x$ac_cv_header_term_h" = x""yes; then :
++if test "x$ac_cv_header_term_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_TERM_H 1
+ _ACEOF
+@@ -6118,7 +6140,7 @@ do :
+ #endif
+
+ "
+-if test "x$ac_cv_header_linux_netlink_h" = x""yes; then :
++if test "x$ac_cv_header_linux_netlink_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LINUX_NETLINK_H 1
+ _ACEOF
+@@ -6274,7 +6296,7 @@ EOF
+ # Type availability checks
+ ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+-if test "x$ac_cv_type_mode_t" = x""yes; then :
++if test "x$ac_cv_type_mode_t" = xyes; then :
+
+ else
+
+@@ -6285,7 +6307,7 @@ _ACEOF
fi
-@@ -6569,7 +6572,7 @@ _ACEOF
+ ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+-if test "x$ac_cv_type_off_t" = x""yes; then :
++if test "x$ac_cv_type_off_t" = xyes; then :
+ else
+@@ -6296,7 +6318,7 @@ _ACEOF
fi
--rm -f -r conftest*
-+rm -f conftest*
- { echo "$as_me:$LINENO: result: $was_it_defined" >&5
- echo "${ECHO_T}$was_it_defined" >&6; }
-@@ -7099,7 +7102,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+ ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+-if test "x$ac_cv_type_pid_t" = x""yes; then :
++if test "x$ac_cv_type_pid_t" = xyes; then :
+
+ else
+
+@@ -6308,7 +6330,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+ $as_echo_n "checking return type of signal handlers... " >&6; }
+-if test "${ac_cv_type_signal+set}" = set; then :
++if ${ac_cv_type_signal+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6340,7 +6362,7 @@ _ACEOF
+
+
+ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+-if test "x$ac_cv_type_size_t" = x""yes; then :
++if test "x$ac_cv_type_size_t" = xyes; then :
+
+ else
+
+@@ -6352,7 +6374,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+ $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+-if test "${ac_cv_type_uid_t+set}" = set; then :
++if ${ac_cv_type_uid_t+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_type_uid_t=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6381,7 +6403,7 @@ $as_echo "#define gid_t int" >>confdefs.
fi
--rm -f -r conftest*
-+rm -f conftest*
+ ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+-if test "x$ac_cv_type_ssize_t" = x""yes; then :
++if test "x$ac_cv_type_ssize_t" = xyes; then :
+
+ $as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h
+
+@@ -6396,7 +6418,7 @@ fi
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+ $as_echo_n "checking size of int... " >&6; }
+-if test "${ac_cv_sizeof_int+set}" = set; then :
++if ${ac_cv_sizeof_int+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
+@@ -6405,9 +6427,8 @@ else
+ if test "$ac_cv_type_int" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (int)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (int)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_int=0
+ fi
+@@ -6430,7 +6451,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+ $as_echo_n "checking size of long... " >&6; }
+-if test "${ac_cv_sizeof_long+set}" = set; then :
++if ${ac_cv_sizeof_long+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+@@ -6439,9 +6460,8 @@ else
+ if test "$ac_cv_type_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (long)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (long)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_long=0
+ fi
+@@ -6464,7 +6484,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+ $as_echo_n "checking size of void *... " >&6; }
+-if test "${ac_cv_sizeof_void_p+set}" = set; then :
++if ${ac_cv_sizeof_void_p+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
+@@ -6473,9 +6493,8 @@ else
+ if test "$ac_cv_type_void_p" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (void *)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (void *)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_void_p=0
+ fi
+@@ -6498,7 +6517,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+ $as_echo_n "checking size of short... " >&6; }
+-if test "${ac_cv_sizeof_short+set}" = set; then :
++if ${ac_cv_sizeof_short+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
+@@ -6507,9 +6526,8 @@ else
+ if test "$ac_cv_type_short" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (short)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (short)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_short=0
+ fi
+@@ -6532,7 +6550,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
+ $as_echo_n "checking size of float... " >&6; }
+-if test "${ac_cv_sizeof_float+set}" = set; then :
++if ${ac_cv_sizeof_float+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then :
+@@ -6541,9 +6559,8 @@ else
+ if test "$ac_cv_type_float" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (float)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (float)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_float=0
+ fi
+@@ -6566,7 +6583,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
+ $as_echo_n "checking size of double... " >&6; }
+-if test "${ac_cv_sizeof_double+set}" = set; then :
++if ${ac_cv_sizeof_double+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then :
+@@ -6575,9 +6592,8 @@ else
+ if test "$ac_cv_type_double" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (double)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (double)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_double=0
+ fi
+@@ -6600,7 +6616,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of fpos_t" >&5
+ $as_echo_n "checking size of fpos_t... " >&6; }
+-if test "${ac_cv_sizeof_fpos_t+set}" = set; then :
++if ${ac_cv_sizeof_fpos_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fpos_t))" "ac_cv_sizeof_fpos_t" "$ac_includes_default"; then :
+@@ -6609,9 +6625,8 @@ else
+ if test "$ac_cv_type_fpos_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (fpos_t)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (fpos_t)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_fpos_t=0
+ fi
+@@ -6634,7 +6649,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+ $as_echo_n "checking size of size_t... " >&6; }
+-if test "${ac_cv_sizeof_size_t+set}" = set; then :
++if ${ac_cv_sizeof_size_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
+@@ -6643,9 +6658,8 @@ else
+ if test "$ac_cv_type_size_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (size_t)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (size_t)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_size_t=0
+ fi
+@@ -6668,7 +6682,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5
+ $as_echo_n "checking size of pid_t... " >&6; }
+-if test "${ac_cv_sizeof_pid_t+set}" = set; then :
++if ${ac_cv_sizeof_pid_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then :
+@@ -6677,9 +6691,8 @@ else
+ if test "$ac_cv_type_pid_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (pid_t)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (pid_t)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_pid_t=0
+ fi
+@@ -6729,7 +6742,7 @@ if test "$have_long_long" = yes ; then
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+ $as_echo_n "checking size of long long... " >&6; }
+-if test "${ac_cv_sizeof_long_long+set}" = set; then :
++if ${ac_cv_sizeof_long_long+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
+@@ -6738,9 +6751,8 @@ else
+ if test "$ac_cv_type_long_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (long long)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (long long)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_long_long=0
+ fi
+@@ -6791,7 +6803,7 @@ if test "$have_long_double" = yes ; then
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5
+ $as_echo_n "checking size of long double... " >&6; }
+-if test "${ac_cv_sizeof_long_double+set}" = set; then :
++if ${ac_cv_sizeof_long_double+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then :
+@@ -6800,9 +6812,8 @@ else
+ if test "$ac_cv_type_long_double" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (long double)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (long double)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_long_double=0
+ fi
+@@ -6853,7 +6864,7 @@ if test "$have_c99_bool" = yes ; then
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5
+ $as_echo_n "checking size of _Bool... " >&6; }
+-if test "${ac_cv_sizeof__Bool+set}" = set; then :
++if ${ac_cv_sizeof__Bool+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool" "$ac_includes_default"; then :
+@@ -6862,9 +6873,8 @@ else
+ if test "$ac_cv_type__Bool" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (_Bool)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (_Bool)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof__Bool=0
+ fi
+@@ -6887,7 +6897,7 @@ ac_fn_c_check_type "$LINENO" "uintptr_t"
+ #include <stdint.h>
+ #endif
+ "
+-if test "x$ac_cv_type_uintptr_t" = x""yes; then :
++if test "x$ac_cv_type_uintptr_t" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_UINTPTR_T 1
+@@ -6899,7 +6909,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5
+ $as_echo_n "checking size of uintptr_t... " >&6; }
+-if test "${ac_cv_sizeof_uintptr_t+set}" = set; then :
++if ${ac_cv_sizeof_uintptr_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t" "$ac_includes_default"; then :
+@@ -6908,9 +6918,8 @@ else
+ if test "$ac_cv_type_uintptr_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (uintptr_t)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (uintptr_t)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_uintptr_t=0
+ fi
+@@ -6934,7 +6943,7 @@ fi
+ # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+ $as_echo_n "checking size of off_t... " >&6; }
+-if test "${ac_cv_sizeof_off_t+set}" = set; then :
++if ${ac_cv_sizeof_off_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -6995,7 +7004,7 @@ fi
+ # AC_CHECK_SIZEOF() doesn't include <time.h>.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
+ $as_echo_n "checking size of time_t... " >&6; }
+-if test "${ac_cv_sizeof_time_t+set}" = set; then :
++if ${ac_cv_sizeof_time_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -7067,7 +7076,7 @@ if test "$have_pthread_t" = yes ; then
+ # AC_CHECK_SIZEOF() doesn't include <pthread.h>.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_t" >&5
+ $as_echo_n "checking size of pthread_t... " >&6; }
+- if test "${ac_cv_sizeof_pthread_t+set}" = set; then :
++ if ${ac_cv_sizeof_pthread_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -7208,7 +7217,7 @@ fi
+ MACOSX_DEFAULT_ARCH="ppc"
+ ;;
+ *)
+- as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 5
++ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
+ ;;
+ esac
+ else
+@@ -7220,7 +7229,7 @@ fi
+ MACOSX_DEFAULT_ARCH="ppc64"
+ ;;
+ *)
+- as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 5
++ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
+ ;;
+ esac
+
+@@ -7246,7 +7255,7 @@ $as_echo "#define WITH_NEXT_FRAMEWORK 1"
+ $as_echo "yes" >&6; }
+ if test $enable_shared = "yes"
+ then
+- as_fn_error "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead. See Mac/README." "$LINENO" 5
++ as_fn_error $? "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead. See Mac/README." "$LINENO" 5
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -7566,7 +7575,7 @@ $as_echo "$SHLIBS" >&6; }
+ # checks for libraries
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -7600,7 +7609,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBDL 1
+ _ACEOF
+@@ -7611,7 +7620,7 @@ fi
+ # Dynamic linking for SunOS/Solaris and SYSV
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++if ${ac_cv_lib_dld_shl_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -7645,7 +7654,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBDLD 1
+ _ACEOF
+@@ -7659,7 +7668,7 @@ fi
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
+ $as_echo_n "checking for library containing sem_init... " >&6; }
+-if test "${ac_cv_search_sem_init+set}" = set; then :
++if ${ac_cv_search_sem_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
+@@ -7693,11 +7702,11 @@ for ac_lib in '' pthread rt posix4; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+- if test "${ac_cv_search_sem_init+set}" = set; then :
++ if ${ac_cv_search_sem_init+:} false; then :
+ break
+ fi
+ done
+-if test "${ac_cv_search_sem_init+set}" = set; then :
++if ${ac_cv_search_sem_init+:} false; then :
+
+ else
+ ac_cv_search_sem_init=no
+@@ -7720,7 +7729,7 @@ fi
+ # check if we need libintl for locale functions
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for textdomain in -lintl" >&5
+ $as_echo_n "checking for textdomain in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_textdomain+set}" = set; then :
++if ${ac_cv_lib_intl_textdomain+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -7754,7 +7763,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_textdomain" >&5
+ $as_echo "$ac_cv_lib_intl_textdomain" >&6; }
+-if test "x$ac_cv_lib_intl_textdomain" = x""yes; then :
++if test "x$ac_cv_lib_intl_textdomain" = xyes; then :
+
+ $as_echo "#define WITH_LIBINTL 1" >>confdefs.h
+
+@@ -7795,7 +7804,7 @@ esac
+ # BeOS' sockets are stashed in libnet.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5
+ $as_echo_n "checking for t_open in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_t_open+set}" = set; then :
++if ${ac_cv_lib_nsl_t_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -7829,13 +7838,13 @@ LIBS=$ac_check_lib_save_LIBS
fi
- { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-@@ -14045,6 +14048,19 @@ echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_t_open" >&5
+ $as_echo "$ac_cv_lib_nsl_t_open" >&6; }
+-if test "x$ac_cv_lib_nsl_t_open" = x""yes; then :
++if test "x$ac_cv_lib_nsl_t_open" = xyes; then :
+ LIBS="-lnsl $LIBS"
+ fi
+ # SVR4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+ $as_echo_n "checking for socket in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_socket+set}" = set; then :
++if ${ac_cv_lib_socket_socket+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -7869,7 +7878,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+ $as_echo "$ac_cv_lib_socket_socket" >&6; }
+-if test "x$ac_cv_lib_socket_socket" = x""yes; then :
++if test "x$ac_cv_lib_socket_socket" = xyes; then :
+ LIBS="-lsocket $LIBS"
+ fi
+ # SVR4 sockets
+@@ -7878,7 +7887,7 @@ case "$ac_sys_system" in
+ BeOS*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnet" >&5
+ $as_echo_n "checking for socket in -lnet... " >&6; }
+-if test "${ac_cv_lib_net_socket+set}" = set; then :
++if ${ac_cv_lib_net_socket+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -7912,7 +7921,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_net_socket" >&5
+ $as_echo "$ac_cv_lib_net_socket" >&6; }
+-if test "x$ac_cv_lib_net_socket" = x""yes; then :
++if test "x$ac_cv_lib_net_socket" = xyes; then :
+ LIBS="-lnet $LIBS"
+ fi
+ # BeOS
+@@ -7935,6 +7944,19 @@ $as_echo "no" >&6; }
fi
+# Check for use of the system expat library
-+{ echo "$as_me:$LINENO: checking for --with-system-expat" >&5
-+echo $ECHO_N "checking for --with-system-expat... $ECHO_C" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-expat" >&5
++$as_echo_n "checking for --with-system-expat... " >&6; }
+
+# Check whether --with-system_expat was given.
-+if test "${with_system_expat+set}" = set; then
++if test "${with_system_expat+set}" = set; then :
+ withval=$with_system_expat;
+fi
+
+
-+{ echo "$as_me:$LINENO: result: $with_system_expat" >&5
-+echo "${ECHO_T}$with_system_expat" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_expat" >&5
++$as_echo "$with_system_expat" >&6; }
+
# Check for use of the system libffi library
- { echo "$as_me:$LINENO: checking for --with-system-ffi" >&5
- echo $ECHO_N "checking for --with-system-ffi... $ECHO_C" >&6; }
-@@ -14224,7 +14240,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-ffi" >&5
+ $as_echo_n "checking for --with-system-ffi... " >&6; }
+@@ -8105,7 +8127,7 @@ $as_echo "$unistd_defines_pthreads" >&6;
+ $as_echo "#define _REENTRANT 1" >>confdefs.h
+
+ ac_fn_c_check_header_mongrel "$LINENO" "cthreads.h" "ac_cv_header_cthreads_h" "$ac_includes_default"
+-if test "x$ac_cv_header_cthreads_h" = x""yes; then :
++if test "x$ac_cv_header_cthreads_h" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
+
+ $as_echo "#define C_THREADS 1" >>confdefs.h
+@@ -8118,7 +8140,7 @@ $as_echo "#define HURD_C_THREADS 1" >>co
else
- unistd_defines_pthreads=no
- fi
--rm -f -r conftest*
-+rm -f conftest*
- { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
- echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
-@@ -15838,7 +15854,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- $EGREP "yes" >/dev/null 2>&1; then
- ipv6type=$i
+ ac_fn_c_check_header_mongrel "$LINENO" "mach/cthreads.h" "ac_cv_header_mach_cthreads_h" "$ac_includes_default"
+-if test "x$ac_cv_header_mach_cthreads_h" = x""yes; then :
++if test "x$ac_cv_header_mach_cthreads_h" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
+
+ $as_echo "#define C_THREADS 1" >>confdefs.h
+@@ -8180,7 +8202,7 @@ else
+
+ LIBS=$_libs
+ ac_fn_c_check_func "$LINENO" "pthread_detach" "ac_cv_func_pthread_detach"
+-if test "x$ac_cv_func_pthread_detach" = x""yes; then :
++if test "x$ac_cv_func_pthread_detach" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
+
+ posix_threads=yes
+@@ -8188,7 +8210,7 @@ if test "x$ac_cv_func_pthread_detach" =
+ else
+
+ ac_fn_c_check_header_mongrel "$LINENO" "atheos/threads.h" "ac_cv_header_atheos_threads_h" "$ac_includes_default"
+-if test "x$ac_cv_header_atheos_threads_h" = x""yes; then :
++if test "x$ac_cv_header_atheos_threads_h" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
+
+
+@@ -8198,7 +8220,7 @@ $as_echo "#define ATHEOS_THREADS 1" >>co
+ else
+
+ ac_fn_c_check_header_mongrel "$LINENO" "kernel/OS.h" "ac_cv_header_kernel_OS_h" "$ac_includes_default"
+-if test "x$ac_cv_header_kernel_OS_h" = x""yes; then :
++if test "x$ac_cv_header_kernel_OS_h" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
+
+
+@@ -8209,7 +8231,7 @@ else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
+ $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
+-if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then :
++if ${ac_cv_lib_pthreads_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -8243,7 +8265,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
--rm -f -r conftest*
-+rm -f conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5
+ $as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; }
+-if test "x$ac_cv_lib_pthreads_pthread_create" = x""yes; then :
++if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
- ;;
- kame)
-@@ -15861,7 +15877,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- ipv6libdir=/usr/local/v6/lib
- ipv6trylibc=yes
+ posix_threads=yes
+@@ -8253,7 +8275,7 @@ else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
+ $as_echo_n "checking for pthread_create in -lc_r... " >&6; }
+-if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then :
++if ${ac_cv_lib_c_r_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -8287,7 +8309,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
--rm -f -r conftest*
-+rm -f conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5
+ $as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
+-if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then :
++if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
- ;;
- linux-glibc)
-@@ -15882,7 +15898,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- ipv6type=$i;
- ipv6trylibc=yes
+ posix_threads=yes
+@@ -8297,7 +8319,7 @@ else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_create_system in -lpthread" >&5
+ $as_echo_n "checking for __pthread_create_system in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread___pthread_create_system+set}" = set; then :
++if ${ac_cv_lib_pthread___pthread_create_system+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -8331,7 +8353,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
--rm -f -r conftest*
-+rm -f conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_create_system" >&5
+ $as_echo "$ac_cv_lib_pthread___pthread_create_system" >&6; }
+-if test "x$ac_cv_lib_pthread___pthread_create_system" = x""yes; then :
++if test "x$ac_cv_lib_pthread___pthread_create_system" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
- ;;
- linux-inet6)
-@@ -15920,7 +15936,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- ipv6lib=inet6;
- ipv6libdir=/usr/local/v6/lib
+ posix_threads=yes
+@@ -8341,7 +8363,7 @@ else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lcma" >&5
+ $as_echo_n "checking for pthread_create in -lcma... " >&6; }
+-if test "${ac_cv_lib_cma_pthread_create+set}" = set; then :
++if ${ac_cv_lib_cma_pthread_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -8375,7 +8397,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
--rm -f -r conftest*
-+rm -f conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5
+ $as_echo "$ac_cv_lib_cma_pthread_create" >&6; }
+-if test "x$ac_cv_lib_cma_pthread_create" = x""yes; then :
++if test "x$ac_cv_lib_cma_pthread_create" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
- ;;
- v6d)
-@@ -15943,7 +15959,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- ipv6libdir=/usr/local/v6/lib;
- BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
+ posix_threads=yes
+@@ -8415,7 +8437,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5
+ $as_echo_n "checking for usconfig in -lmpc... " >&6; }
+-if test "${ac_cv_lib_mpc_usconfig+set}" = set; then :
++if ${ac_cv_lib_mpc_usconfig+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -8449,7 +8471,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
--rm -f -r conftest*
-+rm -f conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpc_usconfig" >&5
+ $as_echo "$ac_cv_lib_mpc_usconfig" >&6; }
+-if test "x$ac_cv_lib_mpc_usconfig" = x""yes; then :
++if test "x$ac_cv_lib_mpc_usconfig" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
- ;;
- zeta)
-@@ -15965,7 +15981,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
- ipv6lib=inet6;
- ipv6libdir=/usr/local/v6/lib
+ LIBS="$LIBS -lmpc"
+@@ -8461,7 +8483,7 @@ fi
+ if test "$posix_threads" != "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thr_create in -lthread" >&5
+ $as_echo_n "checking for thr_create in -lthread... " >&6; }
+-if test "${ac_cv_lib_thread_thr_create+set}" = set; then :
++if ${ac_cv_lib_thread_thr_create+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -8495,7 +8517,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
--rm -f -r conftest*
-+rm -f conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thread_thr_create" >&5
+ $as_echo "$ac_cv_lib_thread_thr_create" >&6; }
+-if test "x$ac_cv_lib_thread_thr_create" = x""yes; then :
++if test "x$ac_cv_lib_thread_thr_create" = xyes; then :
+ $as_echo "#define WITH_THREAD 1" >>confdefs.h
- ;;
- esac
-@@ -16118,6 +16134,166 @@ fi
- { echo "$as_me:$LINENO: result: $with_pymalloc" >&5
- echo "${ECHO_T}$with_pymalloc" >&6; }
+ LIBS="$LIBS -lthread"
+@@ -8540,7 +8562,7 @@ $as_echo "#define HAVE_BROKEN_POSIX_SEMA
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
+ $as_echo_n "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; }
+- if test "${ac_cv_pthread_system_supported+set}" = set; then :
++ if ${ac_cv_pthread_system_supported+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -8583,7 +8605,7 @@ $as_echo "#define PTHREAD_SYSTEM_SCHED_S
+ for ac_func in pthread_sigmask
+ do :
+ ac_fn_c_check_func "$LINENO" "pthread_sigmask" "ac_cv_func_pthread_sigmask"
+-if test "x$ac_cv_func_pthread_sigmask" = x""yes; then :
++if test "x$ac_cv_func_pthread_sigmask" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_PTHREAD_SIGMASK 1
+ _ACEOF
+@@ -8942,6 +8964,33 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5
+ $as_echo "$with_pymalloc" >&6; }
+# Check for Valgrind support
-+{ echo "$as_me:$LINENO: checking for --with-valgrind" >&5
-+echo $ECHO_N "checking for --with-valgrind... $ECHO_C" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5
++$as_echo_n "checking for --with-valgrind... " >&6; }
+
+# Check whether --with-valgrind was given.
-+if test "${with_valgrind+set}" = set; then
++if test "${with_valgrind+set}" = set; then :
+ withval=$with_valgrind;
+else
+ with_valgrind=no
+fi
+
-+{ echo "$as_me:$LINENO: result: $with_valgrind" >&5
-+echo "${ECHO_T}$with_valgrind" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5
++$as_echo "$with_valgrind" >&6; }
+if test "$with_valgrind" != no; then
-+ if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
-+ { echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5
-+echo $ECHO_N "checking for valgrind/valgrind.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_valgrind_valgrind_h" >&5
-+echo "${ECHO_T}$ac_cv_header_valgrind_valgrind_h" >&6; }
-+else
-+ # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking valgrind/valgrind.h usability" >&5
-+echo $ECHO_N "checking valgrind/valgrind.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <valgrind/valgrind.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default"
++if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then :
+
-+ ac_header_compiler=no
-+fi
++$as_echo "#define WITH_VALGRIND 1" >>confdefs.h
+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking valgrind/valgrind.h presence" >&5
-+echo $ECHO_N "checking valgrind/valgrind.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <valgrind/valgrind.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-+ ac_header_preproc=yes
+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
++ as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5
+
-+ ac_header_preproc=no
+fi
+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: valgrind/valgrind.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: valgrind/valgrind.h: in the future, the compiler will take precedence" >&2;}
-+ ( cat <<\_ASBOX
-+## ------------------------------------------------ ##
-+## Report this to http://www.python.org/python-bugs ##
-+## ------------------------------------------------ ##
-+_ASBOX
-+ ) | sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for valgrind/valgrind.h" >&5
-+echo $ECHO_N "checking for valgrind/valgrind.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_valgrind_valgrind_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_valgrind_valgrind_h=$ac_header_preproc
+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_valgrind_valgrind_h" >&5
-+echo "${ECHO_T}$ac_cv_header_valgrind_valgrind_h" >&6; }
++
+ # Check for --with-wctype-functions
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wctype-functions" >&5
+ $as_echo_n "checking for --with-wctype-functions... " >&6; }
+@@ -8974,7 +9023,7 @@ DLINCLDIR=.
+ for ac_func in dlopen
+ do :
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+-if test "x$ac_cv_func_dlopen" = x""yes; then :
++if test "x$ac_cv_func_dlopen" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DLOPEN 1
+ _ACEOF
+@@ -9051,8 +9100,7 @@ for ac_func in alarm setitimer getitimer
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -9365,7 +9413,7 @@ do
+ 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 test "${ac_cv_prog_TRUE+set}" = set; then :
++if ${ac_cv_prog_TRUE+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$TRUE"; then
+@@ -9405,7 +9453,7 @@ test -n "$TRUE" || TRUE="/bin/true"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lc" >&5
+ $as_echo_n "checking for inet_aton in -lc... " >&6; }
+-if test "${ac_cv_lib_c_inet_aton+set}" = set; then :
++if ${ac_cv_lib_c_inet_aton+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9439,12 +9487,12 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inet_aton" >&5
+ $as_echo "$ac_cv_lib_c_inet_aton" >&6; }
+-if test "x$ac_cv_lib_c_inet_aton" = x""yes; then :
++if test "x$ac_cv_lib_c_inet_aton" = xyes; then :
+ $ac_cv_prog_TRUE
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
+ $as_echo_n "checking for inet_aton in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then :
++if ${ac_cv_lib_resolv_inet_aton+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9478,7 +9526,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
+ $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
+-if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then :
++if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBRESOLV 1
+ _ACEOF
+@@ -9495,7 +9543,7 @@ fi
+ # exit Python
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5
+ $as_echo_n "checking for chflags... " >&6; }
+-if test "${ac_cv_have_chflags+set}" = set; then :
++if ${ac_cv_have_chflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -9529,7 +9577,7 @@ fi
+ $as_echo "$ac_cv_have_chflags" >&6; }
+ if test "$ac_cv_have_chflags" = cross ; then
+ ac_fn_c_check_func "$LINENO" "chflags" "ac_cv_func_chflags"
+-if test "x$ac_cv_func_chflags" = x""yes; then :
++if test "x$ac_cv_func_chflags" = xyes; then :
+ ac_cv_have_chflags="yes"
+ else
+ ac_cv_have_chflags="no"
+@@ -9544,7 +9592,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5
+ $as_echo_n "checking for lchflags... " >&6; }
+-if test "${ac_cv_have_lchflags+set}" = set; then :
++if ${ac_cv_have_lchflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -9578,7 +9626,7 @@ fi
+ $as_echo "$ac_cv_have_lchflags" >&6; }
+ if test "$ac_cv_have_lchflags" = cross ; then
+ ac_fn_c_check_func "$LINENO" "lchflags" "ac_cv_func_lchflags"
+-if test "x$ac_cv_func_lchflags" = x""yes; then :
++if test "x$ac_cv_func_lchflags" = xyes; then :
+ ac_cv_have_lchflags="yes"
+ else
+ ac_cv_have_lchflags="no"
+@@ -9602,7 +9650,7 @@ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
+ $as_echo_n "checking for inflateCopy in -lz... " >&6; }
+-if test "${ac_cv_lib_z_inflateCopy+set}" = set; then :
++if ${ac_cv_lib_z_inflateCopy+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9636,7 +9684,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5
+ $as_echo "$ac_cv_lib_z_inflateCopy" >&6; }
+-if test "x$ac_cv_lib_z_inflateCopy" = x""yes; then :
++if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
+
+ $as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h
+
+@@ -9783,7 +9831,7 @@ rm -f core conftest.err conftest.$ac_obj
+ for ac_func in openpty
+ do :
+ ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
+-if test "x$ac_cv_func_openpty" = x""yes; then :
++if test "x$ac_cv_func_openpty" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_OPENPTY 1
+ _ACEOF
+@@ -9791,7 +9839,7 @@ _ACEOF
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+ $as_echo_n "checking for openpty in -lutil... " >&6; }
+-if test "${ac_cv_lib_util_openpty+set}" = set; then :
++if ${ac_cv_lib_util_openpty+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9825,13 +9873,13 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+ $as_echo "$ac_cv_lib_util_openpty" >&6; }
+-if test "x$ac_cv_lib_util_openpty" = x""yes; then :
++if test "x$ac_cv_lib_util_openpty" = xyes; then :
+ $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
+ LIBS="$LIBS -lutil"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
+ $as_echo_n "checking for openpty in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_openpty+set}" = set; then :
++if ${ac_cv_lib_bsd_openpty+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9865,7 +9913,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
+ $as_echo "$ac_cv_lib_bsd_openpty" >&6; }
+-if test "x$ac_cv_lib_bsd_openpty" = x""yes; then :
++if test "x$ac_cv_lib_bsd_openpty" = xyes; then :
+ $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
+ LIBS="$LIBS -lbsd"
+ fi
+@@ -9880,7 +9928,7 @@ done
+ for ac_func in forkpty
+ do :
+ ac_fn_c_check_func "$LINENO" "forkpty" "ac_cv_func_forkpty"
+-if test "x$ac_cv_func_forkpty" = x""yes; then :
++if test "x$ac_cv_func_forkpty" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_FORKPTY 1
+ _ACEOF
+@@ -9888,7 +9936,7 @@ _ACEOF
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5
+ $as_echo_n "checking for forkpty in -lutil... " >&6; }
+-if test "${ac_cv_lib_util_forkpty+set}" = set; then :
++if ${ac_cv_lib_util_forkpty+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9922,13 +9970,13 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5
+ $as_echo "$ac_cv_lib_util_forkpty" >&6; }
+-if test "x$ac_cv_lib_util_forkpty" = x""yes; then :
++if test "x$ac_cv_lib_util_forkpty" = xyes; then :
+ $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
+ LIBS="$LIBS -lutil"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lbsd" >&5
+ $as_echo_n "checking for forkpty in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_forkpty+set}" = set; then :
++if ${ac_cv_lib_bsd_forkpty+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -9962,7 +10010,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_forkpty" >&5
+ $as_echo "$ac_cv_lib_bsd_forkpty" >&6; }
+-if test "x$ac_cv_lib_bsd_forkpty" = x""yes; then :
++if test "x$ac_cv_lib_bsd_forkpty" = xyes; then :
+ $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
+ LIBS="$LIBS -lbsd"
+ fi
+@@ -9979,7 +10027,7 @@ done
+ for ac_func in memmove
+ do :
+ ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
+-if test "x$ac_cv_func_memmove" = x""yes; then :
++if test "x$ac_cv_func_memmove" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_MEMMOVE 1
+ _ACEOF
+@@ -9993,8 +10041,7 @@ for ac_func in fseek64 fseeko fstatvfs f
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -10003,31 +10050,50 @@ fi
+ done
+
+
+-for ac_func in dup2 getcwd strdup
+-do :
+- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
++ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
++if test "x$ac_cv_func_dup2" = xyes; then :
++ $as_echo "#define HAVE_DUP2 1" >>confdefs.h
+
+ else
+ case " $LIBOBJS " in
+- *" $ac_func.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++ *" dup2.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS dup2.$ac_objext"
++ ;;
++esac
+
+fi
-+if test $ac_cv_header_valgrind_valgrind_h = yes; then
+
-+cat >>confdefs.h <<\_ACEOF
-+#define WITH_VALGRIND 1
-+_ACEOF
++ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
++if test "x$ac_cv_func_getcwd" = xyes; then :
++ $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
+
+else
-+ { { echo "$as_me:$LINENO: error: Valgrind support requested but headers not available" >&5
-+echo "$as_me: error: Valgrind support requested but headers not available" >&2;}
-+ { (exit 1); exit 1; }; }
++ case " $LIBOBJS " in
++ *" getcwd.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS getcwd.$ac_objext"
++ ;;
++esac
+
+fi
+
++ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
++if test "x$ac_cv_func_strdup" = xyes; then :
++ $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
+
-+fi
-+
- # Check for --with-wctype-functions
- { echo "$as_me:$LINENO: checking for --with-wctype-functions" >&5
- echo $ECHO_N "checking for --with-wctype-functions... $ECHO_C" >&6; }
-@@ -23743,7 +23919,7 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
++else
++ case " $LIBOBJS " in
++ *" strdup.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
+ ;;
+ esac
fi
--rm -f -r conftest*
-+rm -f conftest*
+-done
+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -23762,7 +23938,7 @@ cat >>confdefs.h <<\_ACEOF
+ for ac_func in getpgrp
+ do :
+ ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
+-if test "x$ac_cv_func_getpgrp" = x""yes; then :
++if test "x$ac_cv_func_getpgrp" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETPGRP 1
+ _ACEOF
+@@ -10056,7 +10122,7 @@ done
+ for ac_func in setpgrp
+ do :
+ ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp"
+-if test "x$ac_cv_func_setpgrp" = x""yes; then :
++if test "x$ac_cv_func_setpgrp" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SETPGRP 1
+ _ACEOF
+@@ -10085,7 +10151,7 @@ done
+ for ac_func in gettimeofday
+ do :
+ ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
+-if test "x$ac_cv_func_gettimeofday" = x""yes; then :
++if test "x$ac_cv_func_gettimeofday" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETTIMEOFDAY 1
_ACEOF
+@@ -10314,7 +10380,7 @@ fi
+ for ac_func in getnameinfo
+ do :
+ ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
+-if test "x$ac_cv_func_getnameinfo" = x""yes; then :
++if test "x$ac_cv_func_getnameinfo" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETNAMEINFO 1
+ _ACEOF
+@@ -10326,7 +10392,7 @@ done
+ # checks for structures
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+-if test "${ac_cv_header_time+set}" = set; then :
++if ${ac_cv_header_time+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10361,7 +10427,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+ $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+-if test "${ac_cv_struct_tm+set}" = set; then :
++if ${ac_cv_struct_tm+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10398,7 +10464,7 @@ ac_fn_c_check_member "$LINENO" "struct t
+ #include <$ac_cv_struct_tm>
+
+ "
+-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
++if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_TM_TM_ZONE 1
+@@ -10414,7 +10480,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf
+ else
+ ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+ "
+-if test "x$ac_cv_have_decl_tzname" = x""yes; then :
++if test "x$ac_cv_have_decl_tzname" = xyes; then :
+ ac_have_decl=1
+ else
+ ac_have_decl=0
+@@ -10426,7 +10492,7 @@ _ACEOF
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+ $as_echo_n "checking for tzname... " >&6; }
+-if test "${ac_cv_var_tzname+set}" = set; then :
++if ${ac_cv_var_tzname+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10462,7 +10528,7 @@ $as_echo "#define HAVE_TZNAME 1" >>confd
+ fi
+
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_RDEV 1
+@@ -10472,7 +10538,7 @@ _ACEOF
+ fi
+
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+@@ -10482,7 +10548,7 @@ _ACEOF
+ fi
+
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_flags" "ac_cv_member_struct_stat_st_flags" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_flags" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_flags" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_FLAGS 1
+@@ -10492,7 +10558,7 @@ _ACEOF
+ fi
+
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_gen" "ac_cv_member_struct_stat_st_gen" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_gen" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_gen" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_GEN 1
+@@ -10502,7 +10568,7 @@ _ACEOF
+ fi
+
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+@@ -10512,7 +10578,7 @@ _ACEOF
fi
--rm -f -r conftest*
-+rm -f conftest*
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BLOCKS 1
+@@ -10534,7 +10600,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
+ $as_echo_n "checking for time.h that defines altzone... " >&6; }
+-if test "${ac_cv_header_time_altzone+set}" = set; then :
++if ${ac_cv_header_time_altzone+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10596,7 +10662,7 @@ $as_echo "$was_it_defined" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for addrinfo" >&5
+ $as_echo_n "checking for addrinfo... " >&6; }
+-if test "${ac_cv_struct_addrinfo+set}" = set; then :
++if ${ac_cv_struct_addrinfo+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10629,7 +10695,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5
+ $as_echo_n "checking for sockaddr_storage... " >&6; }
+-if test "${ac_cv_struct_sockaddr_storage+set}" = set; then :
++if ${ac_cv_struct_sockaddr_storage+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10665,7 +10731,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
+ $as_echo_n "checking whether char is unsigned... " >&6; }
+-if test "${ac_cv_c_char_unsigned+set}" = set; then :
++if ${ac_cv_c_char_unsigned+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10697,7 +10763,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+-if test "${ac_cv_c_const+set}" = set; then :
++if ${ac_cv_c_const+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -10986,7 +11052,7 @@ $as_echo "$va_list_is_array" >&6; }
+
+
+ ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r"
+-if test "x$ac_cv_func_gethostbyname_r" = x""yes; then :
++if test "x$ac_cv_func_gethostbyname_r" = xyes; then :
+
+ $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+
+@@ -11117,7 +11183,7 @@ else
+ for ac_func in gethostbyname
+ do :
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++if test "x$ac_cv_func_gethostbyname" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETHOSTBYNAME 1
+ _ACEOF
+@@ -11139,12 +11205,12 @@ fi
+
+ # Linux requires this for correct f.p. operations
+ ac_fn_c_check_func "$LINENO" "__fpu_control" "ac_cv_func___fpu_control"
+-if test "x$ac_cv_func___fpu_control" = x""yes; then :
++if test "x$ac_cv_func___fpu_control" = xyes; then :
+
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpu_control in -lieee" >&5
+ $as_echo_n "checking for __fpu_control in -lieee... " >&6; }
+-if test "${ac_cv_lib_ieee___fpu_control+set}" = set; then :
++if ${ac_cv_lib_ieee___fpu_control+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11178,7 +11244,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee___fpu_control" >&5
+ $as_echo "$ac_cv_lib_ieee___fpu_control" >&6; }
+-if test "x$ac_cv_lib_ieee___fpu_control" = x""yes; then :
++if test "x$ac_cv_lib_ieee___fpu_control" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBIEEE 1
+ _ACEOF
+@@ -11235,7 +11301,7 @@ elif test "$withval" != yes
+ then LIBM=$withval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5
+ $as_echo "set LIBM=\"$withval\"" >&6; }
+-else as_fn_error "proper usage is --with-libm=STRING" "$LINENO" 5
++else as_fn_error $? "proper usage is --with-libm=STRING" "$LINENO" 5
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5
+@@ -11259,7 +11325,7 @@ elif test "$withval" != yes
+ then LIBC=$withval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5
+ $as_echo "set LIBC=\"$withval\"" >&6; }
+-else as_fn_error "proper usage is --with-libc=STRING" "$LINENO" 5
++else as_fn_error $? "proper usage is --with-libc=STRING" "$LINENO" 5
fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5
+@@ -11281,7 +11347,7 @@ LIBS="$LIBS $LIBM"
+ # 0 otherwise. See http://bugs.python.org/issue2937 for more info.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x87-style double rounding" >&5
+ $as_echo_n "checking for x87-style double rounding... " >&6; }
+-if test "${ac_cv_x87_double_rounding+set}" = set; then :
++if ${ac_cv_x87_double_rounding+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -11336,7 +11402,7 @@ fi
+ # -0. on some architectures.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tanh preserves the sign of zero" >&5
+ $as_echo_n "checking whether tanh preserves the sign of zero... " >&6; }
+-if test "${ac_cv_tanh_preserves_zero_sign+set}" = set; then :
++if ${ac_cv_tanh_preserves_zero_sign+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
-@@ -24032,7 +24208,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -11382,8 +11448,7 @@ for ac_func in acosh asinh atanh copysig
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+- if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+@@ -11393,7 +11458,7 @@ done
+
+ ac_fn_c_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include <math.h>
+ "
+-if test "x$ac_cv_have_decl_isinf" = x""yes; then :
++if test "x$ac_cv_have_decl_isinf" = xyes; then :
+ ac_have_decl=1
+ else
+ ac_have_decl=0
+@@ -11404,7 +11469,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ ac_fn_c_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include <math.h>
+ "
+-if test "x$ac_cv_have_decl_isnan" = x""yes; then :
++if test "x$ac_cv_have_decl_isnan" = xyes; then :
+ ac_have_decl=1
+ else
+ ac_have_decl=0
+@@ -11415,7 +11480,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ ac_fn_c_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include <math.h>
+ "
+-if test "x$ac_cv_have_decl_isfinite" = x""yes; then :
++if test "x$ac_cv_have_decl_isfinite" = xyes; then :
+ ac_have_decl=1
+ else
+ ac_have_decl=0
+@@ -11430,7 +11495,7 @@ LIBS=$LIBS_SAVE
+
+ # check for wchar.h
+ ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
+-if test "x$ac_cv_header_wchar_h" = x""yes; then :
++if test "x$ac_cv_header_wchar_h" = xyes; then :
+
+
+ $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
+@@ -11453,7 +11518,7 @@ then
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
+ $as_echo_n "checking size of wchar_t... " >&6; }
+-if test "${ac_cv_sizeof_wchar_t+set}" = set; then :
++if ${ac_cv_sizeof_wchar_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "#include <wchar.h>
+@@ -11463,9 +11528,8 @@ else
+ if test "$ac_cv_type_wchar_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "cannot compute sizeof (wchar_t)
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "cannot compute sizeof (wchar_t)
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_wchar_t=0
+ fi
+@@ -11520,7 +11584,7 @@ then
+ # check whether wchar_t is signed or not
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5
+ $as_echo_n "checking whether wchar_t is signed... " >&6; }
+- if test "${ac_cv_wchar_t_signed+set}" = set; then :
++ if ${ac_cv_wchar_t_signed+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -11584,7 +11648,7 @@ ucs4) unicode_size="4"
+ $as_echo "#define Py_UNICODE_SIZE 4" >>confdefs.h
+
+ ;;
+-*) as_fn_error "invalid value for --enable-unicode. Use either ucs2 or ucs4 (lowercase)." "$LINENO" 5 ;;
++*) as_fn_error $? "invalid value for --enable-unicode. Use either ucs2 or ucs4 (lowercase)." "$LINENO" 5 ;;
+ esac
+
+
+@@ -11631,7 +11695,7 @@ fi
+ # check for endianness
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+ $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+-if test "${ac_cv_c_bigendian+set}" = set; then :
++if ${ac_cv_c_bigendian+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_c_bigendian=unknown
+@@ -11849,7 +11913,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
+ ;; #(
+ *)
+- as_fn_error "unknown endianness
++ as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+@@ -11858,7 +11922,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
+ # or fills with zeros (like the Cray J90, according to Tim Peters).
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5
+ $as_echo_n "checking whether right shift extends the sign bit... " >&6; }
+-if test "${ac_cv_rshift_extends_sign+set}" = set; then :
++if ${ac_cv_rshift_extends_sign+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -11897,7 +11961,7 @@ fi
+ # check for getc_unlocked and related locking functions
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getc_unlocked() and friends" >&5
+ $as_echo_n "checking for getc_unlocked() and friends... " >&6; }
+-if test "${ac_cv_have_getc_unlocked+set}" = set; then :
++if ${ac_cv_have_getc_unlocked+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -11995,7 +12059,7 @@ fi
+ # check for readline 2.1
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
+ $as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
++if ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12029,7 +12093,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
+ $as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
+-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
++if test "x$ac_cv_lib_readline_rl_callback_handler_install" = xyes; then :
+
+ $as_echo "#define HAVE_RL_CALLBACK 1" >>confdefs.h
+
+@@ -12046,7 +12110,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+ have_readline=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ if test $have_readline = yes
+ then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12080,7 +12144,7 @@ fi
+ # check for readline 4.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -lreadline" >&5
+ $as_echo_n "checking for rl_pre_input_hook in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then :
++if ${ac_cv_lib_readline_rl_pre_input_hook+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12114,7 +12178,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pre_input_hook" >&5
+ $as_echo "$ac_cv_lib_readline_rl_pre_input_hook" >&6; }
+-if test "x$ac_cv_lib_readline_rl_pre_input_hook" = x""yes; then :
++if test "x$ac_cv_lib_readline_rl_pre_input_hook" = xyes; then :
+
+ $as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h
+
+@@ -12124,7 +12188,7 @@ fi
+ # also in 4.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -lreadline" >&5
+ $as_echo_n "checking for rl_completion_display_matches_hook in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_rl_completion_display_matches_hook+set}" = set; then :
++if ${ac_cv_lib_readline_rl_completion_display_matches_hook+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12158,7 +12222,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_display_matches_hook" >&5
+ $as_echo "$ac_cv_lib_readline_rl_completion_display_matches_hook" >&6; }
+-if test "x$ac_cv_lib_readline_rl_completion_display_matches_hook" = x""yes; then :
++if test "x$ac_cv_lib_readline_rl_completion_display_matches_hook" = xyes; then :
+
+ $as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h
+
+@@ -12168,7 +12232,7 @@ fi
+ # check for readline 4.2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
+ $as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
++if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -12202,7 +12266,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
--rm -f -r conftest*
-+rm -f conftest*
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+ $as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+-if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
++if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
+
+ $as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+@@ -12219,7 +12283,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+ have_readline=no
fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ if test $have_readline = yes
+ then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12242,7 +12306,7 @@ LIBS=$LIBS_no_readline
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5
+ $as_echo_n "checking for broken nice()... " >&6; }
+-if test "${ac_cv_broken_nice+set}" = set; then :
++if ${ac_cv_broken_nice+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -12339,7 +12403,7 @@ ac_fn_c_check_member "$LINENO" "struct t
+ #include <$ac_cv_struct_tm>
+
+ "
+-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
++if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_TM_TM_ZONE 1
+@@ -12355,7 +12419,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf
+ else
+ ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+ "
+-if test "x$ac_cv_have_decl_tzname" = x""yes; then :
++if test "x$ac_cv_have_decl_tzname" = xyes; then :
+ ac_have_decl=1
+ else
+ ac_have_decl=0
+@@ -12367,7 +12431,7 @@ _ACEOF
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+ $as_echo_n "checking for tzname... " >&6; }
+-if test "${ac_cv_var_tzname+set}" = set; then :
++if ${ac_cv_var_tzname+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12406,7 +12470,7 @@ fi
+ # check tzset(3) exists and works like we expect it to
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5
+ $as_echo_n "checking for working tzset()... " >&6; }
+-if test "${ac_cv_working_tzset+set}" = set; then :
++if ${ac_cv_working_tzset+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -12503,7 +12567,7 @@ fi
+ # Look for subsecond timestamps in struct stat
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5
+ $as_echo_n "checking for tv_nsec in struct stat... " >&6; }
+-if test "${ac_cv_stat_tv_nsec+set}" = set; then :
++if ${ac_cv_stat_tv_nsec+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12540,7 +12604,7 @@ fi
+ # Look for BSD style subsecond timestamps in struct stat
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5
+ $as_echo_n "checking for tv_nsec2 in struct stat... " >&6; }
+-if test "${ac_cv_stat_tv_nsec2+set}" = set; then :
++if ${ac_cv_stat_tv_nsec2+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12577,7 +12641,7 @@ fi
+ # On HP/UX 11.0, mvwdelch is a block with a return statement
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5
+ $as_echo_n "checking whether mvwdelch is an expression... " >&6; }
+-if test "${ac_cv_mvwdelch_is_expression+set}" = set; then :
++if ${ac_cv_mvwdelch_is_expression+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12614,7 +12678,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5
+ $as_echo_n "checking whether WINDOW has _flags... " >&6; }
+-if test "${ac_cv_window_has_flags+set}" = set; then :
++if ${ac_cv_window_has_flags+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -12763,8 +12827,8 @@ $as_echo_n "checking for %zd printf() fo
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot run test program while cross compiling
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -12827,7 +12891,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t"
+ #endif
+
+ "
+-if test "x$ac_cv_type_socklen_t" = x""yes; then :
++if test "x$ac_cv_type_socklen_t" = xyes; then :
+
+ else
+
+@@ -12929,10 +12993,21 @@ $as_echo "$as_me: WARNING: cache variabl
+ :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+- test "x$cache_file" != "x/dev/null" &&
++ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+- cat confcache >$cache_file
++ if test ! -f "$cache_file" || test -h "$cache_file"; then
++ cat confcache >"$cache_file"
++ else
++ case $cache_file in #(
++ */* | ?:*)
++ mv -f confcache "$cache_file"$$ &&
++ mv -f "$cache_file"$$ "$cache_file" ;; #(
++ *)
++ mv -f confcache "$cache_file" ;;
++ esac
++ fi
++ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -12948,6 +13023,7 @@ DEFS=-DHAVE_CONFIG_H
+
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -12964,7 +13040,7 @@ LTLIBOBJS=$ac_ltlibobjs
+
+
+
+-: ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -13065,6 +13141,7 @@ fi
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -13110,19 +13187,19 @@ export LANGUAGE
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$?; test $as_status -eq 0 && as_status=1
+- if test "$3"; then
+- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+- $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -13318,7 +13395,7 @@ $as_echo X"$as_dir" |
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -13372,7 +13449,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by python $as_me 2.6, which was
+-generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.68. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -13434,10 +13511,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 2.6
+-configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2009 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."
+
+@@ -13453,11 +13530,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -13479,6 +13561,7 @@ do
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+@@ -13491,7 +13574,7 @@ do
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- as_fn_error "ambiguous option: \`$1'
++ as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+@@ -13500,7 +13583,7 @@ Try \`$0 --help' for more information.";
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) as_fn_error "unrecognized option: \`$1'
++ -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+@@ -13558,7 +13641,7 @@ do
+ "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
+ "Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
+
+- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+ done
+
+@@ -13580,9 +13663,10 @@ fi
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+- tmp=
++ tmp= ac_tmp=
+ trap 'exit_status=$?
+- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++ : "${ac_tmp:=$tmp}"
++ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ ' 0
+ trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -13590,12 +13674,13 @@ $debug ||
+
+ {
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+- test -n "$tmp" && test -d "$tmp"
++ test -d "$tmp"
+ } ||
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -13612,12 +13697,12 @@ if test "x$ac_cr" = x; then
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\r'
++ ac_cs_awk_cr='\\r'
+ else
+ ac_cs_awk_cr=$ac_cr
+ fi
+
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+ _ACEOF
+
+
+@@ -13626,18 +13711,18 @@ _ACEOF
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+ } >conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -13645,7 +13730,7 @@ done
+ rm -f conf$$subs.sh
+
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -13693,7 +13778,7 @@ t delim
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+
+@@ -13725,21 +13810,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+ cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || as_fn_error "could not setup config files machinery" "$LINENO" 5
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[ ]*\):*/\1/
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
++h
++s///
++s/^/:/
++s/[ ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[ ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[ ]*$//
+ }'
+ fi
+@@ -13751,7 +13844,7 @@ fi # test -n "$CONFIG_FILES"
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+
+@@ -13763,11 +13856,11 @@ _ACEOF
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+- if test -z "$ac_t"; then
++ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++ if test -z "$ac_tt"; then
+ break
+ elif $ac_last_try; then
+- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -13852,7 +13945,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- as_fn_error "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+
+
+@@ -13865,7 +13958,7 @@ do
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -13884,7 +13977,7 @@ do
+ for ac_f
+ do
+ case $ac_f in
+- -) ac_f="$tmp/stdin";;
++ -) ac_f="$ac_tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+@@ -13893,7 +13986,7 @@ do
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -13919,8 +14012,8 @@ $as_echo "$as_me: creating $ac_file" >&6
+ esac
+
+ case $ac_tag in
+- *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ *:-:* | *:-) cat >"$ac_tmp/stdin" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -14050,23 +14143,24 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
+ s&@INSTALL@&$ac_INSTALL&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
++ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&5
++which seems to be undefined. Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&2;}
++which seems to be undefined. Please make sure it is defined" >&2;}
+
+- rm -f "$tmp/stdin"
++ rm -f "$ac_tmp/stdin"
+ case $ac_file in
+- -) cat "$tmp/out" && rm -f "$tmp/out";;
+- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ esac \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+@@ -14075,21 +14169,21 @@ which seems to be undefined. Please mak
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+- } >"$tmp/config.h" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
+- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++ } >"$ac_tmp/config.h" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+- mv "$tmp/config.h" "$ac_file" \
+- || as_fn_error "could not create $ac_file" "$LINENO" 5
++ mv "$ac_tmp/config.h" "$ac_file" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || as_fn_error "could not create -" "$LINENO" 5
++ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ ;;
+
+@@ -14104,7 +14198,7 @@ _ACEOF
+ ac_clean_files=$ac_clean_files_save
+
+ test $ac_write_fail = 0 ||
+- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+ # configure is writing to config.log, and then calls config.status.
+@@ -14125,7 +14219,7 @@ if test "$no_create" != yes; then
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+- $ac_cs_success || as_fn_exit $?
++ $ac_cs_success || as_fn_exit 1
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/python-2.6.8-ctypes-noexecmem.patch b/python-2.6.8-ctypes-noexecmem.patch
new file mode 100644
index 0000000..49bae1a
--- /dev/null
+++ b/python-2.6.8-ctypes-noexecmem.patch
@@ -0,0 +1,85 @@
+diff -up Python-2.6.8/Modules/_ctypes/callbacks.c.selinux Python-2.6.8/Modules/_ctypes/callbacks.c
+--- Python-2.6.8/Modules/_ctypes/callbacks.c.selinux 2012-04-10 11:32:09.000000000 -0400
++++ Python-2.6.8/Modules/_ctypes/callbacks.c 2012-04-12 15:59:34.773289064 -0400
+@@ -21,8 +21,8 @@ CThunkObject_dealloc(PyObject *_self)
+ Py_XDECREF(self->converters);
+ Py_XDECREF(self->callable);
+ Py_XDECREF(self->restype);
+- if (self->pcl)
+- FreeClosure(self->pcl);
++ if (self->pcl_write)
++ ffi_closure_free(self->pcl_write);
+ PyObject_GC_Del(self);
+ }
+
+@@ -373,7 +373,8 @@ static CThunkObject* CThunkObject_new(Py
+ return NULL;
+ }
+
+- p->pcl = NULL;
++ p->pcl_exec = NULL;
++ p->pcl_write = NULL;
+ memset(&p->cif, 0, sizeof(p->cif));
+ p->converters = NULL;
+ p->callable = NULL;
+@@ -403,8 +404,9 @@ CThunkObject *AllocFunctionCallback(PyOb
+
+ assert(CThunk_CheckExact(p));
+
+- p->pcl = MallocClosure();
+- if (p->pcl == NULL) {
++ p->pcl_write = ffi_closure_alloc(sizeof(ffi_closure),
++ &p->pcl_exec);
++ if (p->pcl_write == NULL) {
+ PyErr_NoMemory();
+ goto error;
+ }
+@@ -449,7 +451,9 @@ CThunkObject *AllocFunctionCallback(PyOb
+ "ffi_prep_cif failed with %d", result);
+ goto error;
+ }
+- result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p);
++ result = ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn,
++ p,
++ p->pcl_exec);
+ if (result != FFI_OK) {
+ PyErr_Format(PyExc_RuntimeError,
+ "ffi_prep_closure failed with %d", result);
+diff -up Python-2.6.8/Modules/_ctypes/_ctypes.c.selinux Python-2.6.8/Modules/_ctypes/_ctypes.c
+--- Python-2.6.8/Modules/_ctypes/_ctypes.c.selinux 2012-04-10 11:32:09.000000000 -0400
++++ Python-2.6.8/Modules/_ctypes/_ctypes.c 2012-04-12 16:00:13.750801778 -0400
+@@ -3443,7 +3443,7 @@ CFuncPtr_new(PyTypeObject *type, PyObjec
+ self->callable = callable;
+
+ self->thunk = thunk;
+- *(void **)self->b_ptr = (void *)thunk->pcl;
++ *(void **)self->b_ptr = (void *)thunk->pcl_exec;
+
+ Py_INCREF((PyObject *)thunk); /* for KeepRef */
+ if (-1 == KeepRef((CDataObject *)self, 0, (PyObject *)thunk)) {
+diff -up Python-2.6.8/Modules/_ctypes/ctypes.h.selinux Python-2.6.8/Modules/_ctypes/ctypes.h
+--- Python-2.6.8/Modules/_ctypes/ctypes.h.selinux 2012-04-10 11:32:09.000000000 -0400
++++ Python-2.6.8/Modules/_ctypes/ctypes.h 2012-04-12 16:00:42.565441545 -0400
+@@ -95,7 +95,8 @@ struct tagCDataObject {
+
+ typedef struct {
+ PyObject_VAR_HEAD
+- ffi_closure *pcl; /* the C callable */
++ ffi_closure *pcl_write; /* the C callable, writeable */
++ void *pcl_exec; /* the C callable, executable */
+ ffi_cif cif;
+ int flags;
+ PyObject *converters;
+diff -up Python-2.6.8/setup.py.selinux Python-2.6.8/setup.py
+--- Python-2.6.8/setup.py.selinux 2012-04-12 15:56:31.429581175 -0400
++++ Python-2.6.8/setup.py 2012-04-12 15:56:31.485580476 -0400
+@@ -1869,8 +1869,7 @@ class PyBuildExt(build_ext):
+ '_ctypes/callbacks.c',
+ '_ctypes/callproc.c',
+ '_ctypes/stgdict.c',
+- '_ctypes/cfield.c',
+- '_ctypes/malloc_closure.c']
++ '_ctypes/cfield.c']
+ depends = ['_ctypes/ctypes.h']
+
+ if sys.platform == 'darwin':
diff --git a/python-2.6-lib64.patch b/python-2.6.8-lib64.patch
similarity index 71%
rename from python-2.6-lib64.patch
rename to python-2.6.8-lib64.patch
index a9812e7..e8ee9d2 100644
--- a/python-2.6-lib64.patch
+++ b/python-2.6.8-lib64.patch
@@ -1,6 +1,6 @@
-diff -up Python-2.6/Lib/distutils/command/install.py.lib64 Python-2.6/Lib/distutils/command/install.py
---- Python-2.6/Lib/distutils/command/install.py.lib64 2008-05-06 18:41:46.000000000 -0400
-+++ Python-2.6/Lib/distutils/command/install.py 2008-11-24 02:34:04.000000000 -0500
+diff -up Python-2.6.8/Lib/distutils/command/install.py.lib64 Python-2.6.8/Lib/distutils/command/install.py
+--- Python-2.6.8/Lib/distutils/command/install.py.lib64 2012-04-10 11:32:04.000000000 -0400
++++ Python-2.6.8/Lib/distutils/command/install.py 2012-04-12 13:23:24.929428232 -0400
@@ -42,14 +42,14 @@ else:
INSTALL_SCHEMES = {
'unix_prefix': {
@@ -18,10 +18,10 @@ diff -up Python-2.6/Lib/distutils/command/install.py.lib64 Python-2.6/Lib/distut
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
-diff -up Python-2.6/Lib/distutils/sysconfig.py.lib64 Python-2.6/Lib/distutils/sysconfig.py
---- Python-2.6/Lib/distutils/sysconfig.py.lib64 2008-06-05 08:58:24.000000000 -0400
-+++ Python-2.6/Lib/distutils/sysconfig.py 2008-11-24 02:34:04.000000000 -0500
-@@ -115,8 +115,12 @@ def get_python_lib(plat_specific=0, stan
+diff -up Python-2.6.8/Lib/distutils/sysconfig.py.lib64 Python-2.6.8/Lib/distutils/sysconfig.py
+--- Python-2.6.8/Lib/distutils/sysconfig.py.lib64 2012-04-10 11:32:04.000000000 -0400
++++ Python-2.6.8/Lib/distutils/sysconfig.py 2012-04-12 13:23:24.930428219 -0400
+@@ -119,8 +119,12 @@ def get_python_lib(plat_specific=0, stan
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
@@ -35,9 +35,9 @@ diff -up Python-2.6/Lib/distutils/sysconfig.py.lib64 Python-2.6/Lib/distutils/sy
if standard_lib:
return libpython
else:
-diff -up Python-2.6/Lib/site.py.lib64 Python-2.6/Lib/site.py
---- Python-2.6/Lib/site.py.lib64 2008-05-10 13:36:24.000000000 -0400
-+++ Python-2.6/Lib/site.py 2008-11-24 02:35:51.000000000 -0500
+diff -up Python-2.6.8/Lib/site.py.lib64 Python-2.6.8/Lib/site.py
+--- Python-2.6.8/Lib/site.py.lib64 2012-04-10 11:32:06.000000000 -0400
++++ Python-2.6.8/Lib/site.py 2012-04-12 13:23:24.931428206 -0400
@@ -265,12 +265,16 @@ def addsitepackages(known_paths):
if sys.platform in ('os2emx', 'riscos'):
sitedirs.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -55,15 +55,10 @@ diff -up Python-2.6/Lib/site.py.lib64 Python-2.6/Lib/site.py
sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
if sys.platform == "darwin":
-diff -up Python-2.6/Makefile.pre.in.lib64 Python-2.6/Makefile.pre.in
---- Python-2.6/Makefile.pre.in.lib64 2008-11-24 02:34:04.000000000 -0500
-+++ Python-2.6/Makefile.pre.in 2008-11-24 02:34:04.000000000 -0500
-@@ -87,11 +87,11 @@ datarootdir= @datarootdir@
-
- # Expanded directories
- BINDIR= $(exec_prefix)/bin
--LIBDIR= $(exec_prefix)/lib
-+LIBDIR= $(exec_prefix)/lib64
+diff -up Python-2.6.8/Makefile.pre.in.lib64 Python-2.6.8/Makefile.pre.in
+--- Python-2.6.8/Makefile.pre.in.lib64 2012-04-12 13:23:24.000000000 -0400
++++ Python-2.6.8/Makefile.pre.in 2012-04-12 13:24:31.619594491 -0400
+@@ -91,7 +91,7 @@ LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
@@ -72,9 +67,9 @@ diff -up Python-2.6/Makefile.pre.in.lib64 Python-2.6/Makefile.pre.in
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
-diff -up Python-2.6/Modules/getpath.c.lib64 Python-2.6/Modules/getpath.c
---- Python-2.6/Modules/getpath.c.lib64 2007-03-10 02:38:14.000000000 -0500
-+++ Python-2.6/Modules/getpath.c 2008-11-24 02:34:04.000000000 -0500
+diff -up Python-2.6.8/Modules/getpath.c.lib64 Python-2.6.8/Modules/getpath.c
+--- Python-2.6.8/Modules/getpath.c.lib64 2012-04-10 11:32:09.000000000 -0400
++++ Python-2.6.8/Modules/getpath.c 2012-04-12 13:24:52.443334157 -0400
@@ -117,8 +117,8 @@
#endif
@@ -101,7 +96,7 @@ diff -up Python-2.6/Modules/getpath.c.lib64 Python-2.6/Modules/getpath.c
strncpy(zip_path, PREFIX, MAXPATHLEN);
- joinpath(zip_path, "lib/python00.zip");
+ joinpath(zip_path, "lib64/python00.zip");
- bufsz = strlen(zip_path); /* Replace "00" with version */
+ bufsz = strlen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
@@ -534,7 +534,7 @@ calculate_path(void)
@@ -113,19 +108,19 @@ diff -up Python-2.6/Modules/getpath.c.lib64 Python-2.6/Modules/getpath.c
}
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
-diff -up Python-2.6/Modules/Setup.dist.lib64 Python-2.6/Modules/Setup.dist
---- Python-2.6/Modules/Setup.dist.lib64 2008-11-24 02:34:04.000000000 -0500
-+++ Python-2.6/Modules/Setup.dist 2008-11-24 02:34:04.000000000 -0500
-@@ -408,7 +408,7 @@ gdbm gdbmmodule.c -I/usr/local/include -
+diff -up Python-2.6.8/Modules/Setup.dist.lib64 Python-2.6.8/Modules/Setup.dist
+--- Python-2.6.8/Modules/Setup.dist.lib64 2012-04-12 13:23:24.620432094 -0400
++++ Python-2.6.8/Modules/Setup.dist 2012-04-12 13:23:24.934428169 -0400
+@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm
# and the subdirectory of PORT where you built it.
- DBLIBVER=4.7
+ DBLIBVER=4.3
DBINC=/usr/include/db4
-DBLIB=/usr/lib
+DBLIB=/usr/lib64
_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
# Historical Berkeley DB 1.85
-@@ -454,7 +454,7 @@ cPickle cPickle.c
+@@ -459,7 +459,7 @@ cPickle cPickle.c
# Andrew Kuchling's zlib module.
# This require zlib 1.1.3 (or later).
# See http://www.gzip.org/zlib/
@@ -134,10 +129,10 @@ diff -up Python-2.6/Modules/Setup.dist.lib64 Python-2.6/Modules/Setup.dist
# Interface to the Expat XML parser
#
-diff -up Python-2.6/setup.py.lib64 Python-2.6/setup.py
---- Python-2.6/setup.py.lib64 2008-11-24 02:34:04.000000000 -0500
-+++ Python-2.6/setup.py 2008-11-24 02:34:04.000000000 -0500
-@@ -310,7 +310,7 @@ class PyBuildExt(build_ext):
+diff -up Python-2.6.8/setup.py.lib64 Python-2.6.8/setup.py
+--- Python-2.6.8/setup.py.lib64 2012-04-12 13:23:24.657431631 -0400
++++ Python-2.6.8/setup.py 2012-04-12 13:23:24.935428157 -0400
+@@ -356,7 +356,7 @@ class PyBuildExt(build_ext):
def detect_modules(self):
# Ensure that /usr/local is always used
@@ -146,9 +141,9 @@ diff -up Python-2.6/setup.py.lib64 Python-2.6/setup.py
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
# Add paths specified in the environment variables LDFLAGS and
-@@ -583,11 +583,11 @@ class PyBuildExt(build_ext):
- elif self.compiler.find_library_file(lib_dirs, 'curses'):
- readline_libs.append('curses')
+@@ -662,11 +662,11 @@ class PyBuildExt(build_ext):
+ elif curses_library:
+ readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
- ['/usr/lib/termcap'],
+ ['/usr/lib64/termcap'],
@@ -160,7 +155,7 @@ diff -up Python-2.6/setup.py.lib64 Python-2.6/setup.py
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -624,8 +624,8 @@ class PyBuildExt(build_ext):
+@@ -703,8 +703,8 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
diff --git a/python-2.6.8-wrap-_Py_HashSecret_Initialized-with-if-Py_DEBUG.patch b/python-2.6.8-wrap-_Py_HashSecret_Initialized-with-if-Py_DEBUG.patch
new file mode 100644
index 0000000..bcd85da
--- /dev/null
+++ b/python-2.6.8-wrap-_Py_HashSecret_Initialized-with-if-Py_DEBUG.patch
@@ -0,0 +1,26 @@
+diff -up Python-2.6.8/Objects/stringobject.c._Py_HashSecret_Initialized Python-2.6.8/Objects/stringobject.c
+--- Python-2.6.8/Objects/stringobject.c._Py_HashSecret_Initialized 2012-04-12 16:21:10.680088000 -0400
++++ Python-2.6.8/Objects/stringobject.c 2012-04-12 16:21:48.397616464 -0400
+@@ -1209,7 +1209,9 @@ string_hash(PyStringObject *a)
+ register unsigned char *p;
+ register long x;
+
++#ifdef Py_DEBUG
+ assert(_Py_HashSecret_Initialized);
++#endif
+ if (a->ob_shash != -1)
+ return a->ob_shash;
+ len = Py_SIZE(a);
+diff -up Python-2.6.8/Objects/unicodeobject.c._Py_HashSecret_Initialized Python-2.6.8/Objects/unicodeobject.c
+--- Python-2.6.8/Objects/unicodeobject.c._Py_HashSecret_Initialized 2012-04-12 16:21:19.357979510 -0400
++++ Python-2.6.8/Objects/unicodeobject.c 2012-04-12 16:21:53.814548743 -0400
+@@ -6692,7 +6692,9 @@ unicode_hash(PyUnicodeObject *self)
+ register Py_UNICODE *p;
+ register long x;
+
++#ifdef Py_DEBUG
+ assert(_Py_HashSecret_Initialized);
++#endif
+ if (self->hash != -1)
+ return self->hash;
+ len = PyUnicode_GET_SIZE(self);
diff --git a/python26.spec b/python26.spec
index a5c7ab5..6b490b9 100644
--- a/python26.spec
+++ b/python26.spec
@@ -102,8 +102,8 @@
Summary: An interpreted, interactive, object-oriented programming language
Name: %{python}
-Version: 2.6.5
-Release: 6%{?dist}
+Version: 2.6.8
+Release: 1%{?dist}
License: Python
Group: Development/Languages
Provides: python-abi = %{pybasever}
@@ -276,12 +276,6 @@ Patch7: python-2.5.1-sqlite-encoding.patch
# (rhbz:307221)
Patch10: python-2.6.2-binutils-no-dep.patch
-# FIXME: appears to relate to:
-#* Tue Oct 30 2007 James Antill <jantill at redhat.com> - 2.5.1-15
-#- Do codec lowercase in C Locale.
-#- Resolves: 207134 191096
-Patch11: python-2.5.1-codec-ascii-tolower.patch
-
# Add various constants to the socketmodule (rhbz#436560):
# TODO: these patches were added in 2.5.1-22 and 2.5.1-24 but appear not to
# have been sent upstream yet:
@@ -331,7 +325,7 @@ Patch101: python-2.3.4-lib64-regex.patch
# and add the /usr/lib64/pythonMAJOR.MINOR/site-packages to sitedirs, in front of
# /usr/lib/pythonMAJOR.MINOR/site-packages
# Not upstream
-Patch102: python-2.6-lib64.patch
+Patch102: python-2.6.8-lib64.patch
# rhbz#488396: rework the ctypes module to use ffi_closure_alloc and
# ffi_closure_free, rather than malloc_closure.c, since the latter tries to
@@ -343,25 +337,12 @@ Patch102: python-2.6-lib64.patch
#
# This appears to be the same as that patch, but without the rebasing of libffi
# (since we use the system copy of libffi):
-Patch110: python-2.6-ctypes-noexecmem.patch
+Patch110: python-2.6.8-ctypes-noexecmem.patch
# Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
# a libpythonMAJOR.MINOR.a (bug 550692):
Patch111: python-2.6.4-no-static-lib.patch
-# CVE-2010-1634: fix various integer overflow checks in the audioop module
-# This is the difference from r81031 to r81080 (i.e r81046 and r81080), but
-# backported to the old layout before the whitespeace cleanup to
-# release26-maint (in r81031):
-Patch116: python-2.6.2-CVE-2010-1634.patch
-
-# CVE-2010-2089: verify sizes/lengths within audioop module:
-Patch117: python-2.6.2-CVE-2010-2089.patch
-
-# CVE-2008-5983: the new PySys_SetArgvEx entry point from r81399 (backported to
-# the old layout before the whitespeace cleanup of release26-maint in r81031):
-Patch118: python-2.6.2-CVE-2008-5983.patch
-
# Resolves http://bugs.python.org/issue10013
# Title: fix `./libpython2.6.so: undefined reference to `_PyParser_Grammar` in
# parallel builds
@@ -376,6 +357,10 @@ Patch120: Python-2.6.5-ioctl_test.patch
# Patch up pyexpat.h so it will build against RHEL-5's pyexpat-devel:
Patch200: python-2.6.4-expat-version.patch
+# Patch assert(_Py_HashSecret_Initialized) to only be used when Py_DEBUG is set
+# (in case of building with C asserts enabled without Py_DEBUG):
+Patch201: python-2.6.8-wrap-_Py_HashSecret_Initialized-with-if-Py_DEBUG.patch
+
# This is the generated patch to "configure"; see the description of
# %{regenerate_autotooling_patch}
# above:
@@ -567,7 +552,6 @@ rm -r Modules/zlib || exit 1
%endif
%patch10 -p1 -b .binutils-no-dep
-%patch11 -p1 -b .ascii-tolower
%patch13 -p1 -b .socketmodule
%patch14 -p1 -b .socketmodule2
%patch16 -p1 -b .rpath
@@ -575,7 +559,7 @@ rm -r Modules/zlib || exit 1
%patch51 -p1 -b .brprpm
%if 0%{with_valgrind}
-%patch52 -p0 -b .valgrind
+%patch52 -p1 -b .valgrind
%endif
%if 0%{?with_systemtap}
%patch55 -p1 -b .systemtap
@@ -585,9 +569,6 @@ rm -r Modules/zlib || exit 1
%patch111 -p1 -b .no-static-lib
-%patch116 -p1 -b .CVE-2010-1634
-%patch117 -p1 -b .CVE-2010-2089
-%patch118 -p1 -b .CVE-2008-5983
%patch119 -p1 -b .parallel_build
%patch120 -p1 -b .ioctl_test
@@ -595,6 +576,8 @@ rm -r Modules/zlib || exit 1
%patch200 -p1 -b .expat-version
%endif
+%patch201 -p1
+
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@@ -1185,6 +1168,13 @@ rm -fr %{buildroot}
# payload file would be unpackaged)
%changelog
+* Thu Apr 12 2012 David Malcolm <dmalcolm at redhat.com> - 2.6.8-1
+- 2.6.8: refresh patch 102 (lib64), patch 52 (valgrind) and patch 110
+(ctypes/SELinux); drop upstream patch 11 (tolower), patch 116 (CVE-2010-1634),
+patch 117 (CVE-2010-2089), patch 118 (CVE-2008-5983); add patch 200 (Py_DEBUG
+and _Py_HashSecret_Initialized); regenerate the autotool intermediates patch
+(patch 300)
+
* Fri Feb 18 2011 BJ Dierkes <wdierkes at rackspace.com> - 2.6.5-6
- Added support for packages that build against stock python, and python26
Resolves BZ#678690
diff --git a/sources b/sources
index b525b8e..c00e393 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6bef0417e71a1a1737ccf5750420fdb3 Python-2.6.5.tar.bz2
+c6e0420a21d8b23dee8b0195c9b9a125 Python-2.6.8.tar.bz2
e9b2198d72a406698c8de07467654204 libpython-36a517ef7848cbd0b3dcc7371f32e47ac4c87eba.tar.gz
More information about the scm-commits
mailing list