[python3/f15] 3.2.3-1

dmalcolm dmalcolm at fedoraproject.org
Sat Apr 14 00:15:38 UTC 2012


commit b218f78daf5dde4eb3782fea397bfb53aa44a162
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Fri Apr 13 20:14:27 2012 -0400

    3.2.3-1
    
    * Thu Apr 12 2012 David Malcolm <dmalcolm at redhat.com> - 3.2.3-1
    - 3.2.3; refresh patch 6 (no static lib), patch 102 (lib64) and patch 129
    (test_subprocess); fix test_gdb (patches 152 and 153); regenerate the autotool
    intermediates patch (patch 300); run unit tests verbosely; add support for
    skipping unit tests in rpmbuild (patch 132), use it to skip a specific urllib
    test (patch 154)

 00132-add-rpmbuild-hooks-to-unittest.patch         |   68 +
 00152-fix-test-gdb-regex.patch                     |   11 +
 00153-fix-test_gdb-noise.patch                     |   35 +
 00154-skip-urllib-test-requiring-working-DNS.patch |   11 +
 autotool-intermediates.patch                       | 2363 +-------------------
 ...c-lib.patch => python-3.2.1-no-static-lib.patch |   21 +-
 ...test-subprocess-with-nonreadable-path-dir.patch |   12 +
 ...n-3.2b2-lib64.patch => python-3.2.3-lib64.patch |   80 +-
 ...test-subprocess-with-nonreadable-path-dir.patch |   12 -
 python3.spec                                       |   57 +-
 sources                                            |    2 +-
 11 files changed, 252 insertions(+), 2420 deletions(-)
---
diff --git a/00132-add-rpmbuild-hooks-to-unittest.patch b/00132-add-rpmbuild-hooks-to-unittest.patch
new file mode 100644
index 0000000..fdfbab8
--- /dev/null
+++ b/00132-add-rpmbuild-hooks-to-unittest.patch
@@ -0,0 +1,68 @@
+diff -up Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/case.py
+--- Python-3.2.2/Lib/unittest/case.py.add-rpmbuild-hooks-to-unittest	2011-09-03 12:16:44.000000000 -0400
++++ Python-3.2.2/Lib/unittest/case.py	2011-09-09 06:35:16.365568382 -0400
+@@ -3,6 +3,7 @@
+ import sys
+ import functools
+ import difflib
++import os
+ import pprint
+ import re
+ import warnings
+@@ -101,6 +102,43 @@ def expectedFailure(func):
+     return wrapper
+ 
+ 
++# Non-standard/downstream-only hooks for handling issues with specific test
++# cases:
++
++def _skipInRpmBuild(reason):
++    """
++    Non-standard/downstream-only decorator for marking a specific unit test
++    to be skipped when run within the %check of an rpmbuild.
++
++    Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within
++    the environment, and has no effect otherwise.
++    """
++    if 'WITHIN_PYTHON_RPM_BUILD' in os.environ:
++        return skip(reason)
++    else:
++        return _id
++
++def _expectedFailureInRpmBuild(func):
++    """
++    Non-standard/downstream-only decorator for marking a specific unit test
++    as expected to fail within the %check of an rpmbuild.
++
++    Specifically, this takes effect when WITHIN_PYTHON_RPM_BUILD is set within
++    the environment, and has no effect otherwise.
++    """
++    @functools.wraps(func)
++    def wrapper(*args, **kwargs):
++        if 'WITHIN_PYTHON_RPM_BUILD' in os.environ:
++            try:
++                func(*args, **kwargs)
++            except Exception:
++                raise _ExpectedFailure(sys.exc_info())
++            raise _UnexpectedSuccess
++        else:
++            # Call directly:
++            func(*args, **kwargs)
++    return wrapper
++
+ class _AssertRaisesBaseContext(object):
+ 
+     def __init__(self, expected, test_case, callable_obj=None,
+diff -up Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest Python-3.2.2/Lib/unittest/__init__.py
+--- Python-3.2.2/Lib/unittest/__init__.py.add-rpmbuild-hooks-to-unittest	2011-09-03 12:16:44.000000000 -0400
++++ Python-3.2.2/Lib/unittest/__init__.py	2011-09-09 06:35:16.366568382 -0400
+@@ -57,7 +57,8 @@ __unittest = True
+ 
+ from .result import TestResult
+ from .case import (TestCase, FunctionTestCase, SkipTest, skip, skipIf,
+-                   skipUnless, expectedFailure)
++                   skipUnless, expectedFailure,
++                   _skipInRpmBuild, _expectedFailureInRpmBuild)
+ from .suite import BaseTestSuite, TestSuite
+ from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
+                      findTestCases)
diff --git a/00152-fix-test-gdb-regex.patch b/00152-fix-test-gdb-regex.patch
new file mode 100644
index 0000000..4e31c2e
--- /dev/null
+++ b/00152-fix-test-gdb-regex.patch
@@ -0,0 +1,11 @@
+--- Lib/test/test_gdb.py.old	2012-04-11 19:35:13.512681203 -0400
++++ Lib/test/test_gdb.py	2012-04-11 19:39:52.567192540 -0400
+@@ -159,7 +159,7 @@ class DebuggerTests(unittest.TestCase):
+         # gdb can insert additional '\n' and space characters in various places
+         # in its output, depending on the width of the terminal it's connected
+         # to (using its "wrap_here" function)
+-        m = re.match('.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+Python/bltinmodule.c.*',
++        m = re.match('.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*',
+                      gdb_output, re.DOTALL)
+         if not m:
+             self.fail('Unexpected gdb output: %r\n%s' % (gdb_output, gdb_output))
diff --git a/00153-fix-test_gdb-noise.patch b/00153-fix-test_gdb-noise.patch
new file mode 100644
index 0000000..bc5ee63
--- /dev/null
+++ b/00153-fix-test_gdb-noise.patch
@@ -0,0 +1,35 @@
+--- Lib/test/test_gdb.py.old	2012-04-11 21:04:01.367073855 -0400
++++ Lib/test/test_gdb.py	2012-04-12 08:52:58.320288761 -0400
+@@ -96,6 +96,15 @@ class DebuggerTests(unittest.TestCase):
+         # Generate a list of commands in gdb's language:
+         commands = ['set breakpoint pending yes',
+                     'break %s' % breakpoint,
++
++                    # GDB as of Fedora 17 onwards can distinguish between the
++                    # value of a variable at entry vs current value:
++                    #   http://sourceware.org/gdb/onlinedocs/gdb/Variables.html
++                    # which leads to the selftests failing with errors like this:
++                    #   AssertionError: 'v at entry=()' != '()'
++                    # Disable this:
++                    'set print entry-values no',
++
+                     'run']
+         if cmds_after_breakpoint:
+             commands += cmds_after_breakpoint
+@@ -135,8 +144,16 @@ class DebuggerTests(unittest.TestCase):
+         err = err.replace("warning: Cannot initialize thread debugging"
+                           " library: Debugger service failed\n",
+                           '')
++        err = '\n'.join([line
++                         for line in err.splitlines()
++                         if not line.startswith('warning: Unable to open')
++                         if not line.startswith('Missing separate debuginfo for')
++                         if not line.startswith('Try: yum --disablerepo=')
++                         # In case 'set print entry-values no' failed:
++                         if not line.startswith('Undefined set print command')])
+ 
+         # Ensure no unexpected error messages:
++        self.maxDiff = None
+         self.assertEqual(err, '')
+ 
+         return out
diff --git a/00154-skip-urllib-test-requiring-working-DNS.patch b/00154-skip-urllib-test-requiring-working-DNS.patch
new file mode 100644
index 0000000..8c8bfc9
--- /dev/null
+++ b/00154-skip-urllib-test-requiring-working-DNS.patch
@@ -0,0 +1,11 @@
+diff -up Python-3.2.3/Lib/test/test_urllib.py.dns Python-3.2.3/Lib/test/test_urllib.py
+--- Python-3.2.3/Lib/test/test_urllib.py.dns	2012-04-13 15:36:36.619369718 -0400
++++ Python-3.2.3/Lib/test/test_urllib.py	2012-04-13 15:49:39.439583119 -0400
+@@ -1146,6 +1146,7 @@ class Utility_Tests(unittest.TestCase):
+         self.assertEqual(('user 2', 'ab'),urllib.parse.splitpasswd('user 2:ab'))
+         self.assertEqual(('user+1', 'a+b'),urllib.parse.splitpasswd('user+1:a+b'))
+ 
++    @unittest._skipInRpmBuild('test requires working DNS')
+     def test_thishost(self):
+         """Test the urllib.request.thishost utility function returns a tuple"""
+         self.assertIsInstance(urllib.request.thishost(), tuple)
diff --git a/autotool-intermediates.patch b/autotool-intermediates.patch
index fe0a759..9affe40 100644
--- a/autotool-intermediates.patch
+++ b/autotool-intermediates.patch
@@ -1,45 +1,7 @@
 diff -up ./configure.autotool-intermediates ./configure
---- ./configure.autotool-intermediates	2011-02-21 15:46:09.351743001 -0500
-+++ ./configure	2011-02-21 15:46:14.862743000 -0500
-@@ -1,7 +1,7 @@
- #! /bin/sh
--# From configure.in Revision: 88430 .
-+# From configure.in Revision: 88440 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68 for python 3.2.
-+# Generated by GNU Autoconf 2.66 for python 3.2.
- #
- # Report bugs to <http://bugs.python.org/>.
- #
-@@ -92,7 +92,6 @@ 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
-@@ -218,18 +217,11 @@ 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
--	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+"$@"}
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
- 
-     if test x$as_have_required = xno; then :
-@@ -619,6 +611,8 @@ TRUE
+--- ./configure.autotool-intermediates	2012-04-11 20:50:28.717233377 -0400
++++ ./configure	2012-04-11 20:50:32.318188358 -0400
+@@ -619,6 +619,8 @@ TRUE
  MACHDEP_OBJS
  DYNLOADFILE
  DLINCLDIR
@@ -48,7 +10,7 @@ diff -up ./configure.autotool-intermediates ./configure
  THREADOBJ
  LDLAST
  USE_THREAD_MODULE
-@@ -757,8 +751,11 @@ with_thread
+@@ -764,8 +766,11 @@ with_thread
  enable_ipv6
  with_doc_strings
  with_tsc
@@ -60,28 +22,7 @@ diff -up ./configure.autotool-intermediates ./configure
  with_fpectl
  with_libm
  with_libc
-@@ -837,9 +834,8 @@ do
-   fi
- 
-   case $ac_option in
--  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
--  *=)   ac_optarg= ;;
--  *)    ac_optarg=yes ;;
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-   esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1179,7 +1175,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
-@@ -1430,8 +1426,11 @@ Optional Packages:
+@@ -1437,8 +1442,11 @@ Optional Packages:
                            deprecated; use --with(out)-threads
    --with(out)-doc-strings disable/enable documentation strings
    --with(out)-tsc         enable/disable timestamp counter profile
@@ -93,1159 +34,7 @@ diff -up ./configure.autotool-intermediates ./configure
    --with-fpectl           enable SIGFPE catching
    --with-libm=STRING      math library
    --with-libc=STRING      C library
-@@ -1517,7 +1516,7 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- python configure 3.2
--generated by GNU Autoconf 2.68
-+generated by GNU Autoconf 2.66
- 
- Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1563,7 +1562,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_retval=1
- fi
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_compile
-@@ -1589,7 +1588,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; } > conftest.i && {
-+  test $ac_status = 0; } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -1600,7 +1599,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
-     ac_retval=1
- fi
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_cpp
-@@ -1613,10 +1612,10 @@ fi
- ac_fn_c_check_header_mongrel ()
- {
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if eval \${$3+:} false; then :
-+  if eval "test \"\${$3+set}\"" = set; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval \${$3+:} false; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- fi
- eval ac_res=\$$3
-@@ -1652,7 +1651,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
- else
-   ac_header_preproc=no
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- 
-@@ -1683,7 +1682,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
- esac
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval \${$3+:} false; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=\$ac_header_compiler"
-@@ -1692,7 +1691,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_check_header_mongrel
- 
-@@ -1733,7 +1732,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
-        ac_retval=$ac_status
- fi
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_run
-@@ -1747,7 +1746,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 eval \${$3+:} false; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1765,7 +1764,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_check_header_compile
- 
-@@ -1810,7 +1809,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_link
-@@ -1824,7 +1823,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 eval \${$3+:} false; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -1865,7 +1864,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_check_type
- 
-@@ -1878,7 +1877,7 @@ ac_fn_c_find_uintX_t ()
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
- $as_echo_n "checking for uint$2_t... " >&6; }
--if eval \${$3+:} false; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -1918,7 +1917,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_find_uintX_t
- 
-@@ -1931,7 +1930,7 @@ ac_fn_c_find_intX_t ()
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
- $as_echo_n "checking for int$2_t... " >&6; }
--if eval \${$3+:} false; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -1992,7 +1991,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_find_intX_t
- 
-@@ -2169,7 +2168,7 @@ rm -f core *.core core.conftest.* gmon.o
- rm -f conftest.val
- 
-   fi
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_compute_int
-@@ -2182,7 +2181,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 eval \${$3+:} false; then :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2237,7 +2236,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_check_func
- 
-@@ -2250,7 +2249,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 eval \${$4+:} false; then :
-+if eval "test \"\${$4+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2294,7 +2293,7 @@ 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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_check_member
- 
-@@ -2309,7 +2308,7 @@ ac_fn_c_check_decl ()
-   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 :
-+if eval "test \"\${$3+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2340,7 +2339,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; ${as_lineno_stack:+:} unset as_lineno
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- 
- } # ac_fn_c_check_decl
- cat >config.log <<_ACEOF
-@@ -2348,7 +2347,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by python $as_me 3.2, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.66.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -3195,7 +3194,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 ${ac_cv_prog_CC+:} false; then :
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3235,7 +3234,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 ${ac_cv_prog_ac_ct_CC+:} false; then :
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -3288,7 +3287,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 ${ac_cv_prog_CC+:} false; then :
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3328,7 +3327,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 ${ac_cv_prog_CC+:} false; then :
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3387,7 +3386,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 ${ac_cv_prog_CC+:} false; then :
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -3431,7 +3430,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 ${ac_cv_prog_ac_ct_CC+:} false; then :
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -3714,7 +3713,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 ${ac_cv_objext+:} false; then :
-+if test "${ac_cv_objext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3765,7 +3764,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 ${ac_cv_c_compiler_gnu+:} false; then :
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3802,7 +3801,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 ${ac_cv_prog_cc_g+:} false; then :
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -3880,7 +3879,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 ${ac_cv_prog_cc_c89+:} false; then :
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
-@@ -4015,7 +4014,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 ${ac_cv_path_CXX+:} false; then :
-+if test "${ac_cv_path_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $CXX in
-@@ -4056,7 +4055,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 ${ac_cv_path_CXX+:} false; then :
-+if test "${ac_cv_path_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $CXX in
-@@ -4107,7 +4106,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 ${ac_cv_prog_CXX+:} false; then :
-+if test "${ac_cv_prog_CXX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CXX"; then
-@@ -4178,7 +4177,7 @@ if test -n "$CPP" && test -d "$CPP"; the
-   CPP=
- fi
- if test -z "$CPP"; then
--  if ${ac_cv_prog_CPP+:} false; then :
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CPP needs to be expanded
-@@ -4208,7 +4207,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4224,11 +4223,11 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -4267,7 +4266,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4283,11 +4282,11 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-@@ -4306,7 +4305,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 ${ac_cv_path_GREP+:} false; then :
-+if test "${ac_cv_path_GREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$GREP"; then
-@@ -4369,7 +4368,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 ${ac_cv_path_EGREP+:} false; then :
-+if test "${ac_cv_path_EGREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4436,7 +4435,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 ${ac_cv_header_stdc+:} false; then :
-+if test "${ac_cv_header_stdc+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4565,7 +4564,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" = xyes; then :
-+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
-   MINIX=yes
- else
-   MINIX=
-@@ -4587,7 +4586,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h
- 
-   { $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 ${ac_cv_safe_to_define___extensions__+:} false; then :
-+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4780,7 +4779,7 @@ $as_echo "$GNULD" >&6; }
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
- $as_echo_n "checking for inline... " >&6; }
--if ${ac_cv_c_inline+:} false; then :
-+if test "${ac_cv_c_inline+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_c_inline=no
-@@ -4981,7 +4980,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 ${ac_cv_prog_RANLIB+:} false; then :
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$RANLIB"; then
-@@ -5021,7 +5020,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 ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_RANLIB"; then
-@@ -5075,7 +5074,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 ${ac_cv_prog_AR+:} false; then :
-+if test "${ac_cv_prog_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$AR"; then
-@@ -5125,7 +5124,7 @@ fi
- 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 ${ac_cv_prog_SVNVERSION+:} false; then :
-+if test "${ac_cv_prog_SVNVERSION+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$SVNVERSION"; then
-@@ -5220,7 +5219,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 ${ac_cv_path_install+:} false; then :
-+if test "${ac_cv_path_install+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5406,7 +5405,7 @@ $as_echo_n "checking whether $CC accepts
-      ac_save_cc="$CC"
-      CC="$CC -fno-strict-aliasing"
-      save_CFLAGS="$CFLAGS"
--     if ${ac_cv_no_strict_aliasing+:} false; then :
-+     if test "${ac_cv_no_strict_aliasing+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -5662,7 +5661,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 ${ac_cv_pthread_is_default+:} false; then :
-+if test "${ac_cv_pthread_is_default+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -5715,7 +5714,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 ${ac_cv_kpthread+:} false; then :
-+if test "${ac_cv_kpthread+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_cc="$CC"
-@@ -5764,7 +5763,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 ${ac_cv_kthread+:} false; then :
-+if test "${ac_cv_kthread+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_cc="$CC"
-@@ -5813,7 +5812,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 ${ac_cv_thread+:} false; then :
-+if test "${ac_cv_thread+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_cc="$CC"
-@@ -5898,7 +5897,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 ${ac_cv_header_stdc+:} false; then :
-+if test "${ac_cv_header_stdc+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6037,7 +6036,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 eval \${$as_ac_Header+:} false; then :
-+if eval "test \"\${$as_ac_Header+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6077,7 +6076,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 ${ac_cv_search_opendir+:} false; then :
-+if test "${ac_cv_search_opendir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
-@@ -6111,11 +6110,11 @@ for ac_lib in '' dir; do
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext
--  if ${ac_cv_search_opendir+:} false; then :
-+  if test "${ac_cv_search_opendir+set}" = set; then :
-   break
- fi
- done
--if ${ac_cv_search_opendir+:} false; then :
-+if test "${ac_cv_search_opendir+set}" = set; then :
- 
- else
-   ac_cv_search_opendir=no
-@@ -6134,7 +6133,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 ${ac_cv_search_opendir+:} false; then :
-+if test "${ac_cv_search_opendir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
-@@ -6168,11 +6167,11 @@ for ac_lib in '' x; do
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext
--  if ${ac_cv_search_opendir+:} false; then :
-+  if test "${ac_cv_search_opendir+set}" = set; then :
-   break
- fi
- done
--if ${ac_cv_search_opendir+:} false; then :
-+if test "${ac_cv_search_opendir+set}" = set; then :
- 
- else
-   ac_cv_search_opendir=no
-@@ -6192,7 +6191,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 ${ac_cv_header_sys_types_h_makedev+:} false; then :
-+if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6220,7 +6219,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" = xyes; then :
-+if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then :
- 
- $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
- 
-@@ -6230,7 +6229,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" = xyes; then :
-+if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
- 
- $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
- 
-@@ -6250,7 +6249,7 @@ do :
- #endif
- 
- "
--if test "x$ac_cv_header_term_h" = xyes; then :
-+if test "x$ac_cv_header_term_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_TERM_H 1
- _ACEOF
-@@ -6272,7 +6271,7 @@ do :
- #endif
- 
- "
--if test "x$ac_cv_header_linux_netlink_h" = xyes; then :
-+if test "x$ac_cv_header_linux_netlink_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LINUX_NETLINK_H 1
- _ACEOF
-@@ -6438,7 +6437,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" = xyes; then :
-+if test "x$ac_cv_type_mode_t" = x""yes; then :
- 
- else
- 
-@@ -6449,7 +6448,7 @@ _ACEOF
- fi
- 
- ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
--if test "x$ac_cv_type_off_t" = xyes; then :
-+if test "x$ac_cv_type_off_t" = x""yes; then :
- 
- else
- 
-@@ -6460,7 +6459,7 @@ _ACEOF
- fi
- 
- ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
--if test "x$ac_cv_type_pid_t" = xyes; then :
-+if test "x$ac_cv_type_pid_t" = x""yes; then :
- 
- else
- 
-@@ -6476,7 +6475,7 @@ cat >>confdefs.h <<_ACEOF
- _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" = xyes; then :
-+if test "x$ac_cv_type_size_t" = x""yes; then :
- 
- else
- 
-@@ -6488,7 +6487,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 ${ac_cv_type_uid_t+:} false; then :
-+if test "${ac_cv_type_uid_t+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6567,7 +6566,7 @@ _ACEOF
- esac
- 
- ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
--if test "x$ac_cv_type_ssize_t" = xyes; then :
-+if test "x$ac_cv_type_ssize_t" = x""yes; then :
- 
- $as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h
- 
-@@ -6582,7 +6581,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 ${ac_cv_sizeof_int+:} false; then :
-+if test "${ac_cv_sizeof_int+set}" = set; 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 :
-@@ -6615,7 +6614,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 ${ac_cv_sizeof_long+:} false; then :
-+if test "${ac_cv_sizeof_long+set}" = set; 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 :
-@@ -6648,7 +6647,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 ${ac_cv_sizeof_void_p+:} false; then :
-+if test "${ac_cv_sizeof_void_p+set}" = set; 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 :
-@@ -6681,7 +6680,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 ${ac_cv_sizeof_short+:} false; then :
-+if test "${ac_cv_sizeof_short+set}" = set; 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 :
-@@ -6714,7 +6713,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 ${ac_cv_sizeof_float+:} false; then :
-+if test "${ac_cv_sizeof_float+set}" = set; 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 :
-@@ -6747,7 +6746,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 ${ac_cv_sizeof_double+:} false; then :
-+if test "${ac_cv_sizeof_double+set}" = set; 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 :
-@@ -6780,7 +6779,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 ${ac_cv_sizeof_fpos_t+:} false; then :
-+if test "${ac_cv_sizeof_fpos_t+set}" = set; 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 :
-@@ -6813,7 +6812,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 ${ac_cv_sizeof_size_t+:} false; then :
-+if test "${ac_cv_sizeof_size_t+set}" = set; 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 :
-@@ -6846,7 +6845,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 ${ac_cv_sizeof_pid_t+:} false; then :
-+if test "${ac_cv_sizeof_pid_t+set}" = set; 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 :
-@@ -6906,7 +6905,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 ${ac_cv_sizeof_long_long+:} false; then :
-+if test "${ac_cv_sizeof_long_long+set}" = set; 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 :
-@@ -6967,7 +6966,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 ${ac_cv_sizeof_long_double+:} false; then :
-+if test "${ac_cv_sizeof_long_double+set}" = set; 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 :
-@@ -7029,7 +7028,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 ${ac_cv_sizeof__Bool+:} false; then :
-+if test "${ac_cv_sizeof__Bool+set}" = set; 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 :
-@@ -7065,7 +7064,7 @@ ac_fn_c_check_type "$LINENO" "uintptr_t"
-         #include <inttypes.h>
-         #endif
- "
--if test "x$ac_cv_type_uintptr_t" = xyes; then :
-+if test "x$ac_cv_type_uintptr_t" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_UINTPTR_T 1
-@@ -7077,7 +7076,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 ${ac_cv_sizeof_uintptr_t+:} false; then :
-+if test "${ac_cv_sizeof_uintptr_t+set}" = set; 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 :
-@@ -7113,7 +7112,7 @@ fi
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
- $as_echo_n "checking size of off_t... " >&6; }
--if ${ac_cv_sizeof_off_t+:} false; then :
-+if test "${ac_cv_sizeof_off_t+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "
-@@ -7172,7 +7171,7 @@ fi
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
- $as_echo_n "checking size of time_t... " >&6; }
--if ${ac_cv_sizeof_time_t+:} false; then :
-+if test "${ac_cv_sizeof_time_t+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "
-@@ -7247,7 +7246,7 @@ if test "$have_pthread_t" = yes ; then
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_t" >&5
- $as_echo_n "checking size of pthread_t... " >&6; }
--if ${ac_cv_sizeof_pthread_t+:} false; then :
-+if test "${ac_cv_sizeof_pthread_t+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_t))" "ac_cv_sizeof_pthread_t"        "
-@@ -7694,7 +7693,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 ${ac_cv_lib_dl_dlopen+:} false; then :
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -7728,7 +7727,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" = xyes; then :
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDL 1
- _ACEOF
-@@ -7739,7 +7738,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 ${ac_cv_lib_dld_shl_load+:} false; then :
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -7773,7 +7772,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" = xyes; then :
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDLD 1
- _ACEOF
-@@ -7787,7 +7786,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 ${ac_cv_search_sem_init+:} false; then :
-+if test "${ac_cv_search_sem_init+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_func_search_save_LIBS=$LIBS
-@@ -7821,11 +7820,11 @@ for ac_lib in '' pthread rt posix4; do
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext
--  if ${ac_cv_search_sem_init+:} false; then :
-+  if test "${ac_cv_search_sem_init+set}" = set; then :
-   break
- fi
- done
--if ${ac_cv_search_sem_init+:} false; then :
-+if test "${ac_cv_search_sem_init+set}" = set; then :
- 
- else
-   ac_cv_search_sem_init=no
-@@ -7848,7 +7847,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 ${ac_cv_lib_intl_textdomain+:} false; then :
-+if test "${ac_cv_lib_intl_textdomain+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -7882,7 +7881,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" = xyes; then :
-+if test "x$ac_cv_lib_intl_textdomain" = x""yes; then :
- 
- $as_echo "#define WITH_LIBINTL 1" >>confdefs.h
- 
-@@ -7929,7 +7928,7 @@ esac
- # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
- { $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 ${ac_cv_lib_nsl_t_open+:} false; then :
-+if test "${ac_cv_lib_nsl_t_open+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -7963,13 +7962,13 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_nsl_t_open" = x""yes; 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 ${ac_cv_lib_socket_socket+:} false; then :
-+if test "${ac_cv_lib_socket_socket+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -8003,7 +8002,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" = xyes; then :
-+if test "x$ac_cv_lib_socket_socket" = x""yes; then :
-   LIBS="-lsocket $LIBS"
- fi
-  # SVR4 sockets
-@@ -8029,7 +8028,7 @@ if test -n "$ac_tool_prefix"; then
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_PKG_CONFIG+:} false; then :
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -8072,7 +8071,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
- set dummy pkg-config; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $ac_pt_PKG_CONFIG in
-@@ -8354,7 +8353,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" = xyes; then :
-+if test "x$ac_cv_header_cthreads_h" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     $as_echo "#define C_THREADS 1" >>confdefs.h
-@@ -8367,7 +8366,7 @@ $as_echo "#define HURD_C_THREADS 1" >>co
- else
- 
-     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" = xyes; then :
-+if test "x$ac_cv_header_mach_cthreads_h" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     $as_echo "#define C_THREADS 1" >>confdefs.h
-@@ -8411,7 +8410,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" = xyes; then :
-+if test "x$ac_cv_func_pthread_detach" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     posix_threads=yes
-@@ -8420,7 +8419,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 ${ac_cv_lib_pthreads_pthread_create+:} false; then :
-+if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -8454,7 +8453,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_pthreads_pthread_create" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     posix_threads=yes
-@@ -8464,7 +8463,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 ${ac_cv_lib_c_r_pthread_create+:} false; then :
-+if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -8498,7 +8497,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     posix_threads=yes
-@@ -8508,7 +8507,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 ${ac_cv_lib_pthread___pthread_create_system+:} false; then :
-+if test "${ac_cv_lib_pthread___pthread_create_system+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -8542,7 +8541,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_pthread___pthread_create_system" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     posix_threads=yes
-@@ -8552,7 +8551,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 ${ac_cv_lib_cma_pthread_create+:} false; then :
-+if test "${ac_cv_lib_cma_pthread_create+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -8586,7 +8585,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_cma_pthread_create" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     posix_threads=yes
-@@ -8618,7 +8617,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 ${ac_cv_lib_mpc_usconfig+:} false; then :
-+if test "${ac_cv_lib_mpc_usconfig+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -8652,7 +8651,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_mpc_usconfig" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-     LIBS="$LIBS -lmpc"
-@@ -8664,7 +8663,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 ${ac_cv_lib_thread_thr_create+:} false; then :
-+if test "${ac_cv_lib_thread_thr_create+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -8698,7 +8697,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_thread_thr_create" = x""yes; then :
-   $as_echo "#define WITH_THREAD 1" >>confdefs.h
- 
-       LIBS="$LIBS -lthread"
-@@ -8747,7 +8746,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 ${ac_cv_pthread_system_supported+:} false; then :
-+      if test "${ac_cv_pthread_system_supported+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -8790,7 +8789,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" = xyes; then :
-+if test "x$ac_cv_func_pthread_sigmask" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_PTHREAD_SIGMASK 1
- _ACEOF
-@@ -9143,6 +9142,50 @@ $as_echo "no" >&6; }
+@@ -9288,6 +9296,50 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -1296,16 +85,7 @@ diff -up ./configure.autotool-intermediates ./configure
  # Check for Python-specific malloc support
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5
  $as_echo_n "checking for --with-pymalloc... " >&6; }
-@@ -9182,7 +9225,7 @@ fi
- $as_echo "$with_valgrind" >&6; }
- if test "$with_valgrind" != no; then
-     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 :
-+if test "x$ac_cv_header_valgrind_valgrind_h" = x""yes; then :
- 
- $as_echo "#define WITH_VALGRIND 1" >>confdefs.h
- 
-@@ -9195,6 +9238,46 @@ fi
+@@ -9340,6 +9392,46 @@ fi
      OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
  fi
  
@@ -1352,1124 +132,9 @@ diff -up ./configure.autotool-intermediates ./configure
  # -I${DLINCLDIR} is added to the compile rule for importdl.o
  
  DLINCLDIR=.
-@@ -9204,7 +9287,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" = xyes; then :
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_DLOPEN 1
- _ACEOF
-@@ -9531,7 +9614,7 @@ rm -f core conftest.err conftest.$ac_obj
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock declaration" >&5
- $as_echo_n "checking for flock declaration... " >&6; }
--if ${ac_cv_flock_decl+:} false; then :
-+if test "${ac_cv_flock_decl+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9561,7 +9644,7 @@ if test "x${ac_cv_flock_decl}" = xyes; t
-   for ac_func in flock
- do :
-   ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
--if test "x$ac_cv_func_flock" = xyes; then :
-+if test "x$ac_cv_func_flock" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_FLOCK 1
- _ACEOF
-@@ -9569,7 +9652,7 @@ _ACEOF
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
- $as_echo_n "checking for flock in -lbsd... " >&6; }
--if ${ac_cv_lib_bsd_flock+:} false; then :
-+if test "${ac_cv_lib_bsd_flock+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -9603,7 +9686,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5
- $as_echo "$ac_cv_lib_bsd_flock" >&6; }
--if test "x$ac_cv_lib_bsd_flock" = xyes; then :
-+if test "x$ac_cv_lib_bsd_flock" = x""yes; then :
-   $as_echo "#define HAVE_FLOCK 1" >>confdefs.h
- 
- 
-@@ -9652,7 +9735,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 ${ac_cv_prog_TRUE+:} false; then :
-+if test "${ac_cv_prog_TRUE+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$TRUE"; then
-@@ -9692,7 +9775,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 ${ac_cv_lib_c_inet_aton+:} false; then :
-+if test "${ac_cv_lib_c_inet_aton+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -9726,12 +9809,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" = xyes; then :
-+if test "x$ac_cv_lib_c_inet_aton" = x""yes; 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 ${ac_cv_lib_resolv_inet_aton+:} false; then :
-+if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -9765,7 +9848,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" = xyes; then :
-+if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBRESOLV 1
- _ACEOF
-@@ -9782,7 +9865,7 @@ fi
- # exit Python
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5
- $as_echo_n "checking for chflags... " >&6; }
--if ${ac_cv_have_chflags+:} false; then :
-+if test "${ac_cv_have_chflags+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -9816,7 +9899,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" = xyes; then :
-+if test "x$ac_cv_func_chflags" = x""yes; then :
-   ac_cv_have_chflags="yes"
- else
-   ac_cv_have_chflags="no"
-@@ -9831,7 +9914,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5
- $as_echo_n "checking for lchflags... " >&6; }
--if ${ac_cv_have_lchflags+:} false; then :
-+if test "${ac_cv_have_lchflags+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -9865,7 +9948,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" = xyes; then :
-+if test "x$ac_cv_func_lchflags" = x""yes; then :
-   ac_cv_have_lchflags="yes"
- else
-   ac_cv_have_lchflags="no"
-@@ -9889,7 +9972,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 ${ac_cv_lib_z_inflateCopy+:} false; then :
-+if test "${ac_cv_lib_z_inflateCopy+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -9923,7 +10006,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" = xyes; then :
-+if test "x$ac_cv_lib_z_inflateCopy" = x""yes; then :
- 
- $as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h
- 
-@@ -10066,7 +10149,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" = xyes; then :
-+if test "x$ac_cv_func_openpty" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_OPENPTY 1
- _ACEOF
-@@ -10074,7 +10157,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 ${ac_cv_lib_util_openpty+:} false; then :
-+if test "${ac_cv_lib_util_openpty+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -10108,13 +10191,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" = xyes; then :
-+if test "x$ac_cv_lib_util_openpty" = x""yes; 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 ${ac_cv_lib_bsd_openpty+:} false; then :
-+if test "${ac_cv_lib_bsd_openpty+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -10148,7 +10231,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" = xyes; then :
-+if test "x$ac_cv_lib_bsd_openpty" = x""yes; then :
-   $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
-  LIBS="$LIBS -lbsd"
- fi
-@@ -10163,7 +10246,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" = xyes; then :
-+if test "x$ac_cv_func_forkpty" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_FORKPTY 1
- _ACEOF
-@@ -10171,7 +10254,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 ${ac_cv_lib_util_forkpty+:} false; then :
-+if test "${ac_cv_lib_util_forkpty+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -10205,13 +10288,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" = xyes; then :
-+if test "x$ac_cv_lib_util_forkpty" = x""yes; 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 ${ac_cv_lib_bsd_forkpty+:} false; then :
-+if test "${ac_cv_lib_bsd_forkpty+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -10245,7 +10328,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" = xyes; then :
-+if test "x$ac_cv_lib_bsd_forkpty" = x""yes; then :
-   $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
-  LIBS="$LIBS -lbsd"
- fi
-@@ -10262,7 +10345,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" = xyes; then :
-+if test "x$ac_cv_func_memmove" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_MEMMOVE 1
- _ACEOF
-@@ -10286,7 +10369,7 @@ done
- 
- 
- ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
--if test "x$ac_cv_func_dup2" = xyes; then :
-+if test "x$ac_cv_func_dup2" = x""yes; then :
-   $as_echo "#define HAVE_DUP2 1" >>confdefs.h
- 
- else
-@@ -10299,7 +10382,7 @@ esac
- fi
- 
- ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
--if test "x$ac_cv_func_getcwd" = xyes; then :
-+if test "x$ac_cv_func_getcwd" = x""yes; then :
-   $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
- 
- else
-@@ -10312,7 +10395,7 @@ esac
- fi
- 
- ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
--if test "x$ac_cv_func_strdup" = xyes; then :
-+if test "x$ac_cv_func_strdup" = x""yes; then :
-   $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
- 
- else
-@@ -10328,7 +10411,7 @@ fi
- for ac_func in getpgrp
- do :
-   ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
--if test "x$ac_cv_func_getpgrp" = xyes; then :
-+if test "x$ac_cv_func_getpgrp" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GETPGRP 1
- _ACEOF
-@@ -10356,7 +10439,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" = xyes; then :
-+if test "x$ac_cv_func_setpgrp" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_SETPGRP 1
- _ACEOF
-@@ -10384,7 +10467,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" = xyes; then :
-+if test "x$ac_cv_func_gettimeofday" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GETTIMEOFDAY 1
- _ACEOF
-@@ -10486,7 +10569,7 @@ if test $have_getaddrinfo = yes
- then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking getaddrinfo bug" >&5
- $as_echo_n "checking getaddrinfo bug... " >&6; }
--  if ${ac_cv_buggy_getaddrinfo+:} false; then :
-+  if test "${ac_cv_buggy_getaddrinfo+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -10615,7 +10698,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" = xyes; then :
-+if test "x$ac_cv_func_getnameinfo" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GETNAMEINFO 1
- _ACEOF
-@@ -10627,7 +10710,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 ${ac_cv_header_time+:} false; then :
-+if test "${ac_cv_header_time+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10662,7 +10745,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 ${ac_cv_struct_tm+:} false; then :
-+if test "${ac_cv_struct_tm+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10699,7 +10782,7 @@ ac_fn_c_check_member "$LINENO" "struct t
- #include <$ac_cv_struct_tm>
- 
- "
--if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
-+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -10715,7 +10798,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" = xyes; then :
-+if test "x$ac_cv_have_decl_tzname" = x""yes; then :
-   ac_have_decl=1
- else
-   ac_have_decl=0
-@@ -10727,7 +10810,7 @@ _ACEOF
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
- $as_echo_n "checking for tzname... " >&6; }
--if ${ac_cv_var_tzname+:} false; then :
-+if test "${ac_cv_var_tzname+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10763,7 +10846,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" = xyes; then :
-+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_RDEV 1
-@@ -10773,7 +10856,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" = xyes; then :
-+if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-@@ -10783,7 +10866,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" = xyes; then :
-+if test "x$ac_cv_member_struct_stat_st_flags" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_FLAGS 1
-@@ -10793,7 +10876,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" = xyes; then :
-+if test "x$ac_cv_member_struct_stat_st_gen" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_GEN 1
-@@ -10803,7 +10886,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" = xyes; then :
-+if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-@@ -10813,7 +10896,7 @@ _ACEOF
- fi
- 
- 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" = xyes; then :
-+if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-@@ -10835,7 +10918,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 ${ac_cv_header_time_altzone+:} false; then :
-+if test "${ac_cv_header_time_altzone+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -10899,7 +10982,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 ${ac_cv_struct_addrinfo+:} false; then :
-+if test "${ac_cv_struct_addrinfo+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10931,7 +11014,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5
- $as_echo_n "checking for sockaddr_storage... " >&6; }
--if ${ac_cv_struct_sockaddr_storage+:} false; then :
-+if test "${ac_cv_struct_sockaddr_storage+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10967,7 +11050,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 ${ac_cv_c_char_unsigned+:} false; then :
-+if test "${ac_cv_c_char_unsigned+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10999,7 +11082,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 ${ac_cv_c_const+:} false; then :
-+if test "${ac_cv_c_const+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11287,7 +11370,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" = xyes; then :
-+if test "x$ac_cv_func_gethostbyname_r" = x""yes; then :
- 
-   $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
- 
-@@ -11418,7 +11501,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" = xyes; then :
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GETHOSTBYNAME 1
- _ACEOF
-@@ -11440,12 +11523,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" = xyes; then :
-+if test "x$ac_cv_func___fpu_control" = x""yes; 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 ${ac_cv_lib_ieee___fpu_control+:} false; then :
-+if test "${ac_cv_lib_ieee___fpu_control+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -11479,7 +11562,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" = xyes; then :
-+if test "x$ac_cv_lib_ieee___fpu_control" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBIEEE 1
- _ACEOF
-@@ -11573,7 +11656,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C doubles are little-endian IEEE 754 binary64" >&5
- $as_echo_n "checking whether C doubles are little-endian IEEE 754 binary64... " >&6; }
--if ${ac_cv_little_endian_double+:} false; then :
-+if test "${ac_cv_little_endian_double+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -11615,7 +11698,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C doubles are big-endian IEEE 754 binary64" >&5
- $as_echo_n "checking whether C doubles are big-endian IEEE 754 binary64... " >&6; }
--if ${ac_cv_big_endian_double+:} false; then :
-+if test "${ac_cv_big_endian_double+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -11661,7 +11744,7 @@ fi
- # conversions work.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C doubles are ARM mixed-endian IEEE 754 binary64" >&5
- $as_echo_n "checking whether C doubles are ARM mixed-endian IEEE 754 binary64... " >&6; }
--if ${ac_cv_mixed_endian_double+:} false; then :
-+if test "${ac_cv_mixed_endian_double+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -11831,7 +11914,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" = xyes; then :
-+if test "x$ac_cv_have_decl_isinf" = x""yes; then :
-   ac_have_decl=1
- else
-   ac_have_decl=0
-@@ -11842,7 +11925,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" = xyes; then :
-+if test "x$ac_cv_have_decl_isnan" = x""yes; then :
-   ac_have_decl=1
- else
-   ac_have_decl=0
-@@ -11853,7 +11936,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" = xyes; then :
-+if test "x$ac_cv_have_decl_isfinite" = x""yes; then :
-   ac_have_decl=1
- else
-   ac_have_decl=0
-@@ -11868,7 +11951,7 @@ _ACEOF
- # -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 ${ac_cv_tanh_preserves_zero_sign+:} false; then :
-+if test "${ac_cv_tanh_preserves_zero_sign+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -11916,7 +11999,7 @@ then
-     # -0.  See issue #9920.
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether log1p drops the sign of negative zero" >&5
- $as_echo_n "checking whether log1p drops the sign of negative zero... " >&6; }
--    if ${ac_cv_log1p_drops_zero_sign+:} false; then :
-+    if test "${ac_cv_log1p_drops_zero_sign+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -11968,7 +12051,7 @@ LIBS=$LIBS_SAVE
- # sem_open results in a 'Signal 12' error.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX semaphores are enabled" >&5
- $as_echo_n "checking whether POSIX semaphores are enabled... " >&6; }
--if ${ac_cv_posix_semaphores_enabled+:} false; then :
-+if test "${ac_cv_posix_semaphores_enabled+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -12019,7 +12102,7 @@ fi
- # Multiprocessing check for broken sem_getvalue
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken sem_getvalue" >&5
- $as_echo_n "checking for broken sem_getvalue... " >&6; }
--if ${ac_cv_broken_sem_getvalue+:} false; then :
-+if test "${ac_cv_broken_sem_getvalue+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -12102,7 +12185,7 @@ fi
- 
- # 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" = xyes; then :
-+if test "x$ac_cv_header_wchar_h" = x""yes; then :
- 
- 
- $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
-@@ -12125,7 +12208,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 ${ac_cv_sizeof_wchar_t+:} false; then :
-+if test "${ac_cv_sizeof_wchar_t+set}" = set; 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>
-@@ -12191,7 +12274,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 ${ac_cv_wchar_t_signed+:} false; then :
-+  if test "${ac_cv_wchar_t_signed+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -12287,7 +12370,7 @@ $as_echo "$PY_UNICODE_TYPE" >&6; }
- # 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 ${ac_cv_c_bigendian+:} false; then :
-+if test "${ac_cv_c_bigendian+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_c_bigendian=unknown
-@@ -12578,7 +12661,7 @@ $as_echo "$SO" >&6; }
- # 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 ${ac_cv_rshift_extends_sign+:} false; then :
-+if test "${ac_cv_rshift_extends_sign+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -12617,7 +12700,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 ${ac_cv_have_getc_unlocked+:} false; then :
-+if test "${ac_cv_have_getc_unlocked+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -12715,7 +12798,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 ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then :
-+if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12749,7 +12832,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" = xyes; then :
-+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
- 
- $as_echo "#define HAVE_RL_CALLBACK 1" >>confdefs.h
- 
-@@ -12767,7 +12850,7 @@ else
-   have_readline=no
- 
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if test $have_readline = yes
- then
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12801,7 +12884,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 ${ac_cv_lib_readline_rl_pre_input_hook+:} false; then :
-+if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12835,7 +12918,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" = xyes; then :
-+if test "x$ac_cv_lib_readline_rl_pre_input_hook" = x""yes; then :
- 
- $as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h
- 
-@@ -12845,7 +12928,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 ${ac_cv_lib_readline_rl_completion_display_matches_hook+:} false; then :
-+if test "${ac_cv_lib_readline_rl_completion_display_matches_hook+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12879,7 +12962,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" = xyes; then :
-+if test "x$ac_cv_lib_readline_rl_completion_display_matches_hook" = x""yes; then :
- 
- $as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h
- 
-@@ -12889,7 +12972,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 ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
-+if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -12923,7 +13006,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $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" = xyes; then :
-+if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
- 
- $as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
- 
-@@ -12941,7 +13024,7 @@ else
-   have_readline=no
- 
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if test $have_readline = yes
- then
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12964,7 +13047,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 ${ac_cv_broken_nice+:} false; then :
-+if test "${ac_cv_broken_nice+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -13005,7 +13088,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5
- $as_echo_n "checking for broken poll()... " >&6; }
--if ${ac_cv_broken_poll+:} false; then :
-+if test "${ac_cv_broken_poll+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -13060,7 +13143,7 @@ ac_fn_c_check_member "$LINENO" "struct t
- #include <$ac_cv_struct_tm>
- 
- "
--if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
-+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -13076,7 +13159,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" = xyes; then :
-+if test "x$ac_cv_have_decl_tzname" = x""yes; then :
-   ac_have_decl=1
- else
-   ac_have_decl=0
-@@ -13088,7 +13171,7 @@ _ACEOF
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
- $as_echo_n "checking for tzname... " >&6; }
--if ${ac_cv_var_tzname+:} false; then :
-+if test "${ac_cv_var_tzname+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13127,7 +13210,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 ${ac_cv_working_tzset+:} false; then :
-+if test "${ac_cv_working_tzset+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -13224,7 +13307,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 ${ac_cv_stat_tv_nsec+:} false; then :
-+if test "${ac_cv_stat_tv_nsec+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13261,7 +13344,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 ${ac_cv_stat_tv_nsec2+:} false; then :
-+if test "${ac_cv_stat_tv_nsec2+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13298,7 +13381,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 ${ac_cv_mvwdelch_is_expression+:} false; then :
-+if test "${ac_cv_mvwdelch_is_expression+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13335,7 +13418,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 ${ac_cv_window_has_flags+:} false; then :
-+if test "${ac_cv_window_has_flags+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13483,7 +13566,7 @@ if test "$have_long_long" = yes
- then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for %lld and %llu printf() format support" >&5
- $as_echo_n "checking for %lld and %llu printf() format support... " >&6; }
--  if ${ac_cv_have_long_long_format+:} false; then :
-+  if test "${ac_cv_have_long_long_format+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -13553,7 +13636,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5
- $as_echo_n "checking for %zd printf() format support... " >&6; }
--if ${ac_cv_have_size_t_format+:} false; then :
-+if test "${ac_cv_have_size_t_format+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -13626,7 +13709,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t"
- #endif
- 
- "
--if test "x$ac_cv_type_socklen_t" = xyes; then :
-+if test "x$ac_cv_type_socklen_t" = x""yes; then :
- 
- else
- 
-@@ -13637,7 +13720,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken mbstowcs" >&5
- $as_echo_n "checking for broken mbstowcs... " >&6; }
--if ${ac_cv_broken_mbstowcs+:} false; then :
-+if test "${ac_cv_broken_mbstowcs+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -13677,7 +13760,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5
- $as_echo_n "checking whether $CC supports computed gotos... " >&6; }
--if ${ac_cv_computed_gotos+:} false; then :
-+if test "${ac_cv_computed_gotos+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-@@ -13761,7 +13844,7 @@ case $ac_sys_system in
- esac
- 
- ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2"
--if test "x$ac_cv_func_pipe2" = xyes; then :
-+if test "x$ac_cv_func_pipe2" = x""yes; then :
- 
- $as_echo "#define HAVE_PIPE2 1" >>confdefs.h
- 
-@@ -13856,21 +13939,10 @@ $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
--    if test "x$cache_file" != "x/dev/null"; then
-+    test "x$cache_file" != "x/dev/null" &&
-       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
- $as_echo "$as_me: updating cache $cache_file" >&6;}
--      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
-+    cat confcache >$cache_file
-   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;}
-@@ -13903,7 +13975,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"
-@@ -14004,7 +14076,6 @@ 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
-@@ -14312,7 +14383,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by python $as_me 3.2, which was
--generated by GNU Autoconf 2.68.  Invocation command line was
-+generated by GNU Autoconf 2.66.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -14374,7 +14445,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- python config.status 3.2
--configured by $0, generated by GNU Autoconf 2.68,
-+configured by $0, generated by GNU Autoconf 2.66,
-   with options \\"\$ac_cs_config\\"
- 
- Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -14393,16 +14464,11 @@ 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
-@@ -14424,7 +14490,6 @@ 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;;
-@@ -14527,10 +14592,9 @@ fi
- # after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
--  tmp= ac_tmp=
-+  tmp=
-   trap 'exit_status=$?
--  : "${ac_tmp:=$tmp}"
--  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
- ' 0
-   trap 'as_fn_exit 1' 1 2 13 15
- }
-@@ -14538,13 +14602,12 @@ $debug ||
- 
- {
-   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
--  test -d "$tmp"
-+  test -n "$tmp" && test -d "$tmp"
- }  ||
- {
-   tmp=./conf$$-$RANDOM
-   (umask 077 && mkdir "$tmp")
- } || 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.
-@@ -14566,7 +14629,7 @@ else
-   ac_cs_awk_cr=$ac_cr
- fi
- 
--echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
- _ACEOF
- 
- 
-@@ -14594,7 +14657,7 @@ done
- rm -f conf$$subs.sh
- 
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
- _ACEOF
- sed -n '
- h
-@@ -14642,7 +14705,7 @@ t delim
- rm -f conf$$subs.awk
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- _ACAWK
--cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-   for (key in S) S_is_set[key] = 1
-   FS = ""
- 
-@@ -14674,7 +14737,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
-   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
- else
-   cat
--fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
- _ACEOF
- 
-@@ -14708,7 +14771,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 >"$ac_tmp/defines.awk" <<\_ACAWK ||
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
- BEGIN {
- _ACEOF
- 
-@@ -14720,8 +14783,8 @@ _ACEOF
- # handling of long lines.
- ac_delim='%!_!# '
- for ac_last_try in false false :; do
--  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
--  if test -z "$ac_tt"; then
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
-     break
-   elif $ac_last_try; then
-     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-@@ -14841,7 +14904,7 @@ do
-     for ac_f
-     do
-       case $ac_f in
--      -) ac_f="$ac_tmp/stdin";;
-+      -) ac_f="$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 `:'.
-@@ -14876,7 +14939,7 @@ $as_echo "$as_me: creating $ac_file" >&6
-     esac
- 
-     case $ac_tag in
--    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-     esac
-     ;;
-@@ -15007,22 +15070,21 @@ 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 "$ac_tmp/subs.awk" \
--  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+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
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
--  { 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"; } &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$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
- $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;}
- 
--  rm -f "$ac_tmp/stdin"
-+  rm -f "$tmp/stdin"
-   case $ac_file in
--  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
--  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-   esac \
-   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-  ;;
-@@ -15033,20 +15095,20 @@ which seems to be undefined.  Please mak
-   if test x"$ac_file" != x-; then
-     {
-       $as_echo "/* $configure_input  */" \
--      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
--    } >"$ac_tmp/config.h" \
-+      && 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" "$ac_tmp/config.h" >/dev/null 2>&1; then
-+    if diff "$ac_file" "$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 "$ac_tmp/config.h" "$ac_file" \
-+      mv "$tmp/config.h" "$ac_file" \
- 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-     fi
-   else
-     $as_echo "/* $configure_input  */" \
--      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-       || as_fn_error $? "could not create -" "$LINENO" 5
-   fi
-  ;;
 diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
---- ./pyconfig.h.in.autotool-intermediates	2011-02-21 15:46:09.350743001 -0500
-+++ ./pyconfig.h.in	2011-02-21 15:46:15.477743000 -0500
+--- ./pyconfig.h.in.autotool-intermediates	2012-04-11 20:50:28.710233464 -0400
++++ ./pyconfig.h.in	2012-04-11 20:50:32.551185446 -0400
 @@ -12,15 +12,15 @@
     support for AIX C++ shared extension modules. */
  #undef AIX_GENUINE_CPLUSPLUS
@@ -2489,13 +154,3 @@ diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
  /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM
     mixed-endian order (byte order 45670123) */
  #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
-@@ -1161,6 +1161,9 @@
- /* This must be defined on some systems to enable large file support. */
- #undef _LARGEFILE_SOURCE
- 
-+/* This must be defined on AIX systems to enable large file support. */
-+#undef _LARGE_FILES
-+
- /* Define to 1 if on MINIX. */
- #undef _MINIX
- 
diff --git a/python-3.2rc1-no-static-lib.patch b/python-3.2.1-no-static-lib.patch
similarity index 66%
rename from python-3.2rc1-no-static-lib.patch
rename to python-3.2.1-no-static-lib.patch
index 5b32bc7..3a6ac8a 100644
--- a/python-3.2rc1-no-static-lib.patch
+++ b/python-3.2.1-no-static-lib.patch
@@ -1,7 +1,7 @@
-diff -up Python-3.2rc1/Makefile.pre.in.no-static-lib Python-3.2rc1/Makefile.pre.in
---- Python-3.2rc1/Makefile.pre.in.no-static-lib	2010-12-30 17:12:40.000000000 -0500
-+++ Python-3.2rc1/Makefile.pre.in	2011-01-17 12:58:32.123947161 -0500
-@@ -421,7 +421,7 @@ coverage:
+diff -up Python-3.2.1/Makefile.pre.in.no-static-lib Python-3.2.1/Makefile.pre.in
+--- Python-3.2.1/Makefile.pre.in.no-static-lib	2011-07-09 02:58:52.000000000 -0400
++++ Python-3.2.1/Makefile.pre.in	2011-07-11 11:46:27.381425999 -0400
+@@ -425,7 +425,7 @@ coverage:
  
  
  # Build the interpreter
@@ -10,7 +10,7 @@ diff -up Python-3.2rc1/Makefile.pre.in.no-static-lib Python-3.2rc1/Makefile.pre.
  	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
  platform: $(BUILDPYTHON)
-@@ -435,18 +435,6 @@ sharedmods: $(BUILDPYTHON)
+@@ -439,18 +439,6 @@ sharedmods: $(BUILDPYTHON)
  	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
  	esac
  
@@ -29,7 +29,16 @@ diff -up Python-3.2rc1/Makefile.pre.in.no-static-lib Python-3.2rc1/Makefile.pre.
  libpython$(LDVERSION).so: $(LIBRARY_OBJS)
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
  		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -1048,18 +1036,6 @@ libainstall:	all python-config
+@@ -540,7 +528,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.d
+ 		echo "-----------------------------------------------"; \
+ 	fi
+ 
+-Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
++Modules/_testembed: Modules/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
+ 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ ############################################################################
+@@ -1058,18 +1046,6 @@ libainstall:	all python-config
  		else	true; \
  		fi; \
  	done
diff --git a/python-3.2.3-fix-test-subprocess-with-nonreadable-path-dir.patch b/python-3.2.3-fix-test-subprocess-with-nonreadable-path-dir.patch
new file mode 100644
index 0000000..3a6f110
--- /dev/null
+++ b/python-3.2.3-fix-test-subprocess-with-nonreadable-path-dir.patch
@@ -0,0 +1,12 @@
+diff -up Python-3.2.3/Lib/test/test_subprocess.py.test_subprocess Python-3.2.3/Lib/test/test_subprocess.py
+--- Python-3.2.3/Lib/test/test_subprocess.py.test_subprocess	2012-04-11 02:54:05.000000000 -0400
++++ Python-3.2.3/Lib/test/test_subprocess.py	2012-04-11 20:48:38.408612425 -0400
+@@ -651,7 +651,7 @@ class ProcessTestCase(BaseTestCase):
+         for i in range(1024):
+             # Windows raises IOError.  Others raise OSError.
+             with self.assertRaises(EnvironmentError) as c:
+-                subprocess.Popen(['nonexisting_i_hope'],
++                subprocess.Popen(['/usr/bin/nonexisting_i_hope'],
+                                  stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE)
+             # ignore errors that indicate the command was not found
diff --git a/python-3.2b2-lib64.patch b/python-3.2.3-lib64.patch
similarity index 74%
rename from python-3.2b2-lib64.patch
rename to python-3.2.3-lib64.patch
index 8d4e91f..5c3cf13 100644
--- a/python-3.2b2-lib64.patch
+++ b/python-3.2.3-lib64.patch
@@ -1,7 +1,7 @@
-diff -up Python-3.2b2/Lib/distutils/command/install.py.lib64 Python-3.2b2/Lib/distutils/command/install.py
---- Python-3.2b2/Lib/distutils/command/install.py.lib64	2010-11-24 22:46:44.000000000 -0500
-+++ Python-3.2b2/Lib/distutils/command/install.py	2010-12-29 10:21:55.510184563 -0500
-@@ -47,14 +47,14 @@ else:
+diff -up Python-3.2.3/Lib/distutils/command/install.py.lib64 Python-3.2.3/Lib/distutils/command/install.py
+--- Python-3.2.3/Lib/distutils/command/install.py.lib64	2012-04-11 02:54:02.000000000 -0400
++++ Python-3.2.3/Lib/distutils/command/install.py	2012-04-11 19:01:19.727107020 -0400
+@@ -45,14 +45,14 @@ else:
  INSTALL_SCHEMES = {
      'unix_prefix': {
          'purelib': '$base/lib/python$py_version_short/site-packages',
@@ -18,10 +18,10 @@ diff -up Python-3.2b2/Lib/distutils/command/install.py.lib64 Python-3.2b2/Lib/di
          'headers': '$base/include/python/$dist_name',
          'scripts': '$base/bin',
          'data'   : '$base',
-diff -up Python-3.2b2/Lib/distutils/sysconfig.py.lib64 Python-3.2b2/Lib/distutils/sysconfig.py
---- Python-3.2b2/Lib/distutils/sysconfig.py.lib64	2010-11-24 14:43:47.000000000 -0500
-+++ Python-3.2b2/Lib/distutils/sysconfig.py	2010-12-29 10:21:55.510184563 -0500
-@@ -124,8 +124,12 @@ def get_python_lib(plat_specific=0, stan
+diff -up Python-3.2.3/Lib/distutils/sysconfig.py.lib64 Python-3.2.3/Lib/distutils/sysconfig.py
+--- Python-3.2.3/Lib/distutils/sysconfig.py.lib64	2012-04-11 02:54:02.000000000 -0400
++++ Python-3.2.3/Lib/distutils/sysconfig.py	2012-04-11 19:01:19.727107020 -0400
+@@ -122,8 +122,12 @@ def get_python_lib(plat_specific=0, stan
          prefix = plat_specific and EXEC_PREFIX or PREFIX
  
      if os.name == "posix":
@@ -35,10 +35,10 @@ diff -up Python-3.2b2/Lib/distutils/sysconfig.py.lib64 Python-3.2b2/Lib/distutil
          if standard_lib:
              return libpython
          else:
-diff -up Python-3.2b2/Lib/site.py.lib64 Python-3.2b2/Lib/site.py
---- Python-3.2b2/Lib/site.py.lib64	2010-10-12 18:23:23.000000000 -0400
-+++ Python-3.2b2/Lib/site.py	2010-12-29 10:21:55.511184595 -0500
-@@ -275,12 +275,16 @@ def getsitepackages():
+diff -up Python-3.2.3/Lib/site.py.lib64 Python-3.2.3/Lib/site.py
+--- Python-3.2.3/Lib/site.py.lib64	2012-04-11 02:54:03.000000000 -0400
++++ Python-3.2.3/Lib/site.py	2012-04-11 19:01:19.728107008 -0400
+@@ -285,12 +285,16 @@ def getsitepackages():
          if sys.platform in ('os2emx', 'riscos'):
              sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
          elif os.sep == '/':
@@ -55,9 +55,9 @@ diff -up Python-3.2b2/Lib/site.py.lib64 Python-3.2b2/Lib/site.py
              sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
          if sys.platform == "darwin":
              # for framework builds *only* we add the standard Apple
-diff -up Python-3.2b2/Lib/sysconfig.py.lib64 Python-3.2b2/Lib/sysconfig.py
---- Python-3.2b2/Lib/sysconfig.py.lib64	2010-11-24 20:34:47.000000000 -0500
-+++ Python-3.2b2/Lib/sysconfig.py	2010-12-29 10:21:55.512184877 -0500
+diff -up Python-3.2.3/Lib/sysconfig.py.lib64 Python-3.2.3/Lib/sysconfig.py
+--- Python-3.2.3/Lib/sysconfig.py.lib64	2012-04-11 02:54:03.000000000 -0400
++++ Python-3.2.3/Lib/sysconfig.py	2012-04-11 19:01:19.728107008 -0400
 @@ -21,10 +21,10 @@ __all__ = [
  
  _INSTALL_SCHEMES = {
@@ -86,13 +86,13 @@ diff -up Python-3.2b2/Lib/sysconfig.py.lib64 Python-3.2b2/Lib/sysconfig.py
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data'   : '{userbase}',
-diff -up Python-3.2b2/Lib/test/test_site.py.lib64 Python-3.2b2/Lib/test/test_site.py
---- Python-3.2b2/Lib/test/test_site.py.lib64	2010-12-29 10:35:12.417308989 -0500
-+++ Python-3.2b2/Lib/test/test_site.py	2010-12-29 10:36:27.124059073 -0500
-@@ -164,12 +164,15 @@ class HelperFunctionsTests(unittest.Test
-             wanted = os.path.join('xoxo', 'Lib', 'site-packages')
-             self.assertEqual(dirs[0], wanted)
+diff -up Python-3.2.3/Lib/test/test_site.py.lib64 Python-3.2.3/Lib/test/test_site.py
+--- Python-3.2.3/Lib/test/test_site.py.lib64	2012-04-11 02:54:05.000000000 -0400
++++ Python-3.2.3/Lib/test/test_site.py	2012-04-11 19:02:01.413585869 -0400
+@@ -236,12 +236,15 @@ class HelperFunctionsTests(unittest.Test
+             self.assertEqual(dirs[2], wanted)
          elif os.sep == '/':
+             # OS X non-framwework builds, Linux, FreeBSD, etc
 -            self.assertEqual(len(dirs), 2)
 -            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
 +            self.assertEqual(len(dirs), 3)
@@ -106,12 +106,12 @@ diff -up Python-3.2b2/Lib/test/test_site.py.lib64 Python-3.2b2/Lib/test/test_sit
 +            wanted = os.path.join('xoxo', 'lib', 'site-python')
 +            self.assertEqual(dirs[2], wanted)
          else:
+             # other platforms
              self.assertEqual(len(dirs), 2)
-             self.assertEqual(dirs[0], 'xoxo')
-diff -up Python-3.2b2/Makefile.pre.in.lib64 Python-3.2b2/Makefile.pre.in
---- Python-3.2b2/Makefile.pre.in.lib64	2010-12-29 10:21:55.506183982 -0500
-+++ Python-3.2b2/Makefile.pre.in	2010-12-29 10:21:55.512184877 -0500
-@@ -102,7 +102,7 @@ LIBDIR=		@libdir@
+diff -up Python-3.2.3/Makefile.pre.in.lib64 Python-3.2.3/Makefile.pre.in
+--- Python-3.2.3/Makefile.pre.in.lib64	2012-04-11 19:01:19.722107084 -0400
++++ Python-3.2.3/Makefile.pre.in	2012-04-11 19:01:19.729106996 -0400
+@@ -106,7 +106,7 @@ LIBDIR=		@libdir@
  MANDIR=		@mandir@
  INCLUDEDIR=	@includedir@
  CONFINCLUDEDIR=	$(exec_prefix)/include
@@ -120,9 +120,9 @@ diff -up Python-3.2b2/Makefile.pre.in.lib64 Python-3.2b2/Makefile.pre.in
  ABIFLAGS=	@ABIFLAGS@
  
  # Detailed destination directories
-diff -up Python-3.2b2/Modules/getpath.c.lib64 Python-3.2b2/Modules/getpath.c
---- Python-3.2b2/Modules/getpath.c.lib64	2010-12-03 15:14:31.000000000 -0500
-+++ Python-3.2b2/Modules/getpath.c	2010-12-29 10:21:55.513184358 -0500
+diff -up Python-3.2.3/Modules/getpath.c.lib64 Python-3.2.3/Modules/getpath.c
+--- Python-3.2.3/Modules/getpath.c.lib64	2012-04-11 02:54:07.000000000 -0400
++++ Python-3.2.3/Modules/getpath.c	2012-04-11 19:01:19.729106996 -0400
 @@ -122,8 +122,8 @@
  #endif
  
@@ -134,16 +134,16 @@ diff -up Python-3.2b2/Modules/getpath.c.lib64 Python-3.2b2/Modules/getpath.c
  #endif
  
  #ifndef LANDMARK
-@@ -134,7 +134,7 @@ static wchar_t prefix[MAXPATHLEN+1];
- static wchar_t exec_prefix[MAXPATHLEN+1];
+@@ -135,7 +135,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1]
  static wchar_t progpath[MAXPATHLEN+1];
  static wchar_t *module_search_path = NULL;
+ static int module_search_path_malloced = 0;
 -static wchar_t *lib_python = L"lib/python" VERSION;
 +static wchar_t *lib_python = L"lib64/python" VERSION;
  
  static void
  reduce(wchar_t *dir)
-@@ -582,7 +582,7 @@ calculate_path(void)
+@@ -583,7 +583,7 @@ calculate_path(void)
      }
      else
          wcsncpy(zip_path, _prefix, MAXPATHLEN);
@@ -152,7 +152,7 @@ diff -up Python-3.2b2/Modules/getpath.c.lib64 Python-3.2b2/Modules/getpath.c
      bufsz = wcslen(zip_path);   /* Replace "00" with version */
      zip_path[bufsz - 6] = VERSION[0];
      zip_path[bufsz - 5] = VERSION[2];
-@@ -592,7 +592,7 @@ calculate_path(void)
+@@ -593,7 +593,7 @@ calculate_path(void)
              fprintf(stderr,
                  "Could not find platform dependent libraries <exec_prefix>\n");
          wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
@@ -161,19 +161,19 @@ diff -up Python-3.2b2/Modules/getpath.c.lib64 Python-3.2b2/Modules/getpath.c
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
  
-diff -up Python-3.2b2/setup.py.lib64 Python-3.2b2/setup.py
---- Python-3.2b2/setup.py.lib64	2010-12-04 13:36:03.000000000 -0500
-+++ Python-3.2b2/setup.py	2010-12-29 10:21:55.514184248 -0500
-@@ -373,7 +373,7 @@ class PyBuildExt(build_ext):
+diff -up Python-3.2.3/setup.py.lib64 Python-3.2.3/setup.py
+--- Python-3.2.3/setup.py.lib64	2012-04-11 02:54:08.000000000 -0400
++++ Python-3.2.3/setup.py	2012-04-11 19:01:19.730106984 -0400
+@@ -396,7 +396,7 @@ class PyBuildExt(build_ext):
          # Ensure that /usr/local is always used, but the local build
          # directories (i.e. '.' and 'Include') must be first.  See issue
          # 10520.
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 +        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
          add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+         self.add_multiarch_paths()
  
-         # Add paths specified in the environment variables LDFLAGS and
-@@ -619,11 +619,11 @@ class PyBuildExt(build_ext):
+@@ -643,11 +643,11 @@ class PyBuildExt(build_ext):
              elif curses_library:
                  readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
@@ -187,7 +187,7 @@ diff -up Python-3.2b2/setup.py.lib64 Python-3.2b2/setup.py
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -660,8 +660,8 @@ class PyBuildExt(build_ext):
+@@ -684,8 +684,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/python3.spec b/python3.spec
index 78985f6..0effcc7 100644
--- a/python3.spec
+++ b/python3.spec
@@ -110,8 +110,8 @@
 
 Summary: Version 3 of the Python programming language aka Python 3000
 Name: python3
-Version: %{pybasever}
-Release: 3%{?dist}
+Version: %{pybasever}.3
+Release: 1%{?dist}
 License: Python
 Group: Development/Languages
 Source: http://python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
@@ -176,7 +176,7 @@ Patch3: python-3.2b2-remove-mimeaudio-tests.patch
 
 # Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
 # a libpythonMAJOR.MINOR.a (bug 550692):
-Patch6: python-3.2rc1-no-static-lib.patch
+Patch6: python-3.2.1-no-static-lib.patch
 
 # Systemtap support: add statically-defined probe points
 # Patch based on upstream bug: http://bugs.python.org/issue4111
@@ -185,7 +185,7 @@ Patch6: python-3.2rc1-no-static-lib.patch
 # dmalcolm
 Patch8: python-3.2b2-systemtap.patch
 
-Patch102: python-3.2b2-lib64.patch
+Patch102: python-3.2.3-lib64.patch
 
 # Add configure-time support for the COUNT_ALLOCS and CALL_PROFILE options
 # described at http://svn.python.org/projects/python/trunk/Misc/SpecialBuilds.txt
@@ -227,7 +227,33 @@ Patch128: python-3.2b2-test_sys-COUNT_ALLOCS.patch
 # Work around this by specifying an absolute path for the non-existant
 # executable
 # Not yet sent upstream
-Patch129: python-3.2b2-fix-test-subprocess-with-nonreadable-path-dir.patch
+Patch129: python-3.2.3-fix-test-subprocess-with-nonreadable-path-dir.patch
+
+# Add non-standard hooks to unittest for use in the "check" phase below, when
+# running selftests within the build:
+#   @unittest._skipInRpmBuild(reason)
+# for tests that hang or fail intermittently within the build environment, and:
+#   @unittest._expectedFailureInRpmBuild
+# for tests that always fail within the build environment
+#
+# The hooks only take effect if WITHIN_PYTHON_RPM_BUILD is set in the
+# environment, which we set manually in the appropriate portion of the "check"
+# phase below (and which potentially other python-* rpms could set, to reuse
+# these unittest hooks in their own "check" phases)
+Patch132: 00132-add-rpmbuild-hooks-to-unittest.patch
+
+# Fix a regex in test_gdb so that it doesn't choke when gdb provides a full
+# path to Python/bltinmodule.c:
+Patch152: 00152-fix-test-gdb-regex.patch
+
+# Strip out lines of the form "warning: Unable to open ..." from gdb's stderr
+# when running test_gdb.py; also cope with change to gdb in F17 onwards in
+# which values are printed as "v at entry" rather than just "v":
+Patch153: 00153-fix-test_gdb-noise.patch
+
+# Skip a test that requires sane DNS during rpmbuild, since this was failing
+# inside Koji for some reason:
+Patch154: 00154-skip-urllib-test-requiring-working-DNS.patch
 
 # This is the generated patch to "configure"; see the description of
 #   %{regenerate_autotooling_patch}
@@ -397,6 +423,12 @@ rm -r Modules/zlib || exit 1
 %patch128 -p1
 %patch129 -p1
 
+%patch132 -p1
+
+%patch152 -p0
+%patch153 -p0
+%patch154 -p1
+
 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
 # are many differences between 2.6 and the Python 3 library.
 #
@@ -848,8 +880,12 @@ CheckPython() {
   # Note that we're running the tests using the version of the code in the builddir,
   # not in the buildroot.
 
-  # Run the upstream test suite
-  LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest -x $EXCLUDED_TESTS
+  # Run the upstream test suite, setting "WITHIN_PYTHON_RPM_BUILD" so that the
+  # our non-standard decorators take effect on the relevant tests:
+  #   @unittest._skipInRpmBuild(reason)
+  #   @unittest._expectedFailureInRpmBuild
+  WITHIN_PYTHON_RPM_BUILD= \
+  LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest -v -x $EXCLUDED_TESTS
 
   echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
 
@@ -1221,6 +1257,13 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Thu Apr 12 2012 David Malcolm <dmalcolm at redhat.com> - 3.2.3-1
+- 3.2.3; refresh patch 6 (no static lib), patch 102 (lib64) and patch 129
+(test_subprocess); fix test_gdb (patches 152 and 153); regenerate the autotool
+intermediates patch (patch 300); run unit tests verbosely; add support for
+skipping unit tests in rpmbuild (patch 132), use it to skip a specific urllib
+test (patch 154)
+
 * Sun Oct 09 2011 Daniel Drake <dsd at laptop.org> - 3.2-3
 - don't run test_openpty and test_pty in %%check
 - exclude failing tests on ARM
diff --git a/sources b/sources
index 48f3848..ed93ba8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92e94b5b6652b96349d6362b8337811d  Python-3.2.tar.bz2
+cea34079aeb2e21e7b60ee82a0ac286b  Python-3.2.3.tar.bz2


More information about the scm-commits mailing list