[python/f19] Updated to Python 2.7.4.
Bohuslav Kabrda
bkabrda at fedoraproject.org
Thu Apr 11 09:12:57 UTC 2013
commit 6a2d1e30e2f875f6cf79e50b048aa95cd7720865
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Tue Apr 9 10:54:58 2013 +0200
Updated to Python 2.7.4.
- Refreshed patches: 0 (config), 7 (sqlite encoding), 16 (rpath in config),
55 (systemtap), 111 (no static lib), 112 (debug build), 113 (more
configuration flags), 130 (add extension to python config), 134 (fix
COUNT_ALLOCS in test_sys), 146 (haslib FIPS), 147 (add debug malloc stats),
153 (fix gdb test noise), 157 (uid, gid overflow - fixed upstream, just
keeping few more downstream tests), 165 (crypt module salt backport),
175 (fix configure Wformat), 5000 (regenerated autotooling patch)
- Dropped patches: 101 (lib64 regex; merged upstream), 171 (exception on
missing /dev/urandom; merged upstream), 172 (poll for multiprocessing socket
connection; merged upstream)
00055-systemtap.patch | 12 +-
00111-no-static-lib.patch | 4 +-
00113-more-configuration-flags.patch | 6 +-
00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch | 4 +-
00146-hashlib-fips.patch | 24 +-
00147-add-debug-malloc-stats.patch | 10 +-
00153-fix-test_gdb-noise.patch | 4 +-
00157-uid-gid-overflows.patch | 687 ------
00165-crypt-module-salt-backport.patch | 2 +-
00170-gc-assertions.patch | 2 +-
00175-fix-configure-Wformat.patch | 6 +-
05000-autotool-intermediates.patch | 2538 +-------------------
python-2.5.1-sqlite-encoding.patch | 2 +-
python-2.6-rpath.patch | 6 +-
python-2.7.1-config.patch | 44 +-
...7.2-add-extension-suffix-to-python-config.patch | 2 +-
python-2.7.3-debug-build.patch | 18 +-
python.spec | 75 +-
18 files changed, 119 insertions(+), 3327 deletions(-)
---
diff --git a/00055-systemtap.patch b/00055-systemtap.patch
index 8c81e9d..67ec005 100644
--- a/00055-systemtap.patch
+++ b/00055-systemtap.patch
@@ -1,6 +1,6 @@
-diff -up Python-2.7rc1/configure.in.systemtap Python-2.7rc1/configure.in
---- Python-2.7rc1/configure.in.systemtap 2010-06-06 10:53:15.514975012 -0400
-+++ Python-2.7rc1/configure.in 2010-06-06 10:53:15.520974361 -0400
+diff -up Python-2.7rc1/configure.ac.systemtap Python-2.7rc1/configure.ac
+--- Python-2.7rc1/configure.ac.systemtap 2010-06-06 10:53:15.514975012 -0400
++++ Python-2.7rc1/configure.ac 2010-06-06 10:53:15.520974361 -0400
@@ -2616,6 +2616,38 @@ if test "$with_valgrind" != no; then
)
fi
@@ -87,9 +87,9 @@ diff -up Python-2.7rc1/Makefile.pre.in.systemtap Python-2.7rc1/Makefile.pre.in
@@ -1251,7 +1264,7 @@ Python/thread.o: @THREADHEADERS@
.PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
.PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
- .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
--.PHONY: smelly funny patchcheck
-+.PHONY: smelly funny patchcheck buildinclude
+ .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
+-.PHONY: smelly funny patchcheck touch altmaninstall
++.PHONY: smelly funny patchcheck touch altmaninstall buildinclude
.PHONY: gdbhooks
# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch
index c331454..2f4fdd6 100644
--- a/00111-no-static-lib.patch
+++ b/00111-no-static-lib.patch
@@ -11,8 +11,8 @@ diff -up Python-2.7.3/Makefile.pre.in.no-static-lib Python-2.7.3/Makefile.pre.in
Modules/python.o \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
@@ -413,18 +413,6 @@ sharedmods: $(BUILDPYTHON)
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
- esac
+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-# Build static library
-# avoid long command lines, same as LIBRARY_OBJS
diff --git a/00113-more-configuration-flags.patch b/00113-more-configuration-flags.patch
index 9ee3180..2d447b2 100644
--- a/00113-more-configuration-flags.patch
+++ b/00113-more-configuration-flags.patch
@@ -1,6 +1,6 @@
-diff -up Python-2.6.5/configure.in.more-configuration-flags Python-2.6.5/configure.in
---- Python-2.6.5/configure.in.more-configuration-flags 2010-05-24 18:51:25.410111792 -0400
-+++ Python-2.6.5/configure.in 2010-05-24 18:59:23.954986388 -0400
+diff -up Python-2.6.5/configure.ac.more-configuration-flags Python-2.6.5/configure.ac
+--- Python-2.6.5/configure.ac.more-configuration-flags 2010-05-24 18:51:25.410111792 -0400
++++ Python-2.6.5/configure.ac 2010-05-24 18:59:23.954986388 -0400
@@ -2515,6 +2515,30 @@ else AC_MSG_RESULT(no)
fi],
[AC_MSG_RESULT(no)])
diff --git a/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch b/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch
index 362145e..38381ef 100644
--- a/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch
+++ b/00134-fix-COUNT_ALLOCS-failure-in-test_sys.patch
@@ -3,11 +3,11 @@
@@ -734,6 +734,11 @@ class SizeofTest(unittest.TestCase):
# (PyTypeObject + PyNumberMethods + PyMappingMethods +
# PySequenceMethods + PyBufferProcs)
- s = size(vh + 'P2P15Pl4PP9PP11PI') + size('41P 10P 3P 6P')
+ s = vsize('P2P15Pl4PP9PP11PI') + struct.calcsize('41P 10P 3P 6P')
+
+ # COUNT_ALLOCS adds further fields to the end of a PyTypeObject:
+ if hasattr(sys, 'getcounts'):
-+ s += size('5P')
++ s += size('P')
+
class newstyleclass(object):
pass
diff --git a/00146-hashlib-fips.patch b/00146-hashlib-fips.patch
index 8616296..c67eb3b 100644
--- a/00146-hashlib-fips.patch
+++ b/00146-hashlib-fips.patch
@@ -67,7 +67,7 @@ diff -up Python-2.7.2/Lib/hashlib.py.hashlib-fips Python-2.7.2/Lib/hashlib.py
- except ImportError:
- pass # no extension module, this hash is unsupported.
-
-- raise ValueError('unsupported hash type %s' % name)
+- raise ValueError('unsupported hash type ' + name)
-
-
def __get_openssl_constructor(name):
@@ -199,9 +199,9 @@ diff -up Python-2.7.2/Lib/test/test_hashlib.py.hashlib-fips Python-2.7.2/Lib/tes
c.hexdigest()
def test_algorithms_attribute(self):
-@@ -115,27 +113,9 @@ class HashLibTestCase(unittest.TestCase)
- else:
- self.assertTrue(0 == "hashlib didn't reject bogus hash name")
+@@ -115,28 +113,9 @@ class HashLibTestCase(unittest.TestCase)
+ self.assertRaises(ValueError, hashlib.new, 'spam spam spam spam spam')
+ self.assertRaises(TypeError, hashlib.new, 1)
- def test_get_builtin_constructor(self):
- get_builtin_constructor = hashlib.__dict__[
@@ -220,6 +220,7 @@ diff -up Python-2.7.2/Lib/test/test_hashlib.py.hashlib-fips Python-2.7.2/Lib/tes
- sys.modules['_md5'] = _md5
- else:
- del sys.modules['_md5']
+- self.assertRaises(TypeError, get_builtin_constructor, 3)
-
def test_hexdigest(self):
for name in self.supported_hash_names:
@@ -366,7 +367,7 @@ diff -up Python-2.7.2/Modules/_hashopenssl.c.hashlib-fips Python-2.7.2/Modules/_
+} EVPCachedInfo;
-#define DEFINE_CONSTS_FOR_NEW(Name) \
-- static PyObject *CONST_ ## Name ## _name_obj; \
+- static PyObject *CONST_ ## Name ## _name_obj = NULL; \
- static EVP_MD_CTX CONST_new_ ## Name ## _ctx; \
- static EVP_MD_CTX *CONST_new_ ## Name ## _ctx_p = NULL;
+#define DEFINE_CONSTS_FOR_NEW(Name) \
@@ -513,7 +514,7 @@ diff -up Python-2.7.2/Modules/_hashopenssl.c.hashlib-fips Python-2.7.2/Modules/_
return NULL;
}
-@@ -484,55 +556,118 @@ EVP_new(PyObject *self, PyObject *args,
+@@ -484,58 +556,118 @@ EVP_new(PyObject *self, PyObject *args,
digest = EVP_get_digestbyname(name);
ret_obj = EVPnew(name_obj, digest, NULL, (unsigned char*)view.buf,
@@ -615,12 +616,15 @@ diff -up Python-2.7.2/Modules/_hashopenssl.c.hashlib-fips Python-2.7.2/Modules/_
" hash object; optionally initialized with a string") \
}
--/* used in the init function to setup a constructor */
+-/* used in the init function to setup a constructor: initialize OpenSSL
+- constructor constants if they haven't been initialized already. */
-#define INIT_CONSTRUCTOR_CONSTANTS(NAME) do { \
+- if (CONST_ ## NAME ## _name_obj == NULL) { \
- CONST_ ## NAME ## _name_obj = PyString_FromString(#NAME); \
-- if (EVP_get_digestbyname(#NAME)) { \
-- CONST_new_ ## NAME ## _ctx_p = &CONST_new_ ## NAME ## _ctx; \
-- EVP_DigestInit(CONST_new_ ## NAME ## _ctx_p, EVP_get_digestbyname(#NAME)); \
+- if (EVP_get_digestbyname(#NAME)) { \
+- CONST_new_ ## NAME ## _ctx_p = &CONST_new_ ## NAME ## _ctx; \
+- EVP_DigestInit(CONST_new_ ## NAME ## _ctx_p, EVP_get_digestbyname(#NAME)); \
+- } \
- } \
+/*
+ Macro/function pair to set up the constructors.
diff --git a/00147-add-debug-malloc-stats.patch b/00147-add-debug-malloc-stats.patch
index 25e8970..0ab8c94 100644
--- a/00147-add-debug-malloc-stats.patch
+++ b/00147-add-debug-malloc-stats.patch
@@ -75,8 +75,8 @@ diff -up Python-2.7.2/Include/object.h.add-debug-malloc-stats Python-2.7.2/Inclu
--- Python-2.7.2/Include/object.h.add-debug-malloc-stats 2011-06-11 11:46:23.000000000 -0400
+++ Python-2.7.2/Include/object.h 2011-09-16 19:03:25.108821625 -0400
@@ -980,6 +980,13 @@ PyAPI_DATA(PyObject *) _PyTrash_delete_l
- else \
- _PyTrash_deposit_object((PyObject*)op);
+ _PyTrash_thread_deposit_object((PyObject*)op); \
+ } while (0);
+PyAPI_FUNC(void)
+_PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks,
@@ -165,7 +165,7 @@ diff -up Python-2.7.2/Lib/test/test_sys.py.add-debug-malloc-stats Python-2.7.2/L
+
class SizeofTest(unittest.TestCase):
- TPFLAGS_HAVE_GC = 1<<14
+ def setUp(self):
diff -up Python-2.7.2/Objects/classobject.c.add-debug-malloc-stats Python-2.7.2/Objects/classobject.c
--- Python-2.7.2/Objects/classobject.c.add-debug-malloc-stats 2011-06-11 11:46:27.000000000 -0400
+++ Python-2.7.2/Objects/classobject.c 2011-09-16 19:03:25.110821625 -0400
@@ -542,8 +542,8 @@ diff -up Python-2.7.2/Objects/stringobject.c.add-debug-malloc-stats Python-2.7.2
--- Python-2.7.2/Objects/stringobject.c.add-debug-malloc-stats 2011-06-11 11:46:27.000000000 -0400
+++ Python-2.7.2/Objects/stringobject.c 2011-09-16 19:03:25.116821625 -0400
@@ -4822,3 +4822,43 @@ void _Py_ReleaseInternedStrings(void)
- Py_DECREF(interned);
- interned = NULL;
+ PyDict_Clear(interned);
+ Py_CLEAR(interned);
}
+
+void _PyString_DebugMallocStats(FILE *out)
diff --git a/00153-fix-test_gdb-noise.patch b/00153-fix-test_gdb-noise.patch
index bc5ee63..0495d95 100644
--- a/00153-fix-test_gdb-noise.patch
+++ b/00153-fix-test_gdb-noise.patch
@@ -17,8 +17,8 @@
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",
+ 'Do you need "set solib-search-path" or '
+ '"set sysroot"?\n',
'')
+ err = '\n'.join([line
+ for line in err.splitlines()
diff --git a/00157-uid-gid-overflows.patch b/00157-uid-gid-overflows.patch
index 0d6abb5..13546bb 100644
--- a/00157-uid-gid-overflows.patch
+++ b/00157-uid-gid-overflows.patch
@@ -1,44 +1,3 @@
-diff -up Python-2.7.3/Include/modsupport.h.uid-gid-overflows Python-2.7.3/Include/modsupport.h
---- Python-2.7.3/Include/modsupport.h.uid-gid-overflows 2012-04-09 19:07:29.000000000 -0400
-+++ Python-2.7.3/Include/modsupport.h 2012-06-26 14:52:03.739471150 -0400
-@@ -8,6 +8,7 @@ extern "C" {
- /* Module support interface */
-
- #include <stdarg.h>
-+#include <sys/types.h>
-
- /* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier
- to mean Py_ssize_t */
-@@ -128,6 +129,17 @@ PyAPI_FUNC(PyObject *) Py_InitModule4(co
-
- PyAPI_DATA(char *) _Py_PackageContext;
-
-+/*
-+ Non-standard extension: support for dealing with uid_t and gid_t without
-+ integer overflow
-+ */
-+
-+PyAPI_FUNC(PyObject *) _PyObject_FromUid(uid_t uid);
-+PyAPI_FUNC(PyObject *) _PyObject_FromGid(gid_t gid);
-+
-+PyAPI_FUNC(int) _PyArg_ParseUid(PyObject *in_obj, uid_t *out_uid);
-+PyAPI_FUNC(int) _PyArg_ParseGid(PyObject *in_obj, gid_t *out_gid);
-+
- #ifdef __cplusplus
- }
- #endif
-diff -up Python-2.7.3/Lib/test/test_grp.py.uid-gid-overflows Python-2.7.3/Lib/test/test_grp.py
---- Python-2.7.3/Lib/test/test_grp.py.uid-gid-overflows 2012-04-09 19:07:31.000000000 -0400
-+++ Python-2.7.3/Lib/test/test_grp.py 2012-06-26 14:51:36.000817929 -0400
-@@ -16,7 +16,7 @@ class GroupDatabaseTestCase(unittest.Tes
- self.assertEqual(value[1], value.gr_passwd)
- self.assertIsInstance(value.gr_passwd, basestring)
- self.assertEqual(value[2], value.gr_gid)
-- self.assertIsInstance(value.gr_gid, int)
-+ self.assertIsInstance(value.gr_gid, (int, long))
- self.assertEqual(value[3], value.gr_mem)
- self.assertIsInstance(value.gr_mem, list)
-
diff -up Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows Python-2.7.3/Lib/test/test_os.py
--- Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400
+++ Python-2.7.3/Lib/test/test_os.py 2012-06-26 14:51:36.000817929 -0400
@@ -88,649 +47,3 @@ diff -up Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows Python-2.7.3/Lib/tes
self.assertRaises(OverflowError, os.setregid, 1<<32, 0)
self.assertRaises(OverflowError, os.setregid, 0, 1<<32)
-diff -up Python-2.7.3/Lib/test/test_posix.py.uid-gid-overflows Python-2.7.3/Lib/test/test_posix.py
---- Python-2.7.3/Lib/test/test_posix.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400
-+++ Python-2.7.3/Lib/test/test_posix.py 2012-06-26 14:51:36.001817916 -0400
-@@ -217,7 +217,7 @@ class PosixTester(unittest.TestCase):
- if hasattr(posix, 'stat'):
- self.assertTrue(posix.stat(test_support.TESTFN))
-
-- def _test_all_chown_common(self, chown_func, first_param):
-+ def _test_all_chown_common(self, chown_func, stat_func, first_param):
- """Common code for chown, fchown and lchown tests."""
- if os.getuid() == 0:
- try:
-@@ -237,6 +237,13 @@ class PosixTester(unittest.TestCase):
-
- # test a successful chown call
- chown_func(first_param, os.getuid(), os.getgid())
-+ self.assertEqual(stat_func(first_param).st_uid, os.getuid())
-+ self.assertEqual(stat_func(first_param).st_gid, os.getgid())
-+
-+ # verify that -1 works as a "do-nothing" option:
-+ chown_func(first_param, -1, -1)
-+ self.assertEqual(stat_func(first_param).st_uid, os.getuid())
-+ self.assertEqual(stat_func(first_param).st_gid, os.getgid())
-
- @unittest.skipUnless(hasattr(posix, 'chown'), "test needs os.chown()")
- def test_chown(self):
-@@ -246,7 +253,7 @@ class PosixTester(unittest.TestCase):
-
- # re-create the file
- open(test_support.TESTFN, 'w').close()
-- self._test_all_chown_common(posix.chown, test_support.TESTFN)
-+ self._test_all_chown_common(posix.chown, posix.stat, test_support.TESTFN)
-
- @unittest.skipUnless(hasattr(posix, 'fchown'), "test needs os.fchown()")
- def test_fchown(self):
-@@ -256,7 +263,7 @@ class PosixTester(unittest.TestCase):
- test_file = open(test_support.TESTFN, 'w')
- try:
- fd = test_file.fileno()
-- self._test_all_chown_common(posix.fchown, fd)
-+ self._test_all_chown_common(posix.fchown, posix.fstat, fd)
- finally:
- test_file.close()
-
-@@ -265,7 +272,7 @@ class PosixTester(unittest.TestCase):
- os.unlink(test_support.TESTFN)
- # create a symlink
- os.symlink(_DUMMY_SYMLINK, test_support.TESTFN)
-- self._test_all_chown_common(posix.lchown, test_support.TESTFN)
-+ self._test_all_chown_common(posix.lchown, posix.lstat, test_support.TESTFN)
-
- def test_chdir(self):
- if hasattr(posix, 'chdir'):
-diff -up Python-2.7.3/Lib/test/test_pwd.py.uid-gid-overflows Python-2.7.3/Lib/test/test_pwd.py
---- Python-2.7.3/Lib/test/test_pwd.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400
-+++ Python-2.7.3/Lib/test/test_pwd.py 2012-06-26 14:51:36.001817916 -0400
-@@ -18,9 +18,9 @@ class PwdTest(unittest.TestCase):
- self.assertEqual(e[1], e.pw_passwd)
- self.assertIsInstance(e.pw_passwd, basestring)
- self.assertEqual(e[2], e.pw_uid)
-- self.assertIsInstance(e.pw_uid, int)
-+ self.assertIsInstance(e.pw_uid, (int, long))
- self.assertEqual(e[3], e.pw_gid)
-- self.assertIsInstance(e.pw_gid, int)
-+ self.assertIsInstance(e.pw_gid, (int, long))
- self.assertEqual(e[4], e.pw_gecos)
- self.assertIsInstance(e.pw_gecos, basestring)
- self.assertEqual(e[5], e.pw_dir)
-@@ -87,9 +87,9 @@ class PwdTest(unittest.TestCase):
- # In some cases, byuids isn't a complete list of all users in the
- # system, so if we try to pick a value not in byuids (via a perturbing
- # loop, say), pwd.getpwuid() might still be able to find data for that
-- # uid. Using sys.maxint may provoke the same problems, but hopefully
-+ # uid. Using 2**32 - 2 may provoke the same problems, but hopefully
- # it will be a more repeatable failure.
-- fakeuid = sys.maxint
-+ fakeuid = 2**32 - 2
- self.assertNotIn(fakeuid, byuids)
- self.assertRaises(KeyError, pwd.getpwuid, fakeuid)
-
-diff -up Python-2.7.3/Modules/grpmodule.c.uid-gid-overflows Python-2.7.3/Modules/grpmodule.c
---- Python-2.7.3/Modules/grpmodule.c.uid-gid-overflows 2012-04-09 19:07:34.000000000 -0400
-+++ Python-2.7.3/Modules/grpmodule.c 2012-06-26 14:51:36.002817904 -0400
-@@ -70,7 +70,7 @@ mkgrent(struct group *p)
- Py_INCREF(Py_None);
- }
- #endif
-- SET(setIndex++, PyInt_FromLong((long) p->gr_gid));
-+ SET(setIndex++, _PyObject_FromGid(p->gr_gid));
- SET(setIndex++, w);
- #undef SET
-
-@@ -85,18 +85,15 @@ mkgrent(struct group *p)
- static PyObject *
- grp_getgrgid(PyObject *self, PyObject *pyo_id)
- {
-- PyObject *py_int_id;
-- unsigned int gid;
-+ gid_t gid;
- struct group *p;
-
-- py_int_id = PyNumber_Int(pyo_id);
-- if (!py_int_id)
-- return NULL;
-- gid = PyInt_AS_LONG(py_int_id);
-- Py_DECREF(py_int_id);
-+ if (!_PyArg_ParseGid(pyo_id, &gid)) {
-+ return NULL;
-+ }
-
- if ((p = getgrgid(gid)) == NULL) {
-- PyErr_Format(PyExc_KeyError, "getgrgid(): gid not found: %d", gid);
-+ PyErr_Format(PyExc_KeyError, "getgrgid(): gid not found: %lu", (unsigned long)gid);
- return NULL;
- }
- return mkgrent(p);
-diff -up Python-2.7.3/Modules/posixmodule.c.uid-gid-overflows Python-2.7.3/Modules/posixmodule.c
---- Python-2.7.3/Modules/posixmodule.c.uid-gid-overflows 2012-06-26 14:51:35.864819629 -0400
-+++ Python-2.7.3/Modules/posixmodule.c 2012-06-26 14:51:36.005817868 -0400
-@@ -1305,8 +1305,8 @@ _pystat_fromstructstat(STRUCT_STAT *st)
- PyStructSequence_SET_ITEM(v, 2, PyInt_FromLong((long)st->st_dev));
- #endif
- PyStructSequence_SET_ITEM(v, 3, PyInt_FromLong((long)st->st_nlink));
-- PyStructSequence_SET_ITEM(v, 4, PyInt_FromLong((long)st->st_uid));
-- PyStructSequence_SET_ITEM(v, 5, PyInt_FromLong((long)st->st_gid));
-+ PyStructSequence_SET_ITEM(v, 4, _PyObject_FromUid(st->st_uid));
-+ PyStructSequence_SET_ITEM(v, 5, _PyObject_FromGid(st->st_gid));
- #ifdef HAVE_LARGEFILE_SUPPORT
- PyStructSequence_SET_ITEM(v, 6,
- PyLong_FromLongLong((PY_LONG_LONG)st->st_size));
-@@ -1883,14 +1883,16 @@ static PyObject *
- posix_chown(PyObject *self, PyObject *args)
- {
- char *path = NULL;
-- long uid, gid;
-+ uid_t uid;
-+ gid_t gid;
- int res;
-- if (!PyArg_ParseTuple(args, "etll:chown",
-+ if (!PyArg_ParseTuple(args, "etO&O&:chown",
- Py_FileSystemDefaultEncoding, &path,
-- &uid, &gid))
-+ _PyArg_ParseUid, &uid,
-+ _PyArg_ParseGid, &gid))
- return NULL;
- Py_BEGIN_ALLOW_THREADS
-- res = chown(path, (uid_t) uid, (gid_t) gid);
-+ res = chown(path, uid, gid);
- Py_END_ALLOW_THREADS
- if (res < 0)
- return posix_error_with_allocated_filename(path);
-@@ -1910,12 +1912,15 @@ static PyObject *
- posix_fchown(PyObject *self, PyObject *args)
- {
- int fd;
-- long uid, gid;
-+ uid_t uid;
-+ gid_t gid;
- int res;
-- if (!PyArg_ParseTuple(args, "ill:chown", &fd, &uid, &gid))
-+ if (!PyArg_ParseTuple(args, "iO&O&:chown", &fd,
-+ _PyArg_ParseUid, &uid,
-+ _PyArg_ParseGid, &gid))
- return NULL;
- Py_BEGIN_ALLOW_THREADS
-- res = fchown(fd, (uid_t) uid, (gid_t) gid);
-+ res = fchown(fd, uid, gid);
- Py_END_ALLOW_THREADS
- if (res < 0)
- return posix_error();
-@@ -1933,14 +1938,16 @@ static PyObject *
- posix_lchown(PyObject *self, PyObject *args)
- {
- char *path = NULL;
-- long uid, gid;
-+ uid_t uid;
-+ gid_t gid;
- int res;
-- if (!PyArg_ParseTuple(args, "etll:lchown",
-+ if (!PyArg_ParseTuple(args, "etO&O&:lchown",
- Py_FileSystemDefaultEncoding, &path,
-- &uid, &gid))
-+ _PyArg_ParseUid, &uid,
-+ _PyArg_ParseGid, &gid))
- return NULL;
- Py_BEGIN_ALLOW_THREADS
-- res = lchown(path, (uid_t) uid, (gid_t) gid);
-+ res = lchown(path, uid, gid);
- Py_END_ALLOW_THREADS
- if (res < 0)
- return posix_error_with_allocated_filename(path);
-@@ -3841,7 +3848,7 @@ Return the current process's effective g
- static PyObject *
- posix_getegid(PyObject *self, PyObject *noargs)
- {
-- return PyInt_FromLong((long)getegid());
-+ return _PyObject_FromGid(getegid());
- }
- #endif
-
-@@ -3854,7 +3861,7 @@ Return the current process's effective u
- static PyObject *
- posix_geteuid(PyObject *self, PyObject *noargs)
- {
-- return PyInt_FromLong((long)geteuid());
-+ return _PyObject_FromUid(geteuid());
- }
- #endif
-
-@@ -3867,7 +3874,7 @@ Return the current process's group id.")
- static PyObject *
- posix_getgid(PyObject *self, PyObject *noargs)
- {
-- return PyInt_FromLong((long)getgid());
-+ return _PyObject_FromGid(getgid());
- }
- #endif
-
-@@ -3942,7 +3949,7 @@ posix_getgroups(PyObject *self, PyObject
- if (result != NULL) {
- int i;
- for (i = 0; i < n; ++i) {
-- PyObject *o = PyInt_FromLong((long)alt_grouplist[i]);
-+ PyObject *o = _PyObject_FromGid(alt_grouplist[i]);
- if (o == NULL) {
- Py_DECREF(result);
- result = NULL;
-@@ -3971,12 +3978,13 @@ static PyObject *
- posix_initgroups(PyObject *self, PyObject *args)
- {
- char *username;
-- long gid;
-+ gid_t gid;
-
-- if (!PyArg_ParseTuple(args, "sl:initgroups", &username, &gid))
-+ if (!PyArg_ParseTuple(args, "sO&:initgroups", &username,
-+ _PyArg_ParseGid, &gid))
- return NULL;
-
-- if (initgroups(username, (gid_t) gid) == -1)
-+ if (initgroups(username, gid) == -1)
- return PyErr_SetFromErrno(PyExc_OSError);
-
- Py_INCREF(Py_None);
-@@ -4090,7 +4098,7 @@ Return the current process's user id.");
- static PyObject *
- posix_getuid(PyObject *self, PyObject *noargs)
- {
-- return PyInt_FromLong((long)getuid());
-+ return _PyObject_FromUid(getuid());
- }
- #endif
-
-@@ -5736,15 +5744,9 @@ Set the current process's user id.");
- static PyObject *
- posix_setuid(PyObject *self, PyObject *args)
- {
-- long uid_arg;
- uid_t uid;
-- if (!PyArg_ParseTuple(args, "l:setuid", &uid_arg))
-+ if (!PyArg_ParseTuple(args, "O&:setuid", _PyArg_ParseUid, &uid))
- return NULL;
-- uid = uid_arg;
-- if (uid != uid_arg) {
-- PyErr_SetString(PyExc_OverflowError, "user id too big");
-- return NULL;
-- }
- if (setuid(uid) < 0)
- return posix_error();
- Py_INCREF(Py_None);
-@@ -5761,15 +5763,9 @@ Set the current process's effective user
- static PyObject *
- posix_seteuid (PyObject *self, PyObject *args)
- {
-- long euid_arg;
- uid_t euid;
-- if (!PyArg_ParseTuple(args, "l", &euid_arg))
-+ if (!PyArg_ParseTuple(args, "O&:seteuid", _PyArg_ParseUid, &euid))
- return NULL;
-- euid = euid_arg;
-- if (euid != euid_arg) {
-- PyErr_SetString(PyExc_OverflowError, "user id too big");
-- return NULL;
-- }
- if (seteuid(euid) < 0) {
- return posix_error();
- } else {
-@@ -5787,15 +5783,9 @@ Set the current process's effective grou
- static PyObject *
- posix_setegid (PyObject *self, PyObject *args)
- {
-- long egid_arg;
- gid_t egid;
-- if (!PyArg_ParseTuple(args, "l", &egid_arg))
-+ if (!PyArg_ParseTuple(args, "O&:setegid", _PyArg_ParseGid, &egid))
- return NULL;
-- egid = egid_arg;
-- if (egid != egid_arg) {
-- PyErr_SetString(PyExc_OverflowError, "group id too big");
-- return NULL;
-- }
- if (setegid(egid) < 0) {
- return posix_error();
- } else {
-@@ -5813,23 +5803,11 @@ Set the current process's real and effec
- static PyObject *
- posix_setreuid (PyObject *self, PyObject *args)
- {
-- long ruid_arg, euid_arg;
- uid_t ruid, euid;
-- if (!PyArg_ParseTuple(args, "ll", &ruid_arg, &euid_arg))
-+ if (!PyArg_ParseTuple(args, "O&O&",
-+ _PyArg_ParseUid, &ruid,
-+ _PyArg_ParseUid, &euid))
- return NULL;
-- if (ruid_arg == -1)
-- ruid = (uid_t)-1; /* let the compiler choose how -1 fits */
-- else
-- ruid = ruid_arg; /* otherwise, assign from our long */
-- if (euid_arg == -1)
-- euid = (uid_t)-1;
-- else
-- euid = euid_arg;
-- if ((euid_arg != -1 && euid != euid_arg) ||
-- (ruid_arg != -1 && ruid != ruid_arg)) {
-- PyErr_SetString(PyExc_OverflowError, "user id too big");
-- return NULL;
-- }
- if (setreuid(ruid, euid) < 0) {
- return posix_error();
- } else {
-@@ -5847,23 +5825,11 @@ Set the current process's real and effec
- static PyObject *
- posix_setregid (PyObject *self, PyObject *args)
- {
-- long rgid_arg, egid_arg;
- gid_t rgid, egid;
-- if (!PyArg_ParseTuple(args, "ll", &rgid_arg, &egid_arg))
-+ if (!PyArg_ParseTuple(args, "O&O&",
-+ _PyArg_ParseGid, &rgid,
-+ _PyArg_ParseGid, &egid))
- return NULL;
-- if (rgid_arg == -1)
-- rgid = (gid_t)-1; /* let the compiler choose how -1 fits */
-- else
-- rgid = rgid_arg; /* otherwise, assign from our long */
-- if (egid_arg == -1)
-- egid = (gid_t)-1;
-- else
-- egid = egid_arg;
-- if ((egid_arg != -1 && egid != egid_arg) ||
-- (rgid_arg != -1 && rgid != rgid_arg)) {
-- PyErr_SetString(PyExc_OverflowError, "group id too big");
-- return NULL;
-- }
- if (setregid(rgid, egid) < 0) {
- return posix_error();
- } else {
-@@ -5881,15 +5847,9 @@ Set the current process's group id.");
- static PyObject *
- posix_setgid(PyObject *self, PyObject *args)
- {
-- long gid_arg;
- gid_t gid;
-- if (!PyArg_ParseTuple(args, "l:setgid", &gid_arg))
-- return NULL;
-- gid = gid_arg;
-- if (gid != gid_arg) {
-- PyErr_SetString(PyExc_OverflowError, "group id too big");
-+ if (!PyArg_ParseTuple(args, "O&:setgid", _PyArg_ParseGid, &gid))
- return NULL;
-- }
- if (setgid(gid) < 0)
- return posix_error();
- Py_INCREF(Py_None);
-@@ -5922,39 +5882,10 @@ posix_setgroups(PyObject *self, PyObject
- elem = PySequence_GetItem(groups, i);
- if (!elem)
- return NULL;
-- if (!PyInt_Check(elem)) {
-- if (!PyLong_Check(elem)) {
-- PyErr_SetString(PyExc_TypeError,
-- "groups must be integers");
-- Py_DECREF(elem);
-- return NULL;
-- } else {
-- unsigned long x = PyLong_AsUnsignedLong(elem);
-- if (PyErr_Occurred()) {
-- PyErr_SetString(PyExc_TypeError,
-- "group id too big");
-- Py_DECREF(elem);
-- return NULL;
-- }
-- grouplist[i] = x;
-- /* read back to see if it fits in gid_t */
-- if (grouplist[i] != x) {
-- PyErr_SetString(PyExc_TypeError,
-- "group id too big");
-- Py_DECREF(elem);
-- return NULL;
-- }
-- }
-- } else {
-- long x = PyInt_AsLong(elem);
-- grouplist[i] = x;
-- if (grouplist[i] != x) {
-- PyErr_SetString(PyExc_TypeError,
-- "group id too big");
-- Py_DECREF(elem);
-- return NULL;
-- }
-- }
-+ if (!_PyArg_ParseGid(elem, &grouplist[i])) {
-+ Py_DECREF(elem);
-+ return NULL;
-+ }
- Py_DECREF(elem);
- }
-
-@@ -8576,9 +8507,11 @@ Set the current process's real, effectiv
- static PyObject*
- posix_setresuid (PyObject *self, PyObject *args)
- {
-- /* We assume uid_t is no larger than a long. */
-- long ruid, euid, suid;
-- if (!PyArg_ParseTuple(args, "lll", &ruid, &euid, &suid))
-+ uid_t ruid, euid, suid;
-+ if (!PyArg_ParseTuple(args, "O&O&O&",
-+ _PyArg_ParseUid, &ruid,
-+ _PyArg_ParseUid, &euid,
-+ _PyArg_ParseUid, &suid))
- return NULL;
- if (setresuid(ruid, euid, suid) < 0)
- return posix_error();
-@@ -8594,9 +8527,12 @@ Set the current process's real, effectiv
- static PyObject*
- posix_setresgid (PyObject *self, PyObject *args)
- {
-- /* We assume uid_t is no larger than a long. */
-- long rgid, egid, sgid;
-- if (!PyArg_ParseTuple(args, "lll", &rgid, &egid, &sgid))
-+ gid_t rgid, egid, sgid;
-+ if (!PyArg_ParseTuple(args, "O&O&O&",
-+ _PyArg_ParseGid, &rgid,
-+ _PyArg_ParseGid, &egid,
-+ _PyArg_ParseGid, &sgid))
-+
- return NULL;
- if (setresgid(rgid, egid, sgid) < 0)
- return posix_error();
-@@ -8613,14 +8549,13 @@ static PyObject*
- posix_getresuid (PyObject *self, PyObject *noargs)
- {
- uid_t ruid, euid, suid;
-- long l_ruid, l_euid, l_suid;
-+ PyObject *obj_ruid, *obj_euid, *obj_suid;
- if (getresuid(&ruid, &euid, &suid) < 0)
- return posix_error();
-- /* Force the values into long's as we don't know the size of uid_t. */
-- l_ruid = ruid;
-- l_euid = euid;
-- l_suid = suid;
-- return Py_BuildValue("(lll)", l_ruid, l_euid, l_suid);
-+ obj_ruid = _PyObject_FromUid(ruid);
-+ obj_euid = _PyObject_FromUid(euid);
-+ obj_suid = _PyObject_FromUid(suid);
-+ return Py_BuildValue("(NNN)", obj_ruid, obj_euid, obj_suid);
- }
- #endif
-
-@@ -8632,15 +8567,14 @@ Get tuple of the current process's real,
- static PyObject*
- posix_getresgid (PyObject *self, PyObject *noargs)
- {
-- uid_t rgid, egid, sgid;
-- long l_rgid, l_egid, l_sgid;
-+ gid_t rgid, egid, sgid;
-+ PyObject *obj_rgid, *obj_egid, *obj_sgid;
- if (getresgid(&rgid, &egid, &sgid) < 0)
- return posix_error();
-- /* Force the values into long's as we don't know the size of uid_t. */
-- l_rgid = rgid;
-- l_egid = egid;
-- l_sgid = sgid;
-- return Py_BuildValue("(lll)", l_rgid, l_egid, l_sgid);
-+ obj_rgid = _PyObject_FromGid(rgid);
-+ obj_egid = _PyObject_FromGid(egid);
-+ obj_sgid = _PyObject_FromGid(sgid);
-+ return Py_BuildValue("(NNN)", obj_rgid, obj_egid, obj_sgid);
- }
- #endif
-
-diff -up Python-2.7.3/Modules/pwdmodule.c.uid-gid-overflows Python-2.7.3/Modules/pwdmodule.c
---- Python-2.7.3/Modules/pwdmodule.c.uid-gid-overflows 2012-04-09 19:07:34.000000000 -0400
-+++ Python-2.7.3/Modules/pwdmodule.c 2012-06-26 14:51:36.006817855 -0400
-@@ -73,8 +73,8 @@ mkpwent(struct passwd *p)
- #else
- SETS(setIndex++, p->pw_passwd);
- #endif
-- SETI(setIndex++, p->pw_uid);
-- SETI(setIndex++, p->pw_gid);
-+ PyStructSequence_SET_ITEM(v, setIndex++, _PyObject_FromUid(p->pw_uid));
-+ PyStructSequence_SET_ITEM(v, setIndex++, _PyObject_FromGid(p->pw_gid));
- #ifdef __VMS
- SETS(setIndex++, "");
- #else
-@@ -103,13 +103,14 @@ See help(pwd) for more on password datab
- static PyObject *
- pwd_getpwuid(PyObject *self, PyObject *args)
- {
-- unsigned int uid;
-+ uid_t uid;
- struct passwd *p;
-- if (!PyArg_ParseTuple(args, "I:getpwuid", &uid))
-+ if (!PyArg_ParseTuple(args, "O&:getpwuid",
-+ _PyArg_ParseUid, &uid))
- return NULL;
- if ((p = getpwuid(uid)) == NULL) {
- PyErr_Format(PyExc_KeyError,
-- "getpwuid(): uid not found: %d", uid);
-+ "getpwuid(): uid not found: %lu", (unsigned long)uid);
- return NULL;
- }
- return mkpwent(p);
-diff -up Python-2.7.3/Python/getargs.c.uid-gid-overflows Python-2.7.3/Python/getargs.c
---- Python-2.7.3/Python/getargs.c.uid-gid-overflows 2012-04-09 19:07:35.000000000 -0400
-+++ Python-2.7.3/Python/getargs.c 2012-06-26 14:51:36.007817842 -0400
-@@ -4,6 +4,7 @@
- #include "Python.h"
-
- #include <ctype.h>
-+#include <limits.h>
-
-
- #ifdef __cplusplus
-@@ -1902,6 +1903,110 @@ _PyArg_NoKeywords(const char *funcname,
- funcname);
- return 0;
- }
-+
-+PyObject *
-+_PyObject_FromUid(uid_t uid)
-+{
-+ if (uid <= (uid_t)LONG_MAX) {
-+ return PyInt_FromLong((uid_t)uid);
-+ } else {
-+ return PyLong_FromUnsignedLong((uid_t)uid);
-+ }
-+}
-+
-+PyObject *
-+_PyObject_FromGid(gid_t gid)
-+{
-+ if (gid <= (gid_t)LONG_MAX) {
-+ return PyInt_FromLong((gid_t)gid);
-+ } else {
-+ return PyLong_FromUnsignedLong((gid_t)gid);
-+ }
-+}
-+
-+int
-+_PyArg_ParseUid(PyObject *in_obj, uid_t *out_uid)
-+{
-+ PyObject *index, *number = NULL;
-+ long sl;
-+ unsigned long ul;
-+
-+ assert(out_uid);
-+
-+ index = PyNumber_Index(in_obj);
-+ if (index != NULL) {
-+ number = PyNumber_Long(index);
-+ Py_DECREF(index);
-+ }
-+ if (number == NULL) {
-+ PyErr_SetString(PyExc_TypeError, "user id must be integer");
-+ return 0;
-+ }
-+
-+ /* Special case: support -1 (e.g. for use by chown) */
-+ sl = PyLong_AsLong(number);
-+ if (PyErr_Occurred()) {
-+ PyErr_Clear();
-+ } else if (sl == -1) {
-+ Py_DECREF(number);
-+ *out_uid = (uid_t)-1;
-+ return 1;
-+ }
-+
-+ /* Otherwise, it must be >= 0 */
-+ ul = PyLong_AsUnsignedLong(number);
-+ Py_DECREF(number);
-+ *out_uid = ul;
-+ /* read back the value to see if it fitted in uid_t */
-+ if (PyErr_Occurred() || *out_uid != ul) {
-+ PyErr_SetString(PyExc_OverflowError,
-+ "user id is not in range(-1, 2^32-1)");
-+ return 0;
-+ }
-+ return 1;
-+}
-+
-+int
-+_PyArg_ParseGid(PyObject *in_obj, gid_t *out_gid)
-+{
-+ PyObject *index, *number = NULL;
-+ long sl;
-+ unsigned long ul;
-+
-+ assert(out_gid);
-+
-+ index = PyNumber_Index(in_obj);
-+ if (index != NULL) {
-+ number = PyNumber_Long(index);
-+ Py_DECREF(index);
-+ }
-+ if (number == NULL) {
-+ PyErr_SetString(PyExc_TypeError, "group id must be integer");
-+ return 0;
-+ }
-+
-+ /* Special case: support -1 (e.g. for use by chown) */
-+ sl = PyLong_AsLong(number);
-+ if (PyErr_Occurred()) {
-+ PyErr_Clear();
-+ } else if (sl == -1) {
-+ Py_DECREF(number);
-+ *out_gid = (gid_t)-1;
-+ return 1;
-+ }
-+
-+ ul = PyLong_AsUnsignedLong(number);
-+ Py_DECREF(number);
-+ *out_gid = ul;
-+ /* read back the value to see if it fitted in gid_t */
-+ if (PyErr_Occurred() || *out_gid != ul) {
-+ PyErr_SetString(PyExc_OverflowError,
-+ "group id is not in range(-1, 2^32-1)");
-+ return 0;
-+ }
-+ return 1;
-+}
-+
- #ifdef __cplusplus
- };
- #endif
diff --git a/00165-crypt-module-salt-backport.patch b/00165-crypt-module-salt-backport.patch
index 6714fa1..4308b4c 100644
--- a/00165-crypt-module-salt-backport.patch
+++ b/00165-crypt-module-salt-backport.patch
@@ -266,7 +266,7 @@ diff -up Python-2.7.3/Modules/Setup.dist.crypt-module-salt-backport Python-2.7.3
#
# First, look at Setup.config; configure may have set this for you.
--crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
+-crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
+_crypt _cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
diff --git a/00170-gc-assertions.patch b/00170-gc-assertions.patch
index 088f84d..3fb37ff 100644
--- a/00170-gc-assertions.patch
+++ b/00170-gc-assertions.patch
@@ -7,9 +7,9 @@ diff -up Python-2.7.3/Lib/test/test_gc.py.gc-assertions Python-2.7.3/Lib/test/te
+from test.test_support import verbose, run_unittest, import_module
import sys
+import sysconfig
+ import time
import gc
import weakref
-
@@ -32,6 +33,8 @@ class GC_Detector(object):
self.wr = weakref.ref(C1055820(666), it_happened)
diff --git a/00175-fix-configure-Wformat.patch b/00175-fix-configure-Wformat.patch
index b57208c..d527ab0 100644
--- a/00175-fix-configure-Wformat.patch
+++ b/00175-fix-configure-Wformat.patch
@@ -1,6 +1,6 @@
-diff -up Python-2.7.3/configure.in.fix-configure-Wformat Python-2.7.3/configure.in
---- Python-2.7.3/configure.in.fix-configure-Wformat 2013-03-25 15:15:18.473888383 -0400
-+++ Python-2.7.3/configure.in 2013-03-25 15:15:32.513887426 -0400
+diff -up Python-2.7.3/configure.ac.fix-configure-Wformat Python-2.7.3/configure.ac
+--- Python-2.7.3/configure.ac.fix-configure-Wformat 2013-03-25 15:15:18.473888383 -0400
++++ Python-2.7.3/configure.ac 2013-03-25 15:15:32.513887426 -0400
@@ -1200,7 +1200,7 @@ if test "$GCC" = "yes"
then
AC_MSG_CHECKING(whether gcc supports ParseTuple __format__)
diff --git a/05000-autotool-intermediates.patch b/05000-autotool-intermediates.patch
index 2847d47..4a40a56 100644
--- a/05000-autotool-intermediates.patch
+++ b/05000-autotool-intermediates.patch
@@ -1,44 +1,7 @@
diff -up ./configure.autotool-intermediates ./configure
---- ./configure.autotool-intermediates 2013-03-25 15:25:30.438846538 -0400
-+++ ./configure 2013-03-25 15:25:32.496846397 -0400
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # From configure.in Revision.
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.67 for python 2.7.
-+# Generated by GNU Autoconf 2.68 for python 2.7.
- #
- # Report bugs to <http://bugs.python.org/>.
- #
-@@ -92,6 +92,7 @@ fi
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
-+as_myself=
- case $0 in #((
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -217,11 +218,18 @@ IFS=$as_save_IFS
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
-+ # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+ case $- in # ((((
-+ *v*x* | *x*v* ) as_opts=-vx ;;
-+ *v* ) as_opts=-v ;;
-+ *x* ) as_opts=-x ;;
-+ * ) as_opts= ;;
-+ esac
-+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
- fi
-
- if test x$as_have_required = xno; then :
-@@ -611,6 +619,8 @@ TRUE
+--- ./configure.autotool-intermediates 2013-04-09 11:24:01.024185796 +0200
++++ ./configure 2013-04-09 11:24:01.780183954 +0200
+@@ -639,6 +639,8 @@ TRUE
MACHDEP_OBJS
DYNLOADFILE
DLINCLDIR
@@ -47,16 +10,16 @@ diff -up ./configure.autotool-intermediates ./configure
THREADOBJ
LDLAST
USE_THREAD_MODULE
-@@ -631,6 +641,8 @@ OTHER_LIBTOOL_OPT
+@@ -659,6 +661,8 @@ OTHER_LIBTOOL_OPT
UNIVERSAL_ARCH_FLAGS
BASECFLAGS
OPT
+DEBUG_SUFFIX
+DEBUG_EXT
LN
+ MKDIR_P
INSTALL_DATA
- INSTALL_SCRIPT
-@@ -752,8 +764,11 @@ with_pth
+@@ -795,8 +799,11 @@ with_pth
enable_ipv6
with_doc_strings
with_tsc
@@ -68,16 +31,7 @@ diff -up ./configure.autotool-intermediates ./configure
with_wctype_functions
with_fpectl
with_libm
-@@ -1174,7 +1189,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
-@@ -1427,8 +1442,11 @@ Optional Packages:
+@@ -1472,8 +1479,11 @@ Optional Packages:
--with-pth use GNU pth threading libraries
--with(out)-doc-strings disable/enable documentation strings
--with(out)-tsc enable/disable timestamp counter profile
@@ -89,461 +43,7 @@ diff -up ./configure.autotool-intermediates ./configure
--with-wctype-functions use wctype.h functions
--with-fpectl enable SIGFPE catching
--with-libm=STRING math library
-@@ -1511,7 +1529,7 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
- cat <<\_ACEOF
- python configure 2.7
--generated by GNU Autoconf 2.67
-+generated by GNU Autoconf 2.68
-
- Copyright (C) 2010 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1557,7 +1575,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
- fi
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_compile
-@@ -1594,7 +1612,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
- fi
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_cpp
-@@ -1607,10 +1625,10 @@ fi
- ac_fn_c_check_header_mongrel ()
- {
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-- if eval "test \"\${$3+set}\"" = set; then :
-+ if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- fi
- eval ac_res=\$$3
-@@ -1677,7 +1695,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 "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=\$ac_header_compiler"
-@@ -1686,7 +1704,7 @@ eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- fi
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_header_mongrel
-
-@@ -1727,7 +1745,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=$ac_status
- fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_run
-@@ -1741,7 +1759,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 "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1759,7 +1777,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_header_compile
-
-@@ -1804,7 +1822,7 @@ fi
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_link
-@@ -1818,7 +1836,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 "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=no"
-@@ -1859,7 +1877,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_type
-
-@@ -1872,7 +1890,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 "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=no"
-@@ -1912,7 +1930,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_find_uintX_t
-
-@@ -1925,7 +1943,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 "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=no"
-@@ -1986,7 +2004,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_find_intX_t
-
-@@ -2163,7 +2181,7 @@ rm -f core *.core core.conftest.* gmon.o
- rm -f conftest.val
-
- fi
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_compute_int
-@@ -2176,7 +2194,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 "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2231,7 +2249,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_func
-
-@@ -2244,7 +2262,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 "test \"\${$4+set}\"" = set; then :
-+if eval \${$4+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2288,7 +2306,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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_member
-
-@@ -2303,7 +2321,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 "test \"\${$3+set}\"" = set; then :
-+if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2334,7 +2352,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
-- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_decl
- cat >config.log <<_ACEOF
-@@ -2342,7 +2360,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by python $as_me 2.7, which was
--generated by GNU Autoconf 2.67. Invocation command line was
-+generated by GNU Autoconf 2.68. Invocation command line was
-
- $ $0 $@
-
-@@ -2600,7 +2618,7 @@ $as_echo "$as_me: loading site script $a
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "failed to load site script $ac_site_file
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
- done
-
-@@ -3241,7 +3259,7 @@ if test -n "$ac_tool_prefix"; then
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -3281,7 +3299,7 @@ if test -z "$ac_cv_prog_CC"; then
- set dummy gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -3334,7 +3352,7 @@ if test -z "$CC"; then
- set dummy ${ac_tool_prefix}cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -3374,7 +3392,7 @@ if test -z "$CC"; then
- set dummy cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -3433,7 +3451,7 @@ if test -z "$CC"; then
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then :
-+if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -3477,7 +3495,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -3532,7 +3550,7 @@ fi
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
-
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3647,7 +3665,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "C compiler cannot create executables
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -3690,7 +3708,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
- rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3749,7 +3767,7 @@ $as_echo "$ac_try_echo"; } >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
- fi
-@@ -3760,7 +3778,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex
- ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
--if test "${ac_cv_objext+set}" = set; then :
-+if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3801,7 +3819,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -3811,7 +3829,7 @@ OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3848,7 +3866,7 @@ ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then :
-+if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -3926,7 +3944,7 @@ else
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
-@@ -4065,7 +4083,7 @@ then
- set dummy g++; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_CXX+set}" = set; then :
-+if ${ac_cv_path_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $CXX in
-@@ -4106,7 +4124,7 @@ fi
- set dummy c++; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_CXX+set}" = set; then :
-+if ${ac_cv_path_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $CXX in
-@@ -4157,7 +4175,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CXX+set}" = set; then :
-+if ${ac_cv_prog_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CXX"; then
-@@ -4228,7 +4246,7 @@ if test -n "$CPP" && test -d "$CPP"; the
- CPP=
- fi
- if test -z "$CPP"; then
-- if test "${ac_cv_prog_CPP+set}" = set; then :
-+ if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- # Double quotes because CPP needs to be expanded
-@@ -4344,7 +4362,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- fi
-
- ac_ext=c
-@@ -4356,7 +4374,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then :
-+if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$GREP"; then
-@@ -4419,7 +4437,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
- $as_echo_n "checking for egrep... " >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then :
-+if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4486,7 +4504,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then :
-+if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4615,7 +4633,7 @@ done
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
--if test "x$ac_cv_header_minix_config_h" = x""yes; then :
-+if test "x$ac_cv_header_minix_config_h" = xyes; then :
- MINIX=yes
- else
- MINIX=
-@@ -4637,7 +4655,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 test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
-+if ${ac_cv_safe_to_define___extensions__+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4747,7 +4765,7 @@ esac
+@@ -5171,7 +5181,7 @@ esac
$as_echo_n "checking LIBRARY... " >&6; }
if test -z "$LIBRARY"
then
@@ -552,7 +52,7 @@ diff -up ./configure.autotool-intermediates ./configure
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5
$as_echo "$LIBRARY" >&6; }
-@@ -4921,8 +4939,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5343,8 +5353,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
INSTSONAME="$LDLIBRARY".$SOVERSION
;;
Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
@@ -563,7 +63,7 @@ diff -up ./configure.autotool-intermediates ./configure
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
case $ac_sys_system in
FreeBSD*)
-@@ -4945,7 +4963,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5367,7 +5377,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
;;
OSF*)
LDLIBRARY='libpython$(VERSION).so'
@@ -572,61 +72,7 @@ diff -up ./configure.autotool-intermediates ./configure
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
;;
atheos*)
-@@ -4981,7 +4999,7 @@ if test -n "$ac_tool_prefix"; then
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+if ${ac_cv_prog_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$RANLIB"; then
-@@ -5021,7 +5039,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
- set dummy ranlib; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_RANLIB"; then
-@@ -5075,7 +5093,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_AR+set}" = set; then :
-+if ${ac_cv_prog_AR+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$AR"; then
-@@ -5125,7 +5143,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 test "${ac_cv_prog_SVNVERSION+set}" = set; then :
-+if ${ac_cv_prog_SVNVERSION+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$SVNVERSION"; then
-@@ -5173,7 +5191,7 @@ fi
- set dummy hg; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_HAS_HG+set}" = set; then :
-+if ${ac_cv_prog_HAS_HG+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$HAS_HG"; then
-@@ -5272,7 +5290,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
- $as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
--if test "${ac_cv_path_install+set}" = set; then :
-+if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5384,6 +5402,14 @@ $as_echo "no" >&6; }
+@@ -5894,6 +5904,14 @@ $as_echo "no" >&6; }
fi
@@ -641,34 +87,7 @@ diff -up ./configure.autotool-intermediates ./configure
# XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be
# merged with this chunk of code?
-@@ -5460,7 +5486,7 @@ yes)
- $as_echo_n "checking whether $CC accepts -fno-strict-aliasing... " >&6; }
- ac_save_cc="$CC"
- CC="$CC -fno-strict-aliasing"
-- if test "${ac_cv_no_strict_aliasing_ok+set}" = set; then :
-+ if ${ac_cv_no_strict_aliasing_ok+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -5650,7 +5676,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -OPT:Olimit=0" >&5
- $as_echo_n "checking whether $CC accepts -OPT:Olimit=0... " >&6; }
--if test "${ac_cv_opt_olimit_ok+set}" = set; then :
-+if ${ac_cv_opt_olimit_ok+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_cc="$CC"
-@@ -5692,7 +5718,7 @@ if test $ac_cv_opt_olimit_ok = yes; then
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Olimit 1500" >&5
- $as_echo_n "checking whether $CC accepts -Olimit 1500... " >&6; }
-- if test "${ac_cv_olimit_ok+set}" = set; then :
-+ if ${ac_cv_olimit_ok+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_cc="$CC"
-@@ -5731,7 +5757,7 @@ then
+@@ -6253,7 +6271,7 @@ then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc supports ParseTuple __format__" >&5
$as_echo_n "checking whether gcc supports ParseTuple __format__... " >&6; }
save_CFLAGS=$CFLAGS
@@ -677,821 +96,7 @@ diff -up ./configure.autotool-intermediates ./configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -5770,7 +5796,7 @@ fi
- # options before we can check whether -Kpthread improves anything.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads are available without options" >&5
- $as_echo_n "checking whether pthreads are available without options... " >&6; }
--if test "${ac_cv_pthread_is_default+set}" = set; then :
-+if ${ac_cv_pthread_is_default+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -5823,7 +5849,7 @@ else
- # function available.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kpthread" >&5
- $as_echo_n "checking whether $CC accepts -Kpthread... " >&6; }
--if test "${ac_cv_kpthread+set}" = set; then :
-+if ${ac_cv_kpthread+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_cc="$CC"
-@@ -5872,7 +5898,7 @@ then
- # function available.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kthread" >&5
- $as_echo_n "checking whether $CC accepts -Kthread... " >&6; }
--if test "${ac_cv_kthread+set}" = set; then :
-+if ${ac_cv_kthread+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_cc="$CC"
-@@ -5921,7 +5947,7 @@ then
- # function available.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5
- $as_echo_n "checking whether $CC accepts -pthread... " >&6; }
--if test "${ac_cv_thread+set}" = set; then :
-+if ${ac_cv_thread+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_cc="$CC"
-@@ -6006,7 +6032,7 @@ CXX="$ac_save_cxx"
- # checks for header files
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then :
-+if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6145,7 +6171,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 "test \"\${$as_ac_Header+set}\"" = set; then :
-+if eval \${$as_ac_Header+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6185,7 +6211,7 @@ done
- if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
- $as_echo_n "checking for library containing opendir... " >&6; }
--if test "${ac_cv_search_opendir+set}" = set; then :
-+if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
-@@ -6219,11 +6245,11 @@ for ac_lib in '' dir; do
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
-- if test "${ac_cv_search_opendir+set}" = set; then :
-+ if ${ac_cv_search_opendir+:} false; then :
- break
- fi
- done
--if test "${ac_cv_search_opendir+set}" = set; then :
-+if ${ac_cv_search_opendir+:} false; then :
-
- else
- ac_cv_search_opendir=no
-@@ -6242,7 +6268,7 @@ fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
- $as_echo_n "checking for library containing opendir... " >&6; }
--if test "${ac_cv_search_opendir+set}" = set; then :
-+if ${ac_cv_search_opendir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
-@@ -6276,11 +6302,11 @@ for ac_lib in '' x; do
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
-- if test "${ac_cv_search_opendir+set}" = set; then :
-+ if ${ac_cv_search_opendir+:} false; then :
- break
- fi
- done
--if test "${ac_cv_search_opendir+set}" = set; then :
-+if ${ac_cv_search_opendir+:} false; then :
-
- else
- ac_cv_search_opendir=no
-@@ -6300,7 +6326,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5
- $as_echo_n "checking whether sys/types.h defines makedev... " >&6; }
--if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then :
-+if ${ac_cv_header_sys_types_h_makedev+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6328,7 +6354,7 @@ $as_echo "$ac_cv_header_sys_types_h_make
-
- if test $ac_cv_header_sys_types_h_makedev = no; then
- ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
--if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then :
-+if test "x$ac_cv_header_sys_mkdev_h" = xyes; then :
-
- $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h
-
-@@ -6338,7 +6364,7 @@ fi
-
- if test $ac_cv_header_sys_mkdev_h = no; then
- ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
--if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
-+if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
-
- $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h
-
-@@ -6358,7 +6384,7 @@ do :
- #endif
-
- "
--if test "x$ac_cv_header_term_h" = x""yes; then :
-+if test "x$ac_cv_header_term_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_TERM_H 1
- _ACEOF
-@@ -6380,7 +6406,7 @@ do :
- #endif
-
- "
--if test "x$ac_cv_header_linux_netlink_h" = x""yes; then :
-+if test "x$ac_cv_header_linux_netlink_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LINUX_NETLINK_H 1
- _ACEOF
-@@ -6543,7 +6569,7 @@ EOF
-
- # Type availability checks
- ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
--if test "x$ac_cv_type_mode_t" = x""yes; then :
-+if test "x$ac_cv_type_mode_t" = xyes; then :
-
- else
-
-@@ -6554,7 +6580,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" = x""yes; then :
-+if test "x$ac_cv_type_off_t" = xyes; then :
-
- else
-
-@@ -6565,7 +6591,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" = x""yes; then :
-+if test "x$ac_cv_type_pid_t" = xyes; then :
-
- else
-
-@@ -6581,7 +6607,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" = x""yes; then :
-+if test "x$ac_cv_type_size_t" = xyes; then :
-
- else
-
-@@ -6593,7 +6619,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
- $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
--if test "${ac_cv_type_uid_t+set}" = set; then :
-+if ${ac_cv_type_uid_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6672,7 +6698,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" = x""yes; then :
-+if test "x$ac_cv_type_ssize_t" = xyes; then :
-
- $as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h
-
-@@ -6687,7 +6713,7 @@ fi
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
- $as_echo_n "checking size of int... " >&6; }
--if test "${ac_cv_sizeof_int+set}" = set; then :
-+if ${ac_cv_sizeof_int+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-@@ -6697,7 +6723,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (int)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_int=0
- fi
-@@ -6720,7 +6746,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
- $as_echo_n "checking size of long... " >&6; }
--if test "${ac_cv_sizeof_long+set}" = set; then :
-+if ${ac_cv_sizeof_long+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
-@@ -6730,7 +6756,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (long)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long=0
- fi
-@@ -6753,7 +6779,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
- $as_echo_n "checking size of void *... " >&6; }
--if test "${ac_cv_sizeof_void_p+set}" = set; then :
-+if ${ac_cv_sizeof_void_p+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
-@@ -6763,7 +6789,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (void *)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_void_p=0
- fi
-@@ -6786,7 +6812,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
- $as_echo_n "checking size of short... " >&6; }
--if test "${ac_cv_sizeof_short+set}" = set; then :
-+if ${ac_cv_sizeof_short+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
-@@ -6796,7 +6822,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (short)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_short=0
- fi
-@@ -6819,7 +6845,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
- $as_echo_n "checking size of float... " >&6; }
--if test "${ac_cv_sizeof_float+set}" = set; then :
-+if ${ac_cv_sizeof_float+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then :
-@@ -6829,7 +6855,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (float)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_float=0
- fi
-@@ -6852,7 +6878,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
- $as_echo_n "checking size of double... " >&6; }
--if test "${ac_cv_sizeof_double+set}" = set; then :
-+if ${ac_cv_sizeof_double+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then :
-@@ -6862,7 +6888,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (double)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_double=0
- fi
-@@ -6885,7 +6911,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of fpos_t" >&5
- $as_echo_n "checking size of fpos_t... " >&6; }
--if test "${ac_cv_sizeof_fpos_t+set}" = set; then :
-+if ${ac_cv_sizeof_fpos_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fpos_t))" "ac_cv_sizeof_fpos_t" "$ac_includes_default"; then :
-@@ -6895,7 +6921,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (fpos_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_fpos_t=0
- fi
-@@ -6918,7 +6944,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
- $as_echo_n "checking size of size_t... " >&6; }
--if test "${ac_cv_sizeof_size_t+set}" = set; then :
-+if ${ac_cv_sizeof_size_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then :
-@@ -6928,7 +6954,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (size_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_size_t=0
- fi
-@@ -6951,7 +6977,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5
- $as_echo_n "checking size of pid_t... " >&6; }
--if test "${ac_cv_sizeof_pid_t+set}" = set; then :
-+if ${ac_cv_sizeof_pid_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then :
-@@ -6961,7 +6987,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (pid_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_pid_t=0
- fi
-@@ -7011,7 +7037,7 @@ if test "$have_long_long" = yes ; then
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
- $as_echo_n "checking size of long long... " >&6; }
--if test "${ac_cv_sizeof_long_long+set}" = set; then :
-+if ${ac_cv_sizeof_long_long+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
-@@ -7021,7 +7047,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (long long)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_long=0
- fi
-@@ -7072,7 +7098,7 @@ if test "$have_long_double" = yes ; then
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5
- $as_echo_n "checking size of long double... " >&6; }
--if test "${ac_cv_sizeof_long_double+set}" = set; then :
-+if ${ac_cv_sizeof_long_double+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then :
-@@ -7082,7 +7108,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (long double)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_long_double=0
- fi
-@@ -7133,7 +7159,7 @@ if test "$have_c99_bool" = yes ; then
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5
- $as_echo_n "checking size of _Bool... " >&6; }
--if test "${ac_cv_sizeof__Bool+set}" = set; then :
-+if ${ac_cv_sizeof__Bool+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool" "$ac_includes_default"; then :
-@@ -7143,7 +7169,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (_Bool)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof__Bool=0
- fi
-@@ -7169,7 +7195,7 @@ ac_fn_c_check_type "$LINENO" "uintptr_t"
- #include <inttypes.h>
- #endif
- "
--if test "x$ac_cv_type_uintptr_t" = x""yes; then :
-+if test "x$ac_cv_type_uintptr_t" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_UINTPTR_T 1
-@@ -7181,7 +7207,7 @@ _ACEOF
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5
- $as_echo_n "checking size of uintptr_t... " >&6; }
--if test "${ac_cv_sizeof_uintptr_t+set}" = set; then :
-+if ${ac_cv_sizeof_uintptr_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t" "$ac_includes_default"; then :
-@@ -7191,7 +7217,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (uintptr_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_uintptr_t=0
- fi
-@@ -7217,7 +7243,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 test "${ac_cv_sizeof_off_t+set}" = set; then :
-+if ${ac_cv_sizeof_off_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "
-@@ -7232,7 +7258,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (off_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_off_t=0
- fi
-@@ -7276,7 +7302,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 test "${ac_cv_sizeof_time_t+set}" = set; then :
-+if ${ac_cv_sizeof_time_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "
-@@ -7294,7 +7320,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (time_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_time_t=0
- fi
-@@ -7350,7 +7376,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 test "${ac_cv_sizeof_pthread_t+set}" = set; then :
-+if ${ac_cv_sizeof_pthread_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_t))" "ac_cv_sizeof_pthread_t" "
-@@ -7365,7 +7391,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (pthread_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_pthread_t=0
- fi
-@@ -7877,7 +7903,7 @@ $as_echo "$SHLIBS" >&6; }
- # checks for libraries
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+if ${ac_cv_lib_dl_dlopen+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -7911,7 +7937,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDL 1
- _ACEOF
-@@ -7922,7 +7948,7 @@ fi
- # Dynamic linking for SunOS/Solaris and SYSV
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
- $as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-+if ${ac_cv_lib_dld_shl_load+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -7956,7 +7982,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
- $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDLD 1
- _ACEOF
-@@ -7970,7 +7996,7 @@ fi
- if test "$with_threads" = "yes" -o -z "$with_threads"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5
- $as_echo_n "checking for library containing sem_init... " >&6; }
--if test "${ac_cv_search_sem_init+set}" = set; then :
-+if ${ac_cv_search_sem_init+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
-@@ -8004,11 +8030,11 @@ for ac_lib in '' pthread rt posix4; do
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
-- if test "${ac_cv_search_sem_init+set}" = set; then :
-+ if ${ac_cv_search_sem_init+:} false; then :
- break
- fi
- done
--if test "${ac_cv_search_sem_init+set}" = set; then :
-+if ${ac_cv_search_sem_init+:} false; then :
-
- else
- ac_cv_search_sem_init=no
-@@ -8031,7 +8057,7 @@ fi
- # check if we need libintl for locale functions
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for textdomain in -lintl" >&5
- $as_echo_n "checking for textdomain in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_textdomain+set}" = set; then :
-+if ${ac_cv_lib_intl_textdomain+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8065,7 +8091,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_textdomain" >&5
- $as_echo "$ac_cv_lib_intl_textdomain" >&6; }
--if test "x$ac_cv_lib_intl_textdomain" = x""yes; then :
-+if test "x$ac_cv_lib_intl_textdomain" = xyes; then :
-
- $as_echo "#define WITH_LIBINTL 1" >>confdefs.h
-
-@@ -8112,7 +8138,7 @@ esac
- # BeOS' sockets are stashed in libnet.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5
- $as_echo_n "checking for t_open in -lnsl... " >&6; }
--if test "${ac_cv_lib_nsl_t_open+set}" = set; then :
-+if ${ac_cv_lib_nsl_t_open+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8146,13 +8172,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" = x""yes; then :
-+if test "x$ac_cv_lib_nsl_t_open" = xyes; then :
- LIBS="-lnsl $LIBS"
- fi
- # SVR4
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
- $as_echo_n "checking for socket in -lsocket... " >&6; }
--if test "${ac_cv_lib_socket_socket+set}" = set; then :
-+if ${ac_cv_lib_socket_socket+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8186,7 +8212,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
- $as_echo "$ac_cv_lib_socket_socket" >&6; }
--if test "x$ac_cv_lib_socket_socket" = x""yes; then :
-+if test "x$ac_cv_lib_socket_socket" = xyes; then :
- LIBS="-lsocket $LIBS"
- fi
- # SVR4 sockets
-@@ -8195,7 +8221,7 @@ case "$ac_sys_system" in
- BeOS*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnet" >&5
- $as_echo_n "checking for socket in -lnet... " >&6; }
--if test "${ac_cv_lib_net_socket+set}" = set; then :
-+if ${ac_cv_lib_net_socket+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8229,7 +8255,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_net_socket" >&5
- $as_echo "$ac_cv_lib_net_socket" >&6; }
--if test "x$ac_cv_lib_net_socket" = x""yes; then :
-+if test "x$ac_cv_lib_net_socket" = xyes; then :
- LIBS="-lnet $LIBS"
- fi
- # BeOS
-@@ -8257,7 +8283,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 test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $PKG_CONFIG in
-@@ -8300,7 +8326,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 test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $ac_pt_PKG_CONFIG in
-@@ -8568,7 +8594,7 @@ $as_echo "$unistd_defines_pthreads" >&6;
- $as_echo "#define _REENTRANT 1" >>confdefs.h
-
- ac_fn_c_check_header_mongrel "$LINENO" "cthreads.h" "ac_cv_header_cthreads_h" "$ac_includes_default"
--if test "x$ac_cv_header_cthreads_h" = x""yes; then :
-+if test "x$ac_cv_header_cthreads_h" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- $as_echo "#define C_THREADS 1" >>confdefs.h
-@@ -8581,7 +8607,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" = x""yes; then :
-+if test "x$ac_cv_header_mach_cthreads_h" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- $as_echo "#define C_THREADS 1" >>confdefs.h
-@@ -8643,7 +8669,7 @@ else
-
- LIBS=$_libs
- ac_fn_c_check_func "$LINENO" "pthread_detach" "ac_cv_func_pthread_detach"
--if test "x$ac_cv_func_pthread_detach" = x""yes; then :
-+if test "x$ac_cv_func_pthread_detach" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- posix_threads=yes
-@@ -8651,7 +8677,7 @@ if test "x$ac_cv_func_pthread_detach" =
- else
-
- ac_fn_c_check_header_mongrel "$LINENO" "atheos/threads.h" "ac_cv_header_atheos_threads_h" "$ac_includes_default"
--if test "x$ac_cv_header_atheos_threads_h" = x""yes; then :
-+if test "x$ac_cv_header_atheos_threads_h" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
-
-@@ -8661,7 +8687,7 @@ $as_echo "#define ATHEOS_THREADS 1" >>co
- else
-
- ac_fn_c_check_header_mongrel "$LINENO" "kernel/OS.h" "ac_cv_header_kernel_OS_h" "$ac_includes_default"
--if test "x$ac_cv_header_kernel_OS_h" = x""yes; then :
-+if test "x$ac_cv_header_kernel_OS_h" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
-
-@@ -8672,7 +8698,7 @@ else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
- $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
--if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then :
-+if ${ac_cv_lib_pthreads_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8706,7 +8732,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" = x""yes; then :
-+if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- posix_threads=yes
-@@ -8716,7 +8742,7 @@ else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
- $as_echo_n "checking for pthread_create in -lc_r... " >&6; }
--if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then :
-+if ${ac_cv_lib_c_r_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8750,7 +8776,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" = x""yes; then :
-+if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- posix_threads=yes
-@@ -8760,7 +8786,7 @@ else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_create_system in -lpthread" >&5
- $as_echo_n "checking for __pthread_create_system in -lpthread... " >&6; }
--if test "${ac_cv_lib_pthread___pthread_create_system+set}" = set; then :
-+if ${ac_cv_lib_pthread___pthread_create_system+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8794,7 +8820,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" = x""yes; then :
-+if test "x$ac_cv_lib_pthread___pthread_create_system" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- posix_threads=yes
-@@ -8804,7 +8830,7 @@ else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lcma" >&5
- $as_echo_n "checking for pthread_create in -lcma... " >&6; }
--if test "${ac_cv_lib_cma_pthread_create+set}" = set; then :
-+if ${ac_cv_lib_cma_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8838,7 +8864,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" = x""yes; then :
-+if test "x$ac_cv_lib_cma_pthread_create" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- posix_threads=yes
-@@ -8878,7 +8904,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5
- $as_echo_n "checking for usconfig in -lmpc... " >&6; }
--if test "${ac_cv_lib_mpc_usconfig+set}" = set; then :
-+if ${ac_cv_lib_mpc_usconfig+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8912,7 +8938,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" = x""yes; then :
-+if test "x$ac_cv_lib_mpc_usconfig" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- LIBS="$LIBS -lmpc"
-@@ -8924,7 +8950,7 @@ fi
- if test "$posix_threads" != "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thr_create in -lthread" >&5
- $as_echo_n "checking for thr_create in -lthread... " >&6; }
--if test "${ac_cv_lib_thread_thr_create+set}" = set; then :
-+if ${ac_cv_lib_thread_thr_create+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -8958,7 +8984,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" = x""yes; then :
-+if test "x$ac_cv_lib_thread_thr_create" = xyes; then :
- $as_echo "#define WITH_THREAD 1" >>confdefs.h
-
- LIBS="$LIBS -lthread"
-@@ -9003,7 +9029,7 @@ $as_echo "#define HAVE_BROKEN_POSIX_SEMA
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5
- $as_echo_n "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; }
-- if test "${ac_cv_pthread_system_supported+set}" = set; then :
-+ if ${ac_cv_pthread_system_supported+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -9046,7 +9072,7 @@ $as_echo "#define PTHREAD_SYSTEM_SCHED_S
- for ac_func in pthread_sigmask
- do :
- ac_fn_c_check_func "$LINENO" "pthread_sigmask" "ac_cv_func_pthread_sigmask"
--if test "x$ac_cv_func_pthread_sigmask" = x""yes; then :
-+if test "x$ac_cv_func_pthread_sigmask" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_PTHREAD_SIGMASK 1
- _ACEOF
-@@ -9399,6 +9425,50 @@ $as_echo "no" >&6; }
+@@ -9958,6 +9976,50 @@ $as_echo "no" >&6; }
fi
@@ -1542,16 +147,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; }
-@@ -9436,7 +9506,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" = x""yes; then :
-+if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then :
-
- $as_echo "#define WITH_VALGRIND 1" >>confdefs.h
-
-@@ -9448,6 +9518,46 @@ fi
+@@ -10007,6 +10069,46 @@ fi
fi
@@ -1598,1109 +194,9 @@ diff -up ./configure.autotool-intermediates ./configure
# Check for --with-wctype-functions
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wctype-functions" >&5
$as_echo_n "checking for --with-wctype-functions... " >&6; }
-@@ -9480,7 +9590,7 @@ DLINCLDIR=.
- for ac_func in dlopen
- do :
- ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
--if test "x$ac_cv_func_dlopen" = x""yes; then :
-+if test "x$ac_cv_func_dlopen" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_DLOPEN 1
- _ACEOF
-@@ -9810,7 +9920,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 test "${ac_cv_flock_decl+set}" = set; then :
-+if ${ac_cv_flock_decl+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9840,7 +9950,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" = x""yes; then :
-+if test "x$ac_cv_func_flock" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_FLOCK 1
- _ACEOF
-@@ -9848,7 +9958,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 test "${ac_cv_lib_bsd_flock+set}" = set; then :
-+if ${ac_cv_lib_bsd_flock+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -9882,7 +9992,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" = x""yes; then :
-+if test "x$ac_cv_lib_bsd_flock" = xyes; then :
- $as_echo "#define HAVE_FLOCK 1" >>confdefs.h
-
-
-@@ -9959,7 +10069,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_TRUE+set}" = set; then :
-+if ${ac_cv_prog_TRUE+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$TRUE"; then
-@@ -9999,7 +10109,7 @@ test -n "$TRUE" || TRUE="/bin/true"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lc" >&5
- $as_echo_n "checking for inet_aton in -lc... " >&6; }
--if test "${ac_cv_lib_c_inet_aton+set}" = set; then :
-+if ${ac_cv_lib_c_inet_aton+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10033,12 +10143,12 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inet_aton" >&5
- $as_echo "$ac_cv_lib_c_inet_aton" >&6; }
--if test "x$ac_cv_lib_c_inet_aton" = x""yes; then :
-+if test "x$ac_cv_lib_c_inet_aton" = xyes; then :
- $ac_cv_prog_TRUE
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
- $as_echo_n "checking for inet_aton in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then :
-+if ${ac_cv_lib_resolv_inet_aton+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10072,7 +10182,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
- $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
--if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then :
-+if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBRESOLV 1
- _ACEOF
-@@ -10089,7 +10199,7 @@ fi
- # exit Python
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5
- $as_echo_n "checking for chflags... " >&6; }
--if test "${ac_cv_have_chflags+set}" = set; then :
-+if ${ac_cv_have_chflags+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -10123,7 +10233,7 @@ fi
- $as_echo "$ac_cv_have_chflags" >&6; }
- if test "$ac_cv_have_chflags" = cross ; then
- ac_fn_c_check_func "$LINENO" "chflags" "ac_cv_func_chflags"
--if test "x$ac_cv_func_chflags" = x""yes; then :
-+if test "x$ac_cv_func_chflags" = xyes; then :
- ac_cv_have_chflags="yes"
- else
- ac_cv_have_chflags="no"
-@@ -10138,7 +10248,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5
- $as_echo_n "checking for lchflags... " >&6; }
--if test "${ac_cv_have_lchflags+set}" = set; then :
-+if ${ac_cv_have_lchflags+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -10172,7 +10282,7 @@ fi
- $as_echo "$ac_cv_have_lchflags" >&6; }
- if test "$ac_cv_have_lchflags" = cross ; then
- ac_fn_c_check_func "$LINENO" "lchflags" "ac_cv_func_lchflags"
--if test "x$ac_cv_func_lchflags" = x""yes; then :
-+if test "x$ac_cv_func_lchflags" = xyes; then :
- ac_cv_have_lchflags="yes"
- else
- ac_cv_have_lchflags="no"
-@@ -10196,7 +10306,7 @@ esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
- $as_echo_n "checking for inflateCopy in -lz... " >&6; }
--if test "${ac_cv_lib_z_inflateCopy+set}" = set; then :
-+if ${ac_cv_lib_z_inflateCopy+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10230,7 +10340,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5
- $as_echo "$ac_cv_lib_z_inflateCopy" >&6; }
--if test "x$ac_cv_lib_z_inflateCopy" = x""yes; then :
-+if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
-
- $as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h
-
-@@ -10373,7 +10483,7 @@ rm -f core conftest.err conftest.$ac_obj
- for ac_func in openpty
- do :
- ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
--if test "x$ac_cv_func_openpty" = x""yes; then :
-+if test "x$ac_cv_func_openpty" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_OPENPTY 1
- _ACEOF
-@@ -10381,7 +10491,7 @@ _ACEOF
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
- $as_echo_n "checking for openpty in -lutil... " >&6; }
--if test "${ac_cv_lib_util_openpty+set}" = set; then :
-+if ${ac_cv_lib_util_openpty+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10415,13 +10525,13 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
- $as_echo "$ac_cv_lib_util_openpty" >&6; }
--if test "x$ac_cv_lib_util_openpty" = x""yes; then :
-+if test "x$ac_cv_lib_util_openpty" = xyes; then :
- $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
- LIBS="$LIBS -lutil"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
- $as_echo_n "checking for openpty in -lbsd... " >&6; }
--if test "${ac_cv_lib_bsd_openpty+set}" = set; then :
-+if ${ac_cv_lib_bsd_openpty+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10455,7 +10565,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
- $as_echo "$ac_cv_lib_bsd_openpty" >&6; }
--if test "x$ac_cv_lib_bsd_openpty" = x""yes; then :
-+if test "x$ac_cv_lib_bsd_openpty" = xyes; then :
- $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
- LIBS="$LIBS -lbsd"
- fi
-@@ -10470,7 +10580,7 @@ done
- for ac_func in forkpty
- do :
- ac_fn_c_check_func "$LINENO" "forkpty" "ac_cv_func_forkpty"
--if test "x$ac_cv_func_forkpty" = x""yes; then :
-+if test "x$ac_cv_func_forkpty" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_FORKPTY 1
- _ACEOF
-@@ -10478,7 +10588,7 @@ _ACEOF
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5
- $as_echo_n "checking for forkpty in -lutil... " >&6; }
--if test "${ac_cv_lib_util_forkpty+set}" = set; then :
-+if ${ac_cv_lib_util_forkpty+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10512,13 +10622,13 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5
- $as_echo "$ac_cv_lib_util_forkpty" >&6; }
--if test "x$ac_cv_lib_util_forkpty" = x""yes; then :
-+if test "x$ac_cv_lib_util_forkpty" = xyes; then :
- $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
- LIBS="$LIBS -lutil"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lbsd" >&5
- $as_echo_n "checking for forkpty in -lbsd... " >&6; }
--if test "${ac_cv_lib_bsd_forkpty+set}" = set; then :
-+if ${ac_cv_lib_bsd_forkpty+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10552,7 +10662,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_forkpty" >&5
- $as_echo "$ac_cv_lib_bsd_forkpty" >&6; }
--if test "x$ac_cv_lib_bsd_forkpty" = x""yes; then :
-+if test "x$ac_cv_lib_bsd_forkpty" = xyes; then :
- $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
- LIBS="$LIBS -lbsd"
- fi
-@@ -10569,7 +10679,7 @@ done
- for ac_func in memmove
- do :
- ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
--if test "x$ac_cv_func_memmove" = x""yes; then :
-+if test "x$ac_cv_func_memmove" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_MEMMOVE 1
- _ACEOF
-@@ -10593,7 +10703,7 @@ done
-
-
- ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
--if test "x$ac_cv_func_dup2" = x""yes; then :
-+if test "x$ac_cv_func_dup2" = xyes; then :
- $as_echo "#define HAVE_DUP2 1" >>confdefs.h
-
- else
-@@ -10606,7 +10716,7 @@ esac
- fi
-
- ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
--if test "x$ac_cv_func_getcwd" = x""yes; then :
-+if test "x$ac_cv_func_getcwd" = xyes; then :
- $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
-
- else
-@@ -10619,7 +10729,7 @@ esac
- fi
-
- ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
--if test "x$ac_cv_func_strdup" = x""yes; then :
-+if test "x$ac_cv_func_strdup" = xyes; then :
- $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
-
- else
-@@ -10635,7 +10745,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" = x""yes; then :
-+if test "x$ac_cv_func_getpgrp" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_GETPGRP 1
- _ACEOF
-@@ -10663,7 +10773,7 @@ done
- for ac_func in setpgrp
- do :
- ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp"
--if test "x$ac_cv_func_setpgrp" = x""yes; then :
-+if test "x$ac_cv_func_setpgrp" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_SETPGRP 1
- _ACEOF
-@@ -10691,7 +10801,7 @@ done
- for ac_func in gettimeofday
- do :
- ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
--if test "x$ac_cv_func_gettimeofday" = x""yes; then :
-+if test "x$ac_cv_func_gettimeofday" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_GETTIMEOFDAY 1
- _ACEOF
-@@ -10793,7 +10903,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 test "${ac_cv_buggy_getaddrinfo+set}" = set; then :
-+ if ${ac_cv_buggy_getaddrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -10922,7 +11032,7 @@ fi
- for ac_func in getnameinfo
- do :
- ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo"
--if test "x$ac_cv_func_getnameinfo" = x""yes; then :
-+if test "x$ac_cv_func_getnameinfo" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_GETNAMEINFO 1
- _ACEOF
-@@ -10934,7 +11044,7 @@ done
- # checks for structures
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
- $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
--if test "${ac_cv_header_time+set}" = set; then :
-+if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10969,7 +11079,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
- $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
--if test "${ac_cv_struct_tm+set}" = set; then :
-+if ${ac_cv_struct_tm+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11006,7 +11116,7 @@ ac_fn_c_check_member "$LINENO" "struct t
- #include <$ac_cv_struct_tm>
-
- "
--if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
-+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -11022,7 +11132,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf
- else
- ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
- "
--if test "x$ac_cv_have_decl_tzname" = x""yes; then :
-+if test "x$ac_cv_have_decl_tzname" = xyes; then :
- ac_have_decl=1
- else
- ac_have_decl=0
-@@ -11034,7 +11144,7 @@ _ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
- $as_echo_n "checking for tzname... " >&6; }
--if test "${ac_cv_var_tzname+set}" = set; then :
-+if ${ac_cv_var_tzname+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11070,7 +11180,7 @@ $as_echo "#define HAVE_TZNAME 1" >>confd
- fi
-
- ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
--if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
-+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_RDEV 1
-@@ -11080,7 +11190,7 @@ _ACEOF
- fi
-
- ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
--if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then :
-+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-@@ -11090,7 +11200,7 @@ _ACEOF
- fi
-
- ac_fn_c_check_member "$LINENO" "struct stat" "st_flags" "ac_cv_member_struct_stat_st_flags" "$ac_includes_default"
--if test "x$ac_cv_member_struct_stat_st_flags" = x""yes; then :
-+if test "x$ac_cv_member_struct_stat_st_flags" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_FLAGS 1
-@@ -11100,7 +11210,7 @@ _ACEOF
- fi
-
- ac_fn_c_check_member "$LINENO" "struct stat" "st_gen" "ac_cv_member_struct_stat_st_gen" "$ac_includes_default"
--if test "x$ac_cv_member_struct_stat_st_gen" = x""yes; then :
-+if test "x$ac_cv_member_struct_stat_st_gen" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_GEN 1
-@@ -11110,7 +11220,7 @@ _ACEOF
- fi
-
- ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
--if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
-+if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-@@ -11120,7 +11230,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" = x""yes; then :
-+if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-@@ -11142,7 +11252,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5
- $as_echo_n "checking for time.h that defines altzone... " >&6; }
--if test "${ac_cv_header_time_altzone+set}" = set; then :
-+if ${ac_cv_header_time_altzone+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -11206,7 +11316,7 @@ $as_echo "$was_it_defined" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for addrinfo" >&5
- $as_echo_n "checking for addrinfo... " >&6; }
--if test "${ac_cv_struct_addrinfo+set}" = set; then :
-+if ${ac_cv_struct_addrinfo+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11238,7 +11348,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5
- $as_echo_n "checking for sockaddr_storage... " >&6; }
--if test "${ac_cv_struct_sockaddr_storage+set}" = set; then :
-+if ${ac_cv_struct_sockaddr_storage+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11274,7 +11384,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
- $as_echo_n "checking whether char is unsigned... " >&6; }
--if test "${ac_cv_c_char_unsigned+set}" = set; then :
-+if ${ac_cv_c_char_unsigned+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11306,7 +11416,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
- $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
--if test "${ac_cv_c_const+set}" = set; then :
-+if ${ac_cv_c_const+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11594,7 +11704,7 @@ $as_echo "$va_list_is_array" >&6; }
-
-
- ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r"
--if test "x$ac_cv_func_gethostbyname_r" = x""yes; then :
-+if test "x$ac_cv_func_gethostbyname_r" = xyes; then :
-
- $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
-
-@@ -11725,7 +11835,7 @@ else
- for ac_func in gethostbyname
- do :
- ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
--if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-+if test "x$ac_cv_func_gethostbyname" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_GETHOSTBYNAME 1
- _ACEOF
-@@ -11747,12 +11857,12 @@ fi
-
- # Linux requires this for correct f.p. operations
- ac_fn_c_check_func "$LINENO" "__fpu_control" "ac_cv_func___fpu_control"
--if test "x$ac_cv_func___fpu_control" = x""yes; then :
-+if test "x$ac_cv_func___fpu_control" = xyes; then :
-
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpu_control in -lieee" >&5
- $as_echo_n "checking for __fpu_control in -lieee... " >&6; }
--if test "${ac_cv_lib_ieee___fpu_control+set}" = set; then :
-+if ${ac_cv_lib_ieee___fpu_control+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -11786,7 +11896,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee___fpu_control" >&5
- $as_echo "$ac_cv_lib_ieee___fpu_control" >&6; }
--if test "x$ac_cv_lib_ieee___fpu_control" = x""yes; then :
-+if test "x$ac_cv_lib_ieee___fpu_control" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBIEEE 1
- _ACEOF
-@@ -11881,7 +11991,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 test "${ac_cv_little_endian_double+set}" = set; then :
-+if ${ac_cv_little_endian_double+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -11923,7 +12033,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 test "${ac_cv_big_endian_double+set}" = set; then :
-+if ${ac_cv_big_endian_double+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -11969,7 +12079,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 test "${ac_cv_mixed_endian_double+set}" = set; then :
-+if ${ac_cv_mixed_endian_double+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -12117,7 +12227,7 @@ LIBS="$LIBS $LIBM"
- # -0. on some architectures.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tanh preserves the sign of zero" >&5
- $as_echo_n "checking whether tanh preserves the sign of zero... " >&6; }
--if test "${ac_cv_tanh_preserves_zero_sign+set}" = set; then :
-+if ${ac_cv_tanh_preserves_zero_sign+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -12185,7 +12295,7 @@ done
-
- ac_fn_c_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include <math.h>
- "
--if test "x$ac_cv_have_decl_isinf" = x""yes; then :
-+if test "x$ac_cv_have_decl_isinf" = xyes; then :
- ac_have_decl=1
- else
- ac_have_decl=0
-@@ -12196,7 +12306,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- ac_fn_c_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include <math.h>
- "
--if test "x$ac_cv_have_decl_isnan" = x""yes; then :
-+if test "x$ac_cv_have_decl_isnan" = xyes; then :
- ac_have_decl=1
- else
- ac_have_decl=0
-@@ -12207,7 +12317,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- ac_fn_c_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include <math.h>
- "
--if test "x$ac_cv_have_decl_isfinite" = x""yes; then :
-+if test "x$ac_cv_have_decl_isfinite" = xyes; then :
- ac_have_decl=1
- else
- ac_have_decl=0
-@@ -12227,7 +12337,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 test "${ac_cv_posix_semaphores_enabled+set}" = set; then :
-+if ${ac_cv_posix_semaphores_enabled+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -12278,7 +12388,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 test "${ac_cv_broken_sem_getvalue+set}" = set; then :
-+if ${ac_cv_broken_sem_getvalue+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -12343,7 +12453,7 @@ no)
- 15|30)
- ;;
- *)
-- as_fn_error $? "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;;
-+ as_fn_error $? "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5
- $as_echo "$enable_big_digits" >&6; }
-@@ -12361,7 +12471,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" = x""yes; then :
-+if test "x$ac_cv_header_wchar_h" = xyes; then :
-
-
- $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
-@@ -12384,7 +12494,7 @@ then
- # This bug is HP SR number 8606223364.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
- $as_echo_n "checking size of wchar_t... " >&6; }
--if test "${ac_cv_sizeof_wchar_t+set}" = set; then :
-+if ${ac_cv_sizeof_wchar_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "#include <wchar.h>
-@@ -12395,7 +12505,7 @@ else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error 77 "cannot compute sizeof (wchar_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details" "$LINENO" 5; }
- else
- ac_cv_sizeof_wchar_t=0
- fi
-@@ -12450,7 +12560,7 @@ then
- # check whether wchar_t is signed or not
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5
- $as_echo_n "checking whether wchar_t is signed... " >&6; }
-- if test "${ac_cv_wchar_t_signed+set}" = set; then :
-+ if ${ac_cv_wchar_t_signed+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -12514,7 +12624,7 @@ ucs4) unicode_size="4"
- $as_echo "#define Py_UNICODE_SIZE 4" >>confdefs.h
-
- ;;
--*) as_fn_error $? "invalid value for --enable-unicode. Use either ucs2 or ucs4 (lowercase)." "$LINENO" 5 ;;
-+*) as_fn_error $? "invalid value for --enable-unicode. Use either ucs2 or ucs4 (lowercase)." "$LINENO" 5 ;;
- esac
-
-
-@@ -12561,7 +12671,7 @@ fi
- # check for endianness
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
- $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
--if test "${ac_cv_c_bigendian+set}" = set; then :
-+if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_c_bigendian=unknown
-@@ -12780,7 +12890,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
- ;; #(
- *)
- as_fn_error $? "unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-
-@@ -12788,7 +12898,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
- # or fills with zeros (like the Cray J90, according to Tim Peters).
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5
- $as_echo_n "checking whether right shift extends the sign bit... " >&6; }
--if test "${ac_cv_rshift_extends_sign+set}" = set; then :
-+if ${ac_cv_rshift_extends_sign+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -12827,7 +12937,7 @@ fi
- # check for getc_unlocked and related locking functions
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getc_unlocked() and friends" >&5
- $as_echo_n "checking for getc_unlocked() and friends... " >&6; }
--if test "${ac_cv_have_getc_unlocked+set}" = set; then :
-+if ${ac_cv_have_getc_unlocked+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -12925,7 +13035,7 @@ fi
- # check for readline 2.1
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
- $as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
-+if ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -12959,7 +13069,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
- $as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
--if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
-+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = xyes; then :
-
- $as_echo "#define HAVE_RL_CALLBACK 1" >>confdefs.h
-
-@@ -13011,7 +13121,7 @@ fi
- # check for readline 4.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -lreadline" >&5
- $as_echo_n "checking for rl_pre_input_hook in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then :
-+if ${ac_cv_lib_readline_rl_pre_input_hook+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -13045,7 +13155,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pre_input_hook" >&5
- $as_echo "$ac_cv_lib_readline_rl_pre_input_hook" >&6; }
--if test "x$ac_cv_lib_readline_rl_pre_input_hook" = x""yes; then :
-+if test "x$ac_cv_lib_readline_rl_pre_input_hook" = xyes; then :
-
- $as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h
-
-@@ -13055,7 +13165,7 @@ fi
- # also in 4.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -lreadline" >&5
- $as_echo_n "checking for rl_completion_display_matches_hook in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_rl_completion_display_matches_hook+set}" = set; then :
-+if ${ac_cv_lib_readline_rl_completion_display_matches_hook+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -13089,7 +13199,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_display_matches_hook" >&5
- $as_echo "$ac_cv_lib_readline_rl_completion_display_matches_hook" >&6; }
--if test "x$ac_cv_lib_readline_rl_completion_display_matches_hook" = x""yes; then :
-+if test "x$ac_cv_lib_readline_rl_completion_display_matches_hook" = xyes; then :
-
- $as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h
-
-@@ -13099,7 +13209,7 @@ fi
- # check for readline 4.2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
- $as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
--if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
-+if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -13133,7 +13243,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" = x""yes; then :
-+if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
-
- $as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
-
-@@ -13174,7 +13284,7 @@ LIBS=$LIBS_no_readline
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5
- $as_echo_n "checking for broken nice()... " >&6; }
--if test "${ac_cv_broken_nice+set}" = set; then :
-+if ${ac_cv_broken_nice+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -13215,7 +13325,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5
- $as_echo_n "checking for broken poll()... " >&6; }
--if test "${ac_cv_broken_poll+set}" = set; then :
-+if ${ac_cv_broken_poll+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -13270,7 +13380,7 @@ ac_fn_c_check_member "$LINENO" "struct t
- #include <$ac_cv_struct_tm>
-
- "
--if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
-+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -13286,7 +13396,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf
- else
- ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
- "
--if test "x$ac_cv_have_decl_tzname" = x""yes; then :
-+if test "x$ac_cv_have_decl_tzname" = xyes; then :
- ac_have_decl=1
- else
- ac_have_decl=0
-@@ -13298,7 +13408,7 @@ _ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
- $as_echo_n "checking for tzname... " >&6; }
--if test "${ac_cv_var_tzname+set}" = set; then :
-+if ${ac_cv_var_tzname+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13337,7 +13447,7 @@ fi
- # check tzset(3) exists and works like we expect it to
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5
- $as_echo_n "checking for working tzset()... " >&6; }
--if test "${ac_cv_working_tzset+set}" = set; then :
-+if ${ac_cv_working_tzset+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-
-@@ -13434,7 +13544,7 @@ fi
- # Look for subsecond timestamps in struct stat
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5
- $as_echo_n "checking for tv_nsec in struct stat... " >&6; }
--if test "${ac_cv_stat_tv_nsec+set}" = set; then :
-+if ${ac_cv_stat_tv_nsec+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13471,7 +13581,7 @@ fi
- # Look for BSD style subsecond timestamps in struct stat
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5
- $as_echo_n "checking for tv_nsec2 in struct stat... " >&6; }
--if test "${ac_cv_stat_tv_nsec2+set}" = set; then :
-+if ${ac_cv_stat_tv_nsec2+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13508,7 +13618,7 @@ fi
- # On HP/UX 11.0, mvwdelch is a block with a return statement
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5
- $as_echo_n "checking whether mvwdelch is an expression... " >&6; }
--if test "${ac_cv_mvwdelch_is_expression+set}" = set; then :
-+if ${ac_cv_mvwdelch_is_expression+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13545,7 +13655,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5
- $as_echo_n "checking whether WINDOW has _flags... " >&6; }
--if test "${ac_cv_window_has_flags+set}" = set; then :
-+if ${ac_cv_window_has_flags+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13693,7 +13803,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 test "${ac_cv_have_long_long_format+set}" = set; then :
-+ if ${ac_cv_have_long_long_format+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -13764,7 +13874,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 test "${ac_cv_have_size_t_format+set}" = set; then :
-+if ${ac_cv_have_size_t_format+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-@@ -13837,7 +13947,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t"
- #endif
-
- "
--if test "x$ac_cv_type_socklen_t" = x""yes; then :
-+if test "x$ac_cv_type_socklen_t" = xyes; then :
-
- else
-
-@@ -13942,10 +14052,21 @@ $as_echo "$as_me: WARNING: cache variabl
- :end' >>confcache
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
-- test "x$cache_file" != "x/dev/null" &&
-+ if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
- $as_echo "$as_me: updating cache $cache_file" >&6;}
-- cat confcache >$cache_file
-+ if test ! -f "$cache_file" || test -h "$cache_file"; then
-+ cat confcache >"$cache_file"
-+ else
-+ case $cache_file in #(
-+ */* | ?:*)
-+ mv -f confcache "$cache_file"$$ &&
-+ mv -f "$cache_file"$$ "$cache_file" ;; #(
-+ *)
-+ mv -f confcache "$cache_file" ;;
-+ esac
-+ fi
-+ fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
- $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-@@ -13978,7 +14099,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"
-@@ -14079,6 +14200,7 @@ fi
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
-+as_myself=
- case $0 in #((
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -14386,7 +14508,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by python $as_me 2.7, which was
--generated by GNU Autoconf 2.67. Invocation command line was
-+generated by GNU Autoconf 2.68. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -14448,7 +14570,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 2.7
--configured by $0, generated by GNU Autoconf 2.67,
-+configured by $0, generated by GNU Autoconf 2.68,
- with options \\"\$ac_cs_config\\"
-
- Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -14580,7 +14702,7 @@ do
- "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
- "Modules/ld_so_aix") CONFIG_FILES="$CONFIG_FILES Modules/ld_so_aix" ;;
-
-- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
-+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- esac
- done
-
-@@ -14602,9 +14724,10 @@ fi
- # after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
-- tmp=
-+ tmp= ac_tmp=
- trap 'exit_status=$?
-- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+ : "${ac_tmp:=$tmp}"
-+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
- ' 0
- trap 'as_fn_exit 1' 1 2 13 15
- }
-@@ -14612,12 +14735,13 @@ $debug ||
-
- {
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-- test -n "$tmp" && test -d "$tmp"
-+ test -d "$tmp"
- } ||
- {
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
- } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-+ac_tmp=$tmp
-
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -14639,7 +14763,7 @@ else
- ac_cs_awk_cr=$ac_cr
- fi
-
--echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
- _ACEOF
-
-
-@@ -14667,7 +14791,7 @@ done
- rm -f conf$$subs.sh
-
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
--cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
- _ACEOF
- sed -n '
- h
-@@ -14715,7 +14839,7 @@ t delim
- rm -f conf$$subs.awk
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- _ACAWK
--cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_set[key] = 1
- FS = ""
-
-@@ -14747,7 +14871,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 < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
- _ACEOF
-
-@@ -14781,7 +14905,7 @@ fi # test -n "$CONFIG_FILES"
- # No need to generate them if there are no CONFIG_HEADERS.
- # This happens for instance with `./config.status Makefile'.
- if test -n "$CONFIG_HEADERS"; then
--cat >"$tmp/defines.awk" <<\_ACAWK ||
-+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
- BEGIN {
- _ACEOF
-
-@@ -14793,8 +14917,8 @@ _ACEOF
- # handling of long lines.
- ac_delim='%!_!# '
- for ac_last_try in false false :; do
-- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-- if test -z "$ac_t"; then
-+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-+ if test -z "$ac_tt"; then
- break
- elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-@@ -14895,7 +15019,7 @@ do
- esac
- case $ac_mode$ac_tag in
- :[FHL]*:*);;
-- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
-+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
- :[FH]-) ac_tag=-:-;;
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
-@@ -14914,7 +15038,7 @@ do
- for ac_f
- do
- case $ac_f in
-- -) ac_f="$tmp/stdin";;
-+ -) ac_f="$ac_tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
- # (if the path is not absolute). The absolute path cannot be DOS-style,
- # because $ac_f cannot contain `:'.
-@@ -14923,7 +15047,7 @@ do
- [\\/$]*) false;;
- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- esac ||
-- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
-+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
-@@ -14949,8 +15073,8 @@ $as_echo "$as_me: creating $ac_file" >&6
- esac
-
- case $ac_tag in
-- *:-:* | *:-) cat >"$tmp/stdin" \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
-+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
- esac
- ;;
- esac
-@@ -15080,21 +15204,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
- s&@INSTALL@&$ac_INSTALL&;t t
- $ac_datarootdir_hack
- "
--eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
-+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined" >&5
- $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 "$tmp/stdin"
-+ rm -f "$ac_tmp/stdin"
- case $ac_file in
-- -) cat "$tmp/out" && rm -f "$tmp/out";;
-- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
- esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-@@ -15105,20 +15230,20 @@ which seems to be undefined. Please mak
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
-- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-- } >"$tmp/config.h" \
-+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-+ } >"$ac_tmp/config.h" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
-- mv "$tmp/config.h" "$ac_file" \
-+ mv "$ac_tmp/config.h" "$ac_file" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
-- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+ && eval '$AWK -f "$ac_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 2013-03-25 15:25:30.435846538 -0400
-+++ ./pyconfig.h.in 2013-03-25 15:25:33.030846360 -0400
+--- ./pyconfig.h.in.autotool-intermediates 2013-04-09 11:24:01.020185806 +0200
++++ ./pyconfig.h.in 2013-04-09 11:24:02.088183204 +0200
@@ -18,6 +18,12 @@
/* Define this if you have BeOS threads. */
#undef BEOS_THREADS
@@ -2714,7 +210,7 @@ diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
/* Define if you have the Mach cthreads package */
#undef C_THREADS
-@@ -1107,12 +1113,6 @@
+@@ -1119,12 +1125,6 @@
/* Define to profile with the Pentium timestamp counter */
#undef WITH_TSC
diff --git a/python-2.5.1-sqlite-encoding.patch b/python-2.5.1-sqlite-encoding.patch
index 97235d8..ff2a3f8 100644
--- a/python-2.5.1-sqlite-encoding.patch
+++ b/python-2.5.1-sqlite-encoding.patch
@@ -2,7 +2,7 @@ diff -up Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding Python-2.5.1/Lib/sqlite3/db
--- Python-2.5.1/Lib/sqlite3/dbapi2.py.encoding 2007-09-14 10:41:50.000000000 -0400
+++ Python-2.5.1/Lib/sqlite3/dbapi2.py 2007-09-14 10:42:00.000000000 -0400
@@ -1,7 +1,6 @@
--#-*- coding: ISO-8859-1 -*-
+-# -*- coding: iso-8859-1 -*-
# pysqlite2/dbapi2.py: the DB-API 2.0 interface
#
-# Copyright (C) 2004-2005 Gerhard Häring <gh at ghaering.de>
diff --git a/python-2.6-rpath.patch b/python-2.6-rpath.patch
index a668926..43e3ec4 100644
--- a/python-2.6-rpath.patch
+++ b/python-2.6-rpath.patch
@@ -1,6 +1,6 @@
-diff -up Python-2.6/configure.in.rpath Python-2.6/configure.in
---- Python-2.6/configure.in.rpath 2008-11-24 02:51:06.000000000 -0500
-+++ Python-2.6/configure.in 2008-11-24 02:51:21.000000000 -0500
+diff -up Python-2.6/configure.ac.rpath Python-2.6/configure.ac
+--- Python-2.6/configure.ac.rpath 2008-11-24 02:51:06.000000000 -0500
++++ Python-2.6/configure.ac 2008-11-24 02:51:21.000000000 -0500
@@ -729,7 +729,7 @@ if test $enable_shared = "yes"; then
;;
OSF*)
diff --git a/python-2.7.1-config.patch b/python-2.7.1-config.patch
index 0bb790e..ea1c5d6 100644
--- a/python-2.7.1-config.patch
+++ b/python-2.7.1-config.patch
@@ -1,6 +1,5 @@
-diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dist
---- Python-2.7.1/Modules/Setup.dist.rhconfig 2010-08-21 07:40:30.000000000 -0400
-+++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:47:12.111059967 -0500
+--- Python-2.7.4/Modules/Setup.dist.rhconfig 2013-04-06 16:02:34.000000000 +0200
++++ Python-2.7.4/Modules/Setup.dist 2013-04-08 10:05:16.369985654 +0200
@@ -153,7 +153,7 @@ GLHACK=-Dclear=__GLclear
# modules are to be built as shared libraries (see above for more
# detail; also note that *static* reverses this effect):
@@ -10,7 +9,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# GNU readline. Unlike previous Python incarnations, GNU readline is
# now incorporated in an optional module, configured in the Setup file
-@@ -163,73 +163,73 @@ GLHACK=-Dclear=__GLclear
+@@ -163,74 +163,74 @@ GLHACK=-Dclear=__GLclear
# it, depending on your system -- see the GNU readline instructions.
# It's okay for this to be a shared library, too.
@@ -29,9 +28,6 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
-#_testcapi _testcapimodule.c # Python C API test module
-#_random _randommodule.c # Random number generator
-#_collections _collectionsmodule.c # Container types
--#itertools itertoolsmodule.c # Functions creating iterators for efficient looping
--#strop stropmodule.c # String manipulations
--#_functools _functoolsmodule.c # Tools for working with functions and callable objects
+array arraymodule.c # array objects
+cmath cmathmodule.c _math.c # -lm # complex math library functions
+math mathmodule.c _math.c # -lm # math library functions, e.g. sin()
@@ -41,6 +37,10 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
+_testcapi _testcapimodule.c # Python C API test module
+_random _randommodule.c # Random number generator
+_collections _collectionsmodule.c # Container types
+ #_heapq _heapqmodule.c # Heapq type
+-#itertools itertoolsmodule.c # Functions creating iterators for efficient looping
+-#strop stropmodule.c # String manipulations
+-#_functools _functoolsmodule.c # Tools for working with functions and callable objects
+itertools itertoolsmodule.c # Functions creating iterators for efficient looping
+strop stropmodule.c # String manipulations
+_functools _functoolsmodule.c # Tools for working with functions and callable objects
@@ -81,7 +81,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Socket module helper for socket(2)
-#_socket socketmodule.c
-+_socket socketmodule.c
++_socket socketmodule.c timemodule.c
# Socket module helper for SSL support; you must comment out the other
# socket line above, and possibly edit the SSL variable:
@@ -99,7 +99,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# First, look at Setup.config; configure may have set this for you.
-#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
-+crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
++crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
# Some more UNIX dependent modules -- off by default, since these
@@ -114,7 +114,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Multimedia modules -- off by default.
-@@ -237,8 +237,8 @@ GLHACK=-Dclear=__GLclear
+@@ -238,8 +238,8 @@ GLHACK=-Dclear=__GLclear
# #993173 says audioop works on 64-bit platforms, though.
# These represent audio samples or images as strings:
@@ -125,7 +125,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Note that the _md5 and _sha modules are normally only built if the
-@@ -248,14 +248,14 @@ GLHACK=-Dclear=__GLclear
+@@ -249,14 +249,14 @@ GLHACK=-Dclear=__GLclear
# Message-Digest Algorithm, described in RFC 1321. The necessary files
# md5.c and md5.h are included here.
@@ -144,7 +144,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# SGI IRIX specific modules -- off by default.
-@@ -302,12 +302,12 @@ GLHACK=-Dclear=__GLclear
+@@ -303,12 +303,12 @@ GLHACK=-Dclear=__GLclear
# A Linux specific module -- off by default; this may also work on
# some *BSDs.
@@ -159,7 +159,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# The _tkinter module.
-@@ -322,7 +322,7 @@ GLHACK=-Dclear=__GLclear
+@@ -323,7 +323,7 @@ GLHACK=-Dclear=__GLclear
# every system.
# *** Always uncomment this (leave the leading underscore in!):
@@ -168,7 +168,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
# -L/usr/local/lib \
# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-@@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear
+@@ -333,7 +333,7 @@ GLHACK=-Dclear=__GLclear
# *** Or uncomment this for Solaris:
# -I/usr/openwin/include \
# *** Uncomment and edit for Tix extension only:
@@ -177,7 +177,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# *** Uncomment and edit for BLT extension only:
# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
# *** Uncomment and edit for PIL (TkImaging) extension only:
-@@ -341,7 +341,7 @@ GLHACK=-Dclear=__GLclear
+@@ -342,7 +342,7 @@ GLHACK=-Dclear=__GLclear
# *** Uncomment and edit for TOGL extension only:
# -DWITH_TOGL togl.c \
# *** Uncomment and edit to reflect your Tcl/Tk versions:
@@ -186,7 +186,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# *** Uncomment and edit to reflect where your X11 libraries are:
# -L/usr/X11R6/lib \
# *** Or uncomment this for Solaris:
-@@ -351,7 +351,7 @@ GLHACK=-Dclear=__GLclear
+@@ -352,7 +352,7 @@ GLHACK=-Dclear=__GLclear
# *** Uncomment for AIX:
# -lld \
# *** Always uncomment this; X11 libraries to link with:
@@ -195,7 +195,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Lance Ellinghaus's syslog module
#syslog syslogmodule.c # syslog daemon interface
-@@ -373,7 +373,7 @@ GLHACK=-Dclear=__GLclear
+@@ -374,7 +374,7 @@ GLHACK=-Dclear=__GLclear
# it is a highly experimental and dangerous device for calling
# *arbitrary* C functions in *arbitrary* shared libraries:
@@ -204,7 +204,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Modules that provide persistent dictionary-like semantics. You will
-@@ -396,7 +396,7 @@ GLHACK=-Dclear=__GLclear
+@@ -397,7 +397,7 @@ GLHACK=-Dclear=__GLclear
#
# First, look at Setup.config; configure may have set this for you.
@@ -213,7 +213,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Sleepycat Berkeley DB interface.
-@@ -411,11 +411,10 @@ GLHACK=-Dclear=__GLclear
+@@ -412,11 +412,10 @@ GLHACK=-Dclear=__GLclear
#
# Edit the variables DB and DBLIBVERto point to the db top directory
# and the subdirectory of PORT where you built it.
@@ -229,7 +229,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Historical Berkeley DB 1.85
#
-@@ -430,14 +429,14 @@ GLHACK=-Dclear=__GLclear
+@@ -431,14 +430,14 @@ GLHACK=-Dclear=__GLclear
# Helper module for various ascii-encoders
@@ -248,7 +248,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Lee Busby's SIGFPE modules.
-@@ -460,7 +459,7 @@ GLHACK=-Dclear=__GLclear
+@@ -461,7 +460,7 @@ GLHACK=-Dclear=__GLclear
# Andrew Kuchling's zlib module.
# This require zlib 1.1.3 (or later).
# See http://www.gzip.org/zlib/
@@ -257,7 +257,7 @@ diff -up Python-2.7.1/Modules/Setup.dist.rhconfig Python-2.7.1/Modules/Setup.dis
# Interface to the Expat XML parser
#
-@@ -479,14 +478,14 @@ GLHACK=-Dclear=__GLclear
+@@ -480,14 +479,14 @@ GLHACK=-Dclear=__GLclear
# Hye-Shik Chang's CJKCodecs
# multibytecodec is required for all the other CJK codec modules
diff --git a/python-2.7.2-add-extension-suffix-to-python-config.patch b/python-2.7.2-add-extension-suffix-to-python-config.patch
index 4d56867..d1ff052 100644
--- a/python-2.7.2-add-extension-suffix-to-python-config.patch
+++ b/python-2.7.2-add-extension-suffix-to-python-config.patch
@@ -11,7 +11,7 @@ diff -up Python-2.7.2/Misc/python-config.in.add-extension-suffix-to-python-confi
def exit_with_usage(code=1):
print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0],
@@ -54,3 +54,5 @@ for opt in opt_flags:
- libs.extend(getvar('LINKFORSHARED').split())
+ libs.extend(getvar('LINKFORSHARED').split())
print ' '.join(libs)
+ elif opt == '--extension-suffix':
diff --git a/python-2.7.3-debug-build.patch b/python-2.7.3-debug-build.patch
index b44c9eb..5b6cda7 100644
--- a/python-2.7.3-debug-build.patch
+++ b/python-2.7.3-debug-build.patch
@@ -1,6 +1,6 @@
-diff -up Python-2.7.3/configure.in.debug-build Python-2.7.3/configure.in
---- Python-2.7.3/configure.in.debug-build 2012-04-18 19:46:22.066498521 -0400
-+++ Python-2.7.3/configure.in 2012-04-18 19:46:22.078498372 -0400
+diff -up Python-2.7.3/configure.ac.debug-build Python-2.7.3/configure.ac
+--- Python-2.7.3/configure.ac.debug-build 2012-04-18 19:46:22.066498521 -0400
++++ Python-2.7.3/configure.ac 2012-04-18 19:46:22.078498372 -0400
@@ -635,7 +635,7 @@ AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
if test -z "$LIBRARY"
@@ -75,7 +75,7 @@ diff -up Python-2.7.3/Lib/distutils/sysconfig.py.debug-build Python-2.7.3/Lib/di
elif os.name == "os2":
@@ -250,7 +251,7 @@ def get_makefile_filename():
if python_build:
- return os.path.join(os.path.dirname(sys.executable), "Makefile")
+ return os.path.join(project_base, "Makefile")
lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
- return os.path.join(lib_dir, "config", "Makefile")
+ return os.path.join(lib_dir, "config" + (sys.pydebug and "-debug" or ""), "Makefile")
@@ -132,11 +132,11 @@ diff -up Python-2.7.3/Makefile.pre.in.debug-build Python-2.7.3/Makefile.pre.in
+PYTHON= python$(DEBUG_SUFFIX)$(EXE)
+BUILDPYTHON= python$(DEBUG_SUFFIX)$(BUILDEXE)
- # The task to run while instrument when building the profile-opt target
- PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
+ PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
+ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
@@ -413,7 +419,7 @@ sharedmods: $(BUILDPYTHON)
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
- esac
+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-libpython$(VERSION).so: $(LIBRARY_OBJS)
+libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS)
@@ -183,7 +183,7 @@ diff -up Python-2.7.3/Makefile.pre.in.debug-build Python-2.7.3/Makefile.pre.in
if test -n "$(DLLLIBRARY)" ; then \
$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
@@ -970,10 +976,11 @@ $(srcdir)/Lib/$(PLATDIR):
- export EXE; EXE="$(BUILDEXE)"; \
+ fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
-python-config: $(srcdir)/Misc/python-config.in
diff --git a/python.spec b/python.spec
index 4d3b299..a24175e 100644
--- a/python.spec
+++ b/python.spec
@@ -105,8 +105,8 @@
Summary: An interpreted, interactive, object-oriented programming language
Name: %{python}
# Remember to also rebase python-docs when changing this:
-Version: 2.7.3
-Release: 35%{?dist}
+Version: 2.7.4
+Release: 1%{?dist}
License: Python
Group: Development/Languages
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -345,19 +345,8 @@ Patch54: python-2.6.4-setup-db48.patch
# for 2.7rc1 by dmalcolm:
Patch55: 00055-systemtap.patch
-# "lib64 patches"
-# This patch seems to be associated with bug 122304, which was
-# http://sourceforge.net/tracker/?func=detail&atid=105470&aid=931848&group_id=5470
-# and is now
-# http://bugs.python.org/issue931848
-# However, as it stands this patch is merely a copy of:
-# http://svn.python.org/view/python/trunk/Lib/test/test_re.py?r1=35825&r2=35824&pathrev=35825
-# which is already upstream
-# Earlier versions of the patch (from the "dist-pkgs" CVS repo within RH)
-# contained additional changes that applied fixes to the internals of the regex
-# module, but these appear to have all been applied as part of
-# http://bugs.python.org/issue931848
-Patch101: 00101-lib64-regex.patch
+# Upstream as of Python 2.7.4
+# Patch101: 00101-lib64-regex.patch
# Only used when "%{_lib}" == "lib64"
# Fixup various paths throughout the build and in distutils from "lib" to "lib64",
@@ -688,14 +677,8 @@ Patch156: 00156-gdb-autoload-safepath.patch
# (rhbz#697470)
Patch157: 00157-uid-gid-overflows.patch
-# 00158 #
-# This patch fixes a memory leak in _hashlib module, as reported in
-# RHBZ #836285; upstream report http://bugs.python.org/issue15219.
-# The patch has been accepted upstream, so this should be commented out
-# when packaging next upstream release.
-# The fix for Fedora specific "implement_specific_EVP_new()" function
-# has been merged into patch 00146.
-Patch158: 00158-fix-hashlib-leak.patch
+# Upstream as of Python 2.7.4
+# Patch158: 00158-fix-hashlib-leak.patch
# 00159 #
# From F18 on, there is a libdb4 package, that replaces db4. It places header
@@ -782,28 +765,11 @@ Patch169: 00169-avoid-implicit-usage-of-md5-in-multiprocessing.patch
# (rhbz#850013)
Patch170: 00170-gc-assertions.patch
-# 00171 #
-# Fix os.urandom() so that it raises NotImplementedError rather than OSError
-# if /dev/urandom can't be opened (e.g. in some chroots), given that callers
-# such as the random module have handler code expecting NotImplementedError
-# (regression introduced by hash randomization patch)
-#
-# Cherrypick of http://hg.python.org/cpython/rev/edbf37ace03c/ from upstream
-# (rhbz#907383; http://bugs.python.org/issue15340)
-Patch171: 00171-raise-correct-exception-when-dev-urandom-is-missing.patch
+# Upstream as of Python 2.7.4
+# Patch171: 00171-raise-correct-exception-when-dev-urandom-is-missing.patch
-# 00172 #
-# Port _multiprocessing.Connection.poll() to use the "poll" syscall, rather
-# than "select", allowing large numbers of subprocesses
-#
-# Based on this sequence of upstream patches to 2.7:
-# http://hg.python.org/cpython/rev/c5c27b84d7af/
-# http://hg.python.org/cpython/rev/7cf4ea64f603/
-# http://hg.python.org/cpython/rev/da5e520a7ba5/
-# http://hg.python.org/cpython/rev/f07435fa6736/
-#
-#(rhbz#849992; http://bugs.python.org/issue10527)
-Patch172: 00172-use-poll-for-multiprocessing-socket-connection.patch
+# Upstream as of Python 2.7.4
+# Patch172: 00172-use-poll-for-multiprocessing-socket-connection.patch
# 00173 #
# Workaround for ENOPROTOOPT seen in Koji within
@@ -1080,7 +1046,7 @@ done
%patch54 -p1 -b .setup-db48
-%patch101 -p1 -b .lib64-regex
+# patch101: upstream as of Python 2.7.4
%if "%{_lib}" == "lib64"
%patch102 -p1 -b .lib64
%patch103 -p1 -b .lib64-sysconfig
@@ -1152,7 +1118,7 @@ done
%patch155 -p1
%patch156 -p1
%patch157 -p1
-%patch158 -p1
+# 00158: upstream as of Python 2.7.4
%patch159 -p1 -F 3
# 00160: not for python 2
# 00161: not for python 2 yet
@@ -1166,8 +1132,8 @@ mv Modules/cryptmodule.c Modules/_cryptmodule.c
%patch168 -p1
%patch169 -p1
%patch170 -p1
-%patch171 -p1 -b .raise-correct-exception-when-dev-urandom-is-missing
-%patch172 -p1
+# 00171: upstream as of Python 2.7.4
+# 00171: upstream as of Python 2.7.4
%patch173 -p1
%patch174 -p1 -b .fix-for-usr-move
%patch175 -p1 -b .fix-configure-Wformat
@@ -2003,6 +1969,19 @@ rm -fr %{buildroot}
# ======================================================
%changelog
+* Mon Apr 08 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 2.7.4-1
+- Updated to Python 2.7.4.
+- Refreshed patches: 0 (config), 7 (sqlite encoding), 16 (rpath in config),
+55 (systemtap), 111 (no static lib), 112 (debug build), 113 (more
+configuration flags), 130 (add extension to python config), 134 (fix
+COUNT_ALLOCS in test_sys), 146 (haslib FIPS), 147 (add debug malloc stats),
+153 (fix gdb test noise), 157 (uid, gid overflow - fixed upstream, just
+keeping few more downstream tests), 165 (crypt module salt backport),
+175 (fix configure Wformat), 5000 (regenerated autotooling patch)
+- Dropped patches: 101 (lib64 regex; merged upstream), 171 (exception on
+missing /dev/urandom; merged upstream), 172 (poll for multiprocessing socket
+connection; merged upstream)
+
* Mon Mar 25 2013 David Malcolm <dmalcolm at redhat.com> - 2.7.3-35
- fix gcc 4.8 incompatibility (rhbz#927358); regenerate autotool intermediates
More information about the scm-commits
mailing list