diff --git a/fix-test_commands-expected-ls-output-issue7108.patch b/fix-test_commands-expected-ls-output-issue7108.patch deleted file mode 100644 index e270ec5..0000000 --- a/fix-test_commands-expected-ls-output-issue7108.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Python-2.7/Lib/test/test_commands.py.gnu-ls-output Python-2.7/Lib/test/test_commands.py ---- Python-2.7/Lib/test/test_commands.py.gnu-ls-output 2010-08-17 11:31:35.714913918 -0400 -+++ Python-2.7/Lib/test/test_commands.py 2010-08-17 11:37:08.913911808 -0400 -@@ -50,7 +50,7 @@ class CommandTests(unittest.TestCase): - # Note that the first case above has a space in the group name - # while the second one has a space in both names. - pat = r'''d......... # It is a directory. -- \+? # It may have ACLs. -+ [.+@]? # It may have alt access (SELinux, ACLs or metadata ('@' OS X). - \s+\d+ # It has some number of links. - [^/]* # Skip user, group, size, and date. - /\. # and end with the name of the file. diff --git a/fix-test_structmember-on-64bit-bigendian.patch b/fix-test_structmember-on-64bit-bigendian.patch index a250dea..a91b6db 100644 --- a/fix-test_structmember-on-64bit-bigendian.patch +++ b/fix-test_structmember-on-64bit-bigendian.patch @@ -1,21 +1,12 @@ -Index: Modules/_testcapimodule.c -=================================================================== ---- Modules/_testcapimodule.c (revision 85001) -+++ Modules/_testcapimodule.c (working copy) -@@ -5,6 +5,7 @@ - * standard Python regression test, via Lib/test/test_capi.py. - */ - -+#define PY_SSIZE_T_CLEAN - #include "Python.h" - #include - #include "structmember.h" -@@ -593,7 +594,7 @@ - { - PyObject *tuple, *obj; - Py_UNICODE *value; -- int len; -+ Py_ssize_t len; - - /* issue4122: Undefined reference to _Py_ascii_whitespace on Windows */ - /* Just use the macro and check that it compiles */ +diff -up Python-2.7.3/Modules/_testcapimodule.c.fix-test_structmember-on-64bit-bigendian Python-2.7.3/Modules/_testcapimodule.c +--- Python-2.7.3/Modules/_testcapimodule.c.fix-test_structmember-on-64bit-bigendian 2012-04-09 19:07:33.000000000 -0400 ++++ Python-2.7.3/Modules/_testcapimodule.c 2012-04-12 17:42:55.725766488 -0400 +@@ -1813,7 +1813,7 @@ test_structmembers_new(PyTypeObject *typ + ; + test_structmembers *ob; + const char *s = NULL; +- Py_ssize_t string_len = 0; ++ int string_len = 0; + ob = PyObject_New(test_structmembers, type); + if (ob == NULL) + return NULL; diff --git a/python-2.7-autotool-intermediates.patch b/python-2.7-autotool-intermediates.patch index 6e1184e..8f24271 100644 --- a/python-2.7-autotool-intermediates.patch +++ b/python-2.7-autotool-intermediates.patch @@ -1,14 +1,44 @@ diff -up ./configure.autotool-intermediates ./configure ---- ./configure.autotool-intermediates 2010-12-23 16:14:04.399059791 -0500 -+++ ./configure 2010-12-23 16:14:05.922060430 -0500 -@@ -1,5 +1,5 @@ +--- ./configure.autotool-intermediates 2012-04-13 17:40:05.272748804 -0400 ++++ ./configure 2012-04-13 17:40:06.762730177 -0400 +@@ -1,7 +1,7 @@ #! /bin/sh --# From configure.in Revision: 86043 . -+# From configure.in Revision: 86076 . + # From configure.in Revision. # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.65 for python 2.7. +-# Generated by GNU Autoconf 2.67 for python 2.7. ++# Generated by GNU Autoconf 2.68 for python 2.7. # -@@ -611,6 +611,8 @@ TRUE + # Report bugs to . + # +@@ -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 MACHDEP_OBJS DYNLOADFILE DLINCLDIR @@ -17,7 +47,7 @@ diff -up ./configure.autotool-intermediates ./configure THREADOBJ LDLAST USE_THREAD_MODULE -@@ -631,6 +633,8 @@ OTHER_LIBTOOL_OPT +@@ -631,6 +641,8 @@ OTHER_LIBTOOL_OPT UNIVERSAL_ARCH_FLAGS BASECFLAGS OPT @@ -26,7 +56,7 @@ diff -up ./configure.autotool-intermediates ./configure LN INSTALL_DATA INSTALL_SCRIPT -@@ -748,8 +752,11 @@ with_pth +@@ -752,8 +764,11 @@ with_pth enable_ipv6 with_doc_strings with_tsc @@ -38,7 +68,16 @@ diff -up ./configure.autotool-intermediates ./configure with_wctype_functions with_fpectl with_libm -@@ -1422,8 +1429,11 @@ Optional Packages: +@@ -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: --with-pth use GNU pth threading libraries --with(out)-doc-strings disable/enable documentation strings --with(out)-tsc enable/disable timestamp counter profile @@ -50,35 +89,461 @@ diff -up ./configure.autotool-intermediates ./configure --with-wctype-functions use wctype.h functions --with-fpectl enable SIGFPE catching --with-libm=STRING math library -@@ -1934,11 +1944,11 @@ else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $ac_includes_default -- enum { N = $2 / 2 - 1 }; - int - main () - { --static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; -+ 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; - test_array [0] = 0 - - ; -@@ -1949,11 +1959,11 @@ if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $ac_includes_default -- enum { N = $2 / 2 - 1 }; - int - main () +@@ -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 () { --static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) -+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; -+ ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) - < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; - test_array [0] = 0 + 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 -@@ -4739,7 +4749,7 @@ esac + } # 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 $as_echo_n "checking LIBRARY... " >&6; } if test -z "$LIBRARY" then @@ -87,10 +552,10 @@ diff -up ./configure.autotool-intermediates ./configure fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5 $as_echo "$LIBRARY" >&6; } -@@ -4913,8 +4923,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> +@@ -4921,8 +4939,8 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> INSTSONAME="$LDLIBRARY".$SOVERSION ;; - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' + LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so' @@ -98,7 +563,7 @@ diff -up ./configure.autotool-intermediates ./configure RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} case $ac_sys_system in FreeBSD*) -@@ -4937,7 +4947,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> +@@ -4945,7 +4963,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >> ;; OSF*) LDLIBRARY='libpython$(VERSION).so' @@ -107,7 +572,61 @@ diff -up ./configure.autotool-intermediates ./configure RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} ;; atheos*) -@@ -5318,6 +5328,14 @@ $as_echo "no" >&6; } +@@ -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; } fi @@ -122,7 +641,848 @@ 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? -@@ -9341,6 +9359,50 @@ $as_echo "no" >&6; } +@@ -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" +@@ -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 + #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; } fi @@ -173,7 +1533,16 @@ 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; } -@@ -9390,6 +9452,46 @@ fi +@@ -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 fi @@ -220,9 +1589,1109 @@ 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 + " +-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 + " +-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 + " +-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 + " +-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 +@@ -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 + " +-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 2010-12-23 16:14:04.396063268 -0500 -+++ ./pyconfig.h.in 2010-12-23 16:14:06.242367491 -0500 +--- ./pyconfig.h.in.autotool-intermediates 2012-04-13 17:40:05.263748916 -0400 ++++ ./pyconfig.h.in 2012-04-13 17:40:07.074726277 -0400 @@ -18,6 +18,12 @@ /* Define this if you have BeOS threads. */ #undef BEOS_THREADS @@ -236,7 +2705,7 @@ diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in /* Define if you have the Mach cthreads package */ #undef C_THREADS -@@ -1104,12 +1110,6 @@ +@@ -1107,12 +1113,6 @@ /* Define to profile with the Pentium timestamp counter */ #undef WITH_TSC diff --git a/python-2.7-fix-parallel-make.patch b/python-2.7-fix-parallel-make.patch deleted file mode 100644 index c43e141..0000000 --- a/python-2.7-fix-parallel-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up Python-2.7/Makefile.pre.in.fix-parallel-make Python-2.7/Makefile.pre.in ---- Python-2.7/Makefile.pre.in.fix-parallel-make 2010-07-22 15:01:39.567996932 -0400 -+++ Python-2.7/Makefile.pre.in 2010-07-22 15:47:02.437998509 -0400 -@@ -207,6 +207,7 @@ SIGNAL_OBJS= @SIGNAL_OBJS@ - - ########################################################################## - # Grammar -+GRAMMAR_STAMP= $(srcdir)/grammar-stamp - GRAMMAR_H= $(srcdir)/Include/graminit.h - GRAMMAR_C= $(srcdir)/Python/graminit.c - GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar -@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get - Modules/python.o: $(srcdir)/Modules/python.c - $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c - -+# GNU "make" interprets rules with two dependents as two copies of the rule. -+# -+# In a parallel build this can lead to pgen being run twice, once for each of -+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler -+# reads a partially-overwritten copy of one of these files, leading to syntax -+# errors (or linker errors if the fragment happens to be syntactically valid C) -+# -+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html -+# for more information -+# -+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid -+# this: -+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP) - --$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT) - -@$(INSTALL) -d Include - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ touch $(GRAMMAR_STAMP) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) diff --git a/python-2.7.1-fix-decimal-in-turkish-locale.patch b/python-2.7.1-fix-decimal-in-turkish-locale.patch deleted file mode 100644 index 4645542..0000000 --- a/python-2.7.1-fix-decimal-in-turkish-locale.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -up Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale Python-2.7.1/Lib/decimal.py ---- Python-2.7.1/Lib/decimal.py.fix-decimal-in-turkish-locale 2010-07-08 17:22:54.000000000 -0400 -+++ Python-2.7.1/Lib/decimal.py 2011-04-12 11:30:40.850350842 -0400 -@@ -1720,8 +1720,6 @@ class Decimal(object): - # here self was representable to begin with; return unchanged - return Decimal(self) - -- _pick_rounding_function = {} -- - # for each of the rounding functions below: - # self is a finite, nonzero Decimal - # prec is an integer satisfying 0 <= prec < len(self._int) -@@ -1788,6 +1786,17 @@ class Decimal(object): - else: - return -self._round_down(prec) - -+ _pick_rounding_function = dict( -+ ROUND_DOWN = '_round_down', -+ ROUND_UP = '_round_up', -+ ROUND_HALF_UP = '_round_half_up', -+ ROUND_HALF_DOWN = '_round_half_down', -+ ROUND_HALF_EVEN = '_round_half_even', -+ ROUND_CEILING = '_round_ceiling', -+ ROUND_FLOOR = '_round_floor', -+ ROUND_05UP = '_round_05up', -+ ) -+ - def fma(self, other, third, context=None): - """Fused multiply-add. - -@@ -3705,18 +3714,6 @@ _numbers.Number.register(Decimal) - - ##### Context class ####################################################### - -- --# get rounding method function: --rounding_functions = [name for name in Decimal.__dict__.keys() -- if name.startswith('_round_')] --for name in rounding_functions: -- # name is like _round_half_even, goes to the global ROUND_HALF_EVEN value. -- globalname = name[1:].upper() -- val = globals()[globalname] -- Decimal._pick_rounding_function[val] = name -- --del name, val, globalname, rounding_functions -- - class _ContextManager(object): - """Context manager class to support localcontext(). - -diff -up Python-2.7.1/Misc/NEWS.fix-decimal-in-turkish-locale Python-2.7.1/Misc/NEWS diff --git a/python-2.7.1-lib64.patch b/python-2.7.1-lib64.patch deleted file mode 100644 index 4b07470..0000000 --- a/python-2.7.1-lib64.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff -up Python-2.7.1/Lib/distutils/command/install.py.lib64 Python-2.7.1/Lib/distutils/command/install.py ---- Python-2.7.1/Lib/distutils/command/install.py.lib64 2010-05-05 15:09:31.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/command/install.py 2010-12-23 15:51:19.422062062 -0500 -@@ -42,14 +42,14 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { - 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', -diff -up Python-2.7.1/Lib/distutils/sysconfig.py.lib64 Python-2.7.1/Lib/distutils/sysconfig.py ---- Python-2.7.1/Lib/distutils/sysconfig.py.lib64 2010-11-06 10:16:30.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/sysconfig.py 2010-12-23 15:51:19.423063652 -0500 -@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -+ if plat_specific or standard_lib: -+ lib = "lib64" -+ else: -+ lib = "lib" - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: -diff -up Python-2.7.1/Lib/site.py.lib64 Python-2.7.1/Lib/site.py ---- Python-2.7.1/Lib/site.py.lib64 2010-10-12 18:53:51.000000000 -0400 -+++ Python-2.7.1/Lib/site.py 2010-12-23 15:51:19.424063606 -0500 -@@ -290,12 +290,16 @@ def getsitepackages(): - if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -+ sitepackages.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], - "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) - else: - sitepackages.append(prefix) -+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) - if sys.platform == "darwin": - # for framework builds *only* we add the standard Apple -diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_site.py ---- Python-2.7.1/Lib/test/test_site.py.lib64 2010-11-21 08:34:58.000000000 -0500 -+++ Python-2.7.1/Lib/test/test_site.py 2010-12-23 15:55:19.782935931 -0500 -@@ -169,17 +169,20 @@ class HelperFunctionsTests(unittest.Test - wanted = os.path.join('xoxo', 'Lib', 'site-packages') - self.assertEqual(dirs[0], wanted) - elif os.sep == '/': -- self.assertEqual(len(dirs), 2) -+ self.assertEquals(len(dirs), 3) -+ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], -+ 'site-packages') -+ self.assertEquals(dirs[0], wanted) - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], - 'site-packages') -- self.assertEqual(dirs[0], wanted) -+ self.assertEquals(dirs[1], wanted) - wanted = os.path.join('xoxo', 'lib', 'site-python') -- self.assertEqual(dirs[1], wanted) -+ self.assertEquals(dirs[2], wanted) - else: -- self.assertEqual(len(dirs), 2) -- self.assertEqual(dirs[0], 'xoxo') -- wanted = os.path.join('xoxo', 'lib', 'site-packages') -- self.assertEqual(dirs[1], wanted) -+ self.assertEquals(len(dirs), 2) -+ self.assertEquals(dirs[0], 'xoxo') -+ wanted = os.path.join('xoxo', 'lib64', 'site-packages') -+ self.assertEquals(dirs[1], wanted) - - # let's try the specific Apple location - if (sys.platform == "darwin" and -diff -up Python-2.7.1/Makefile.pre.in.lib64 Python-2.7.1/Makefile.pre.in ---- Python-2.7.1/Makefile.pre.in.lib64 2010-12-23 15:51:19.407063264 -0500 -+++ Python-2.7.1/Makefile.pre.in 2010-12-23 15:51:19.426063917 -0500 -@@ -94,7 +94,7 @@ LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) -diff -up Python-2.7.1/Modules/getpath.c.lib64 Python-2.7.1/Modules/getpath.c ---- Python-2.7.1/Modules/getpath.c.lib64 2010-10-07 19:37:08.000000000 -0400 -+++ Python-2.7.1/Modules/getpath.c 2010-12-23 15:51:19.427063291 -0500 -@@ -117,8 +117,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ -+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib64/python" VERSION; - - static void - reduce(char *dir) -@@ -528,7 +528,7 @@ calculate_path(void) - } - else - strncpy(zip_path, PREFIX, MAXPATHLEN); -- joinpath(zip_path, "lib/python00.zip"); -+ joinpath(zip_path, "lib64/python00.zip"); - bufsz = strlen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -538,7 +538,7 @@ calculate_path(void) - fprintf(stderr, - "Could not find platform dependent libraries \n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -diff -up Python-2.7.1/Modules/Setup.dist.lib64 Python-2.7.1/Modules/Setup.dist ---- Python-2.7.1/Modules/Setup.dist.lib64 2010-12-23 15:51:19.400104130 -0500 -+++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:51:19.427063291 -0500 -@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm - # and the subdirectory of PORT where you built it. - DBLIBVER=4.7 - DBINC=/usr/include/db4 --DBLIB=/usr/lib -+DBLIB=/usr/lib64 - _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 -@@ -459,7 +459,7 @@ cPickle cPickle.c - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz - - # Interface to the Expat XML parser - # -diff -up Python-2.7.1/setup.py.lib64 Python-2.7.1/setup.py ---- Python-2.7.1/setup.py.lib64 2010-10-31 12:40:21.000000000 -0400 -+++ Python-2.7.1/setup.py 2010-12-23 15:51:19.428064129 -0500 -@@ -347,7 +347,7 @@ class PyBuildExt(build_ext): - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and -@@ -654,11 +654,11 @@ class PyBuildExt(build_ext): - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib64/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -692,8 +692,8 @@ class PyBuildExt(build_ext): - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -- '/usr/contrib/ssl/lib/' -+ ['/usr/local/ssl/lib64', -+ '/usr/contrib/ssl/lib64/' - ] ) - - if (ssl_incs is not None and diff --git a/python-2.7.3-debug-build.patch b/python-2.7.3-debug-build.patch new file mode 100644 index 0000000..d17bf5d --- /dev/null +++ b/python-2.7.3-debug-build.patch @@ -0,0 +1,272 @@ +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-13 00:13:53.923498660 -0400 ++++ Python-2.7.3/configure.in 2012-04-13 00:13:53.929498585 -0400 +@@ -635,7 +635,7 @@ AC_SUBST(LIBRARY) + AC_MSG_CHECKING(LIBRARY) + if test -z "$LIBRARY" + then +- LIBRARY='libpython$(VERSION).a' ++ LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a' + fi + AC_MSG_RESULT($LIBRARY) + +@@ -780,8 +780,8 @@ if test $enable_shared = "yes"; then + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) +- LDLIBRARY='libpython$(VERSION).so' +- BLDLIBRARY='-L. -lpython$(VERSION)' ++ LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so' ++ BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + case $ac_sys_system in + FreeBSD*) +@@ -905,6 +905,14 @@ else AC_MSG_RESULT(no); Py_DEBUG='false' + fi], + [AC_MSG_RESULT(no)]) + ++if test "$Py_DEBUG" = 'true' ++then ++ DEBUG_EXT=_d ++ DEBUG_SUFFIX=-debug ++fi ++AC_SUBST(DEBUG_EXT) ++AC_SUBST(DEBUG_SUFFIX) ++ + # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be + # merged with this chunk of code? + +diff -up Python-2.7.3/Lib/distutils/command/build_ext.py.debug-build Python-2.7.3/Lib/distutils/command/build_ext.py +--- Python-2.7.3/Lib/distutils/command/build_ext.py.debug-build 2012-04-09 19:07:29.000000000 -0400 ++++ Python-2.7.3/Lib/distutils/command/build_ext.py 2012-04-13 00:13:53.930498573 -0400 +@@ -676,7 +676,10 @@ class build_ext (Command): + so_ext = get_config_var('SO') + if os.name == 'nt' and self.debug: + return os.path.join(*ext_path) + '_d' + so_ext +- return os.path.join(*ext_path) + so_ext ++ ++ # Similarly, extensions in debug mode are named 'module_d.so', to ++ # avoid adding the _d to the SO config variable: ++ return os.path.join(*ext_path) + (sys.pydebug and "_d" or "") + so_ext + + def get_export_symbols (self, ext): + """Return the list of symbols that a shared extension has to +@@ -761,6 +764,8 @@ class build_ext (Command): + template = "python%d.%d" + pythonlib = (template % + (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) ++ if sys.pydebug: ++ pythonlib += '_d' + return ext.libraries + [pythonlib] + else: + return ext.libraries +diff -up Python-2.7.3/Lib/distutils/sysconfig.py.debug-build Python-2.7.3/Lib/distutils/sysconfig.py +--- Python-2.7.3/Lib/distutils/sysconfig.py.debug-build 2012-04-13 00:13:53.899498961 -0400 ++++ Python-2.7.3/Lib/distutils/sysconfig.py 2012-04-13 00:13:53.930498573 -0400 +@@ -85,7 +85,8 @@ def get_python_inc(plat_specific=0, pref + # Include is located in the srcdir + inc_dir = os.path.join(srcdir, "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version()) ++ return os.path.join(prefix, "include", ++ "python" + get_python_version() + (sys.pydebug and '-debug' or '')) + elif os.name == "nt": + return os.path.join(prefix, "include") + 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") + 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") + + + def parse_config_h(fp, g=None): +diff -up Python-2.7.3/Lib/distutils/tests/test_install.py.debug-build Python-2.7.3/Lib/distutils/tests/test_install.py +--- Python-2.7.3/Lib/distutils/tests/test_install.py.debug-build 2012-04-13 00:14:36.177970408 -0400 ++++ Python-2.7.3/Lib/distutils/tests/test_install.py 2012-04-13 00:15:20.675414113 -0400 +@@ -20,8 +20,9 @@ from distutils.tests import support + + + def _make_ext_name(modname): +- if os.name == 'nt' and sys.executable.endswith('_d.exe'): ++ if sys.pydebug: + modname += '_d' ++ + return modname + sysconfig.get_config_var('SO') + + +diff -up Python-2.7.3/Makefile.pre.in.debug-build Python-2.7.3/Makefile.pre.in +--- Python-2.7.3/Makefile.pre.in.debug-build 2012-04-13 00:13:53.927498611 -0400 ++++ Python-2.7.3/Makefile.pre.in 2012-04-13 00:13:53.931498561 -0400 +@@ -102,8 +102,8 @@ SCRIPTDIR= $(prefix)/lib64 + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) + LIBDEST= $(SCRIPTDIR)/python$(VERSION) +-INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) +-CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) ++INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)$(DEBUG_SUFFIX) ++CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)$(DEBUG_SUFFIX) + LIBP= $(LIBDIR)/python$(VERSION) + + # Symbols used for using shared libraries +@@ -117,6 +117,12 @@ DESTSHARED= $(BINLIBDEST)/lib-dynload + EXE= @EXEEXT@ + BUILDEXE= @BUILDEXEEXT@ + ++# DEBUG_EXT is used by ELF files (names and SONAMEs); it will be "_d" for a debug build ++# DEBUG_SUFFIX is used by filesystem paths; it will be "-debug" for a debug build ++# Both will be empty in an optimized build ++DEBUG_EXT= @DEBUG_EXT@ ++DEBUG_SUFFIX= @DEBUG_SUFFIX@ ++ + # Short name and location for Mac OS X Python framework + UNIVERSALSDK=@UNIVERSALSDK@ + PYTHONFRAMEWORK= @PYTHONFRAMEWORK@ +@@ -180,8 +186,8 @@ LIBOBJDIR= Python/ + LIBOBJS= @LIBOBJS@ + UNICODE_OBJS= @UNICODE_OBJS@ + +-PYTHON= python$(EXE) +-BUILDPYTHON= python$(BUILDEXE) ++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 +@@ -413,7 +419,7 @@ sharedmods: $(BUILDPYTHON) + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ + esac + +-libpython$(VERSION).so: $(LIBRARY_OBJS) ++libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS) + if test $(INSTSONAME) != $(LDLIBRARY); then \ + $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ + $(LN) -f $(INSTSONAME) $@; \ +@@ -798,10 +804,10 @@ bininstall: altbininstall + fi + (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) + -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE) +- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE)) ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)$(EXE) python2$(EXE)) ++ -rm -f $(DESTDIR)$(BINDIR)/python$(DEBUG_SUFFIX)-config ++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)-config python2-config) + -rm -f $(DESTDIR)$(BINDIR)/python2-config +- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config) +- -rm -f $(DESTDIR)$(BINDIR)/python-config + (cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config) + -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) + -rm -f $(DESTDIR)$(LIBPC)/python2.pc +@@ -820,7 +826,7 @@ altbininstall: $(BUILDPYTHON) + else true; \ + fi; \ + done +- $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE) ++ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)$(EXE) + if test -f $(LDLIBRARY); then \ + if test -n "$(DLLLIBRARY)" ; then \ + $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ +@@ -970,10 +976,11 @@ $(srcdir)/Lib/$(PLATDIR): + export EXE; EXE="$(BUILDEXE)"; \ + cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen + +-python-config: $(srcdir)/Misc/python-config.in ++python$(DEBUG_SUFFIX)-config: $(srcdir)/Misc/python-config.in + # Substitution happens here, as the completely-expanded BINDIR + # is not available in configure +- sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config ++ sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)$(EXE)," < $(srcdir)/Misc/python-config.in >python$(DEBUG_SUFFIX)-config ++ + + # Install the include files + INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) +@@ -994,13 +1001,13 @@ inclinstall: + $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h + + # Install the library and miscellaneous stuff needed for extending/embedding +-# This goes into $(exec_prefix) +-LIBPL= $(LIBP)/config ++# This goes into $(exec_prefix)$(DEBUG_SUFFIX) ++LIBPL= $(LIBP)/config$(DEBUG_SUFFIX) + + # pkgconfig directory + LIBPC= $(LIBDIR)/pkgconfig + +-libainstall: all python-config ++libainstall: all python$(DEBUG_SUFFIX)-config + @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \ + do \ + if test ! -d $(DESTDIR)$$i; then \ +@@ -1019,8 +1026,7 @@ libainstall: all python-config + $(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc + $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup + $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh +- $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config +- rm python-config ++ $(INSTALL_SCRIPT) python$(DEBUG_SUFFIX)-config $(DESTDIR)$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)-config + @if [ -s Modules/python.exp -a \ + "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ + echo; echo "Installing support files for building shared extension modules on AIX:"; \ +diff -up Python-2.7.3/Misc/python-config.in.debug-build Python-2.7.3/Misc/python-config.in +--- Python-2.7.3/Misc/python-config.in.debug-build 2012-04-09 19:07:33.000000000 -0400 ++++ Python-2.7.3/Misc/python-config.in 2012-04-13 00:13:53.931498561 -0400 +@@ -45,7 +45,7 @@ for opt in opt_flags: + + elif opt in ('--libs', '--ldflags'): + libs = getvar('LIBS').split() + getvar('SYSLIBS').split() +- libs.append('-lpython'+pyver) ++ libs.append('-lpython' + pyver + (sys.pydebug and "_d" or "")) + # add the prefix/lib/pythonX.Y/config dir, but only if there is no + # shared library in prefix/lib/. + if opt == '--ldflags': +diff -up Python-2.7.3/Modules/makesetup.debug-build Python-2.7.3/Modules/makesetup +--- Python-2.7.3/Modules/makesetup.debug-build 2012-04-09 19:07:34.000000000 -0400 ++++ Python-2.7.3/Modules/makesetup 2012-04-13 00:13:53.931498561 -0400 +@@ -233,7 +233,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | + *$mod.o*) base=$mod;; + *) base=${mod}module;; + esac +- file="$srcdir/$base\$(SO)" ++ file="$srcdir/$base\$(DEBUG_EXT)\$(SO)" + case $doconfig in + no) SHAREDMODS="$SHAREDMODS $file";; + esac +diff -up Python-2.7.3/Python/dynload_shlib.c.debug-build Python-2.7.3/Python/dynload_shlib.c +--- Python-2.7.3/Python/dynload_shlib.c.debug-build 2012-04-09 19:07:35.000000000 -0400 ++++ Python-2.7.3/Python/dynload_shlib.c 2012-04-13 00:13:53.931498561 -0400 +@@ -46,11 +46,16 @@ const struct filedescr _PyImport_DynLoad + {"module.exe", "rb", C_EXTENSION}, + {"MODULE.EXE", "rb", C_EXTENSION}, + #else ++#ifdef Py_DEBUG ++ {"_d.so", "rb", C_EXTENSION}, ++ {"module_d.so", "rb", C_EXTENSION}, ++#else + {".so", "rb", C_EXTENSION}, + {"module.so", "rb", C_EXTENSION}, +-#endif +-#endif +-#endif ++#endif /* Py_DEBUG */ ++#endif /* __VMS */ ++#endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */ ++#endif /* __CYGWIN__ */ + {0, 0} + }; + +diff -up Python-2.7.3/Python/sysmodule.c.debug-build Python-2.7.3/Python/sysmodule.c +--- Python-2.7.3/Python/sysmodule.c.debug-build 2012-04-09 19:07:35.000000000 -0400 ++++ Python-2.7.3/Python/sysmodule.c 2012-04-13 00:13:53.932498549 -0400 +@@ -1506,6 +1506,12 @@ _PySys_Init(void) + PyString_FromString("legacy")); + #endif + ++#ifdef Py_DEBUG ++ PyDict_SetItemString(sysdict, "pydebug", Py_True); ++#else ++ PyDict_SetItemString(sysdict, "pydebug", Py_False); ++#endif ++ + #undef SET_SYS_FROM_STRING + if (PyErr_Occurred()) + return NULL; diff --git a/python-2.7.3-lib64.patch b/python-2.7.3-lib64.patch new file mode 100644 index 0000000..470b48b --- /dev/null +++ b/python-2.7.3-lib64.patch @@ -0,0 +1,196 @@ +diff -up Python-2.7.3/Lib/distutils/command/install.py.lib64 Python-2.7.3/Lib/distutils/command/install.py +--- Python-2.7.3/Lib/distutils/command/install.py.lib64 2012-04-09 19:07:29.000000000 -0400 ++++ Python-2.7.3/Lib/distutils/command/install.py 2012-04-11 17:56:41.848587174 -0400 +@@ -42,14 +42,14 @@ else: + INSTALL_SCHEMES = { + 'unix_prefix': { + 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { + 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff -up Python-2.7.3/Lib/distutils/sysconfig.py.lib64 Python-2.7.3/Lib/distutils/sysconfig.py +--- Python-2.7.3/Lib/distutils/sysconfig.py.lib64 2012-04-09 19:07:29.000000000 -0400 ++++ Python-2.7.3/Lib/distutils/sysconfig.py 2012-04-11 17:56:41.849587162 -0400 +@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": ++ if plat_specific or standard_lib: ++ lib = "lib64" ++ else: ++ lib = "lib" + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ lib, "python" + get_python_version()) + if standard_lib: + return libpython + else: +diff -up Python-2.7.3/Lib/site.py.lib64 Python-2.7.3/Lib/site.py +--- Python-2.7.3/Lib/site.py.lib64 2012-04-09 19:07:31.000000000 -0400 ++++ Python-2.7.3/Lib/site.py 2012-04-11 17:56:41.850587149 -0400 +@@ -300,12 +300,16 @@ def getsitepackages(): + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': ++ sitepackages.append(os.path.join(prefix, "lib64", ++ "python" + sys.version[:3], ++ "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) + else: + sitepackages.append(prefix) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple +diff -up Python-2.7.3/Lib/test/test_site.py.lib64 Python-2.7.3/Lib/test/test_site.py +--- Python-2.7.3/Lib/test/test_site.py.lib64 2012-04-09 19:07:32.000000000 -0400 ++++ Python-2.7.3/Lib/test/test_site.py 2012-04-11 17:58:52.981947780 -0400 +@@ -241,17 +241,20 @@ class HelperFunctionsTests(unittest.Test + self.assertEqual(dirs[2], wanted) + elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc +- self.assertEqual(len(dirs), 2) +- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], ++ self.assertEqual(len(dirs), 3) ++ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], + 'site-packages') + self.assertEqual(dirs[0], wanted) +- wanted = os.path.join('xoxo', 'lib', 'site-python') ++ wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], ++ 'site-packages') + self.assertEqual(dirs[1], wanted) ++ wanted = os.path.join('xoxo', 'lib', 'site-python') ++ self.assertEqual(dirs[2], wanted) + else: + # other platforms + self.assertEqual(len(dirs), 2) + self.assertEqual(dirs[0], 'xoxo') +- wanted = os.path.join('xoxo', 'lib', 'site-packages') ++ wanted = os.path.join('xoxo', 'lib64', 'site-packages') + self.assertEqual(dirs[1], wanted) + + class PthFile(object): +diff -up Python-2.7.3/Makefile.pre.in.lib64 Python-2.7.3/Makefile.pre.in +--- Python-2.7.3/Makefile.pre.in.lib64 2012-04-11 17:56:41.829587411 -0400 ++++ Python-2.7.3/Makefile.pre.in 2012-04-11 17:56:41.852587123 -0400 +@@ -97,7 +97,7 @@ LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= $(prefix)/lib64 + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) +diff -up Python-2.7.3/Modules/getpath.c.lib64 Python-2.7.3/Modules/getpath.c +--- Python-2.7.3/Modules/getpath.c.lib64 2012-04-09 19:07:34.000000000 -0400 ++++ Python-2.7.3/Modules/getpath.c 2012-04-11 17:56:41.853587110 -0400 +@@ -117,8 +117,8 @@ + #endif + + #ifndef PYTHONPATH +-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ +- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ ++ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" + #endif + + #ifndef LANDMARK +@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; + static char exec_prefix[MAXPATHLEN+1]; + static char progpath[MAXPATHLEN+1]; + static char *module_search_path = NULL; +-static char lib_python[] = "lib/python" VERSION; ++static char lib_python[] = "lib64/python" VERSION; + + static void + reduce(char *dir) +@@ -528,7 +528,7 @@ calculate_path(void) + } + else + strncpy(zip_path, PREFIX, MAXPATHLEN); +- joinpath(zip_path, "lib/python00.zip"); ++ joinpath(zip_path, "lib64/python00.zip"); + bufsz = strlen(zip_path); /* Replace "00" with version */ + zip_path[bufsz - 6] = VERSION[0]; + zip_path[bufsz - 5] = VERSION[2]; +@@ -538,7 +538,7 @@ calculate_path(void) + fprintf(stderr, + "Could not find platform dependent libraries \n"); + strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); +- joinpath(exec_prefix, "lib/lib-dynload"); ++ joinpath(exec_prefix, "lib64/lib-dynload"); + } + /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ + +diff -up Python-2.7.3/Modules/Setup.dist.lib64 Python-2.7.3/Modules/Setup.dist +--- Python-2.7.3/Modules/Setup.dist.lib64 2012-04-11 17:56:41.820587523 -0400 ++++ Python-2.7.3/Modules/Setup.dist 2012-04-11 17:56:41.854587097 -0400 +@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm + # and the subdirectory of PORT where you built it. + DBLIBVER=4.7 + DBINC=/usr/include/db4 +-DBLIB=/usr/lib ++DBLIB=/usr/lib64 + _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + + # Historical Berkeley DB 1.85 +@@ -459,7 +459,7 @@ cPickle cPickle.c + # Andrew Kuchling's zlib module. + # This require zlib 1.1.3 (or later). + # See http://www.gzip.org/zlib/ +-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz ++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz + + # Interface to the Expat XML parser + # +diff -up Python-2.7.3/setup.py.lib64 Python-2.7.3/setup.py +--- Python-2.7.3/setup.py.lib64 2012-04-09 19:07:36.000000000 -0400 ++++ Python-2.7.3/setup.py 2012-04-11 17:56:41.856587073 -0400 +@@ -369,7 +369,7 @@ class PyBuildExt(build_ext): + + def detect_modules(self): + # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() + +@@ -677,11 +677,11 @@ class PyBuildExt(build_ext): + elif curses_library: + readline_libs.append(curses_library) + elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/lib64/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + else: +@@ -715,8 +715,8 @@ class PyBuildExt(build_ext): + if krb5_h: + ssl_incs += krb5_h + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', +- '/usr/contrib/ssl/lib/' ++ ['/usr/local/ssl/lib64', ++ '/usr/contrib/ssl/lib64/' + ] ) + + if (ssl_incs is not None and diff --git a/python-2.7rc1-codec-ascii-tolower.patch b/python-2.7rc1-codec-ascii-tolower.patch deleted file mode 100644 index bd70c40..0000000 --- a/python-2.7rc1-codec-ascii-tolower.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up Python-2.7rc1/Python/codecs.c.ascii-tolower Python-2.7rc1/Python/codecs.c ---- Python-2.7rc1/Python/codecs.c.ascii-tolower 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc1/Python/codecs.c 2010-06-06 05:06:15.373100357 -0400 -@@ -45,6 +45,11 @@ int PyCodec_Register(PyObject *search_fu - return -1; - } - -+/* isupper() forced into the ASCII Locale */ -+#define ascii_isupper(x) (((x) >= 0x41) && ((x) <= 0x5A)) -+/* tolower() forced into the ASCII Locale */ -+#define ascii_tolower(x) (ascii_isupper(x) ? ((x) + 0x20) : (x)) -+ - /* Convert a string to a normalized Python string: all characters are - converted to lower case, spaces are replaced with underscores. */ - -@@ -70,7 +75,7 @@ PyObject *normalizestring(const char *st - if (ch == ' ') - ch = '-'; - else -- ch = tolower(Py_CHARMASK(ch)); -+ ch = ascii_tolower(Py_CHARMASK(ch)); - p[i] = ch; - } - return v; diff --git a/python-2.7rc1-debug-build.patch b/python-2.7rc1-debug-build.patch deleted file mode 100644 index e3cc3ac..0000000 --- a/python-2.7rc1-debug-build.patch +++ /dev/null @@ -1,257 +0,0 @@ -diff -up Python-2.7rc2/configure.in.debug-build Python-2.7rc2/configure.in ---- Python-2.7rc2/configure.in.debug-build 2010-06-24 12:59:28.166319997 -0400 -+++ Python-2.7rc2/configure.in 2010-06-24 12:59:28.179376823 -0400 -@@ -641,7 +641,7 @@ AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) - if test -z "$LIBRARY" - then -- LIBRARY='libpython$(VERSION).a' -+ LIBRARY='libpython$(VERSION)$(DEBUG_EXT).a' - fi - AC_MSG_RESULT($LIBRARY) - -@@ -786,8 +786,8 @@ if test $enable_shared = "yes"; then - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; - Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -- LDLIBRARY='libpython$(VERSION).so' -- BLDLIBRARY='-L. -lpython$(VERSION)' -+ LDLIBRARY='libpython$(VERSION)$(DEBUG_EXT).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)$(DEBUG_EXT)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - case $ac_sys_system in - FreeBSD*) -@@ -892,6 +892,14 @@ else AC_MSG_RESULT(no); Py_DEBUG='false' - fi], - [AC_MSG_RESULT(no)]) - -+if test "$Py_DEBUG" = 'true' -+then -+ DEBUG_EXT=_d -+ DEBUG_SUFFIX=-debug -+fi -+AC_SUBST(DEBUG_EXT) -+AC_SUBST(DEBUG_SUFFIX) -+ - # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be - # merged with this chunk of code? - -diff -up Python-2.7rc2/Lib/distutils/command/build_ext.py.debug-build Python-2.7rc2/Lib/distutils/command/build_ext.py ---- Python-2.7rc2/Lib/distutils/command/build_ext.py.debug-build 2010-04-01 14:17:09.000000000 -0400 -+++ Python-2.7rc2/Lib/distutils/command/build_ext.py 2010-06-24 12:59:28.179376823 -0400 -@@ -677,7 +677,10 @@ class build_ext (Command): - so_ext = get_config_var('SO') - if os.name == 'nt' and self.debug: - return os.path.join(*ext_path) + '_d' + so_ext -- return os.path.join(*ext_path) + so_ext -+ -+ # Similarly, extensions in debug mode are named 'module_d.so', to -+ # avoid adding the _d to the SO config variable: -+ return os.path.join(*ext_path) + (sys.pydebug and "_d" or "") + so_ext - - def get_export_symbols (self, ext): - """Return the list of symbols that a shared extension has to -@@ -760,6 +763,8 @@ class build_ext (Command): - template = "python%d.%d" - pythonlib = (template % - (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff)) -+ if sys.pydebug: -+ pythonlib += '_d' - return ext.libraries + [pythonlib] - else: - return ext.libraries -diff -up Python-2.7rc2/Lib/distutils/sysconfig.py.debug-build Python-2.7rc2/Lib/distutils/sysconfig.py ---- Python-2.7rc2/Lib/distutils/sysconfig.py.debug-build 2010-06-24 12:59:28.145319202 -0400 -+++ Python-2.7rc2/Lib/distutils/sysconfig.py 2010-06-24 12:59:28.180381519 -0400 -@@ -85,7 +85,8 @@ def get_python_inc(plat_specific=0, pref - # Include is located in the srcdir - inc_dir = os.path.join(srcdir, "Include") - return inc_dir -- return os.path.join(prefix, "include", "python" + get_python_version()) -+ return os.path.join(prefix, "include", -+ "python" + get_python_version() + (sys.pydebug and '-debug' or '')) - elif os.name == "nt": - return os.path.join(prefix, "include") - elif os.name == "os2": -@@ -211,7 +212,7 @@ def get_makefile_filename(): - if python_build: - return os.path.join(os.path.dirname(sys.executable), "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") - - - def parse_config_h(fp, g=None): -diff -up Python-2.7rc2/Makefile.pre.in.debug-build Python-2.7rc2/Makefile.pre.in ---- Python-2.7rc2/Makefile.pre.in.debug-build 2010-06-24 12:59:28.175377249 -0400 -+++ Python-2.7rc2/Makefile.pre.in 2010-06-24 13:01:24.559945307 -0400 -@@ -99,8 +99,8 @@ SCRIPTDIR= $(prefix)/lib64 - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) - LIBDEST= $(SCRIPTDIR)/python$(VERSION) --INCLUDEPY= $(INCLUDEDIR)/python$(VERSION) --CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION) -+INCLUDEPY= $(INCLUDEDIR)/python$(VERSION)$(DEBUG_SUFFIX) -+CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(VERSION)$(DEBUG_SUFFIX) - LIBP= $(LIBDIR)/python$(VERSION) - - # Symbols used for using shared libraries -@@ -114,6 +114,12 @@ DESTSHARED= $(BINLIBDEST)/lib-dynload - EXE= @EXEEXT@ - BUILDEXE= @BUILDEXEEXT@ - -+# DEBUG_EXT is used by ELF files (names and SONAMEs); it will be "_d" for a debug build -+# DEBUG_SUFFIX is used by filesystem paths; it will be "-debug" for a debug build -+# Both will be empty in an optimized build -+DEBUG_EXT= @DEBUG_EXT@ -+DEBUG_SUFFIX= @DEBUG_SUFFIX@ -+ - # Short name and location for Mac OS X Python framework - UNIVERSALSDK=@UNIVERSALSDK@ - PYTHONFRAMEWORK= @PYTHONFRAMEWORK@ -@@ -177,8 +183,8 @@ LIBOBJDIR= Python/ - LIBOBJS= @LIBOBJS@ - UNICODE_OBJS= @UNICODE_OBJS@ - --PYTHON= python$(EXE) --BUILDPYTHON= python$(BUILDEXE) -+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 -@@ -409,7 +415,7 @@ sharedmods: $(BUILDPYTHON) - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ - esac - --libpython$(VERSION).so: $(LIBRARY_OBJS) -+libpython$(VERSION)$(DEBUG_EXT).so: $(LIBRARY_OBJS) - if test $(INSTSONAME) != $(LDLIBRARY); then \ - $(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ - $(LN) -f $(INSTSONAME) $@; \ -@@ -788,9 +794,9 @@ bininstall: altbininstall - then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ - else true; \ - fi -- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)) -- -rm -f $(DESTDIR)$(BINDIR)/python-config -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config) -+ (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(DEBUG_SUFFIX)$(EXE) $(PYTHON)) -+ -rm -f $(DESTDIR)$(BINDIR)/python$(DEBUG_SUFFIX)-config -+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(DEBUG_SUFFIX)-config python$(DEBUG_SUFFIX)-config) - -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) - -rm -f $(DESTDIR)$(LIBPC)/python.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python.pc) -@@ -806,7 +812,7 @@ altbininstall: $(BUILDPYTHON) - else true; \ - fi; \ - done -- $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE) -+ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)$(EXE) - if test -f $(LDLIBRARY); then \ - if test -n "$(DLLLIBRARY)" ; then \ - $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ -@@ -951,10 +957,11 @@ $(srcdir)/Lib/$(PLATDIR): - export EXE; EXE="$(BUILDEXE)"; \ - cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen - --python-config: $(srcdir)/Misc/python-config.in -+python$(DEBUG_SUFFIX)-config: $(srcdir)/Misc/python-config.in - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure -- sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config -+ sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)$(EXE)," < $(srcdir)/Misc/python-config.in >python$(DEBUG_SUFFIX)-config -+ - - # Install the include files - INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) -@@ -975,13 +982,13 @@ inclinstall: - $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h - - # Install the library and miscellaneous stuff needed for extending/embedding --# This goes into $(exec_prefix) --LIBPL= $(LIBP)/config -+# This goes into $(exec_prefix)$(DEBUG_SUFFIX) -+LIBPL= $(LIBP)/config$(DEBUG_SUFFIX) - - # pkgconfig directory - LIBPC= $(LIBDIR)/pkgconfig - --libainstall: all python-config -+libainstall: all python$(DEBUG_SUFFIX)-config - @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \ - do \ - if test ! -d $(DESTDIR)$$i; then \ -@@ -1000,8 +1007,7 @@ libainstall: all python-config - $(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc - $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup - $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh -- $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config -- rm python-config -+ $(INSTALL_SCRIPT) python$(DEBUG_SUFFIX)-config $(DESTDIR)$(BINDIR)/python$(VERSION)$(DEBUG_SUFFIX)-config - @if [ -s Modules/python.exp -a \ - "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ - echo; echo "Installing support files for building shared extension modules on AIX:"; \ -diff -up Python-2.7rc2/Misc/python-config.in.debug-build Python-2.7rc2/Misc/python-config.in ---- Python-2.7rc2/Misc/python-config.in.debug-build 2010-03-18 20:08:44.000000000 -0400 -+++ Python-2.7rc2/Misc/python-config.in 2010-06-24 12:59:28.182375371 -0400 -@@ -45,7 +45,7 @@ for opt in opt_flags: - - elif opt in ('--libs', '--ldflags'): - libs = getvar('LIBS').split() + getvar('SYSLIBS').split() -- libs.append('-lpython'+pyver) -+ libs.append('-lpython' + pyver + (sys.pydebug and "_d" or "")) - # add the prefix/lib/pythonX.Y/config dir, but only if there is no - # shared library in prefix/lib/. - if opt == '--ldflags': -diff -up Python-2.7rc2/Modules/makesetup.debug-build Python-2.7rc2/Modules/makesetup ---- Python-2.7rc2/Modules/makesetup.debug-build 2007-09-05 07:47:34.000000000 -0400 -+++ Python-2.7rc2/Modules/makesetup 2010-06-24 12:59:28.182375371 -0400 -@@ -233,7 +233,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | - *$mod.o*) base=$mod;; - *) base=${mod}module;; - esac -- file="$srcdir/$base\$(SO)" -+ file="$srcdir/$base\$(DEBUG_EXT)\$(SO)" - case $doconfig in - no) SHAREDMODS="$SHAREDMODS $file";; - esac -diff -up Python-2.7rc2/Python/dynload_shlib.c.debug-build Python-2.7rc2/Python/dynload_shlib.c ---- Python-2.7rc2/Python/dynload_shlib.c.debug-build 2010-05-09 10:46:46.000000000 -0400 -+++ Python-2.7rc2/Python/dynload_shlib.c 2010-06-24 12:59:28.183377733 -0400 -@@ -46,11 +46,16 @@ const struct filedescr _PyImport_DynLoad - {"module.exe", "rb", C_EXTENSION}, - {"MODULE.EXE", "rb", C_EXTENSION}, - #else -+#ifdef Py_DEBUG -+ {"_d.so", "rb", C_EXTENSION}, -+ {"module_d.so", "rb", C_EXTENSION}, -+#else - {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, --#endif --#endif --#endif -+#endif /* Py_DEBUG */ -+#endif /* __VMS */ -+#endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */ -+#endif /* __CYGWIN__ */ - {0, 0} - }; - -diff -up Python-2.7rc2/Python/sysmodule.c.debug-build Python-2.7rc2/Python/sysmodule.c ---- Python-2.7rc2/Python/sysmodule.c.debug-build 2010-05-21 13:12:38.000000000 -0400 -+++ Python-2.7rc2/Python/sysmodule.c 2010-06-24 12:59:28.184375034 -0400 -@@ -1557,6 +1557,12 @@ _PySys_Init(void) - PyString_FromString("legacy")); - #endif - -+#ifdef Py_DEBUG -+ PyDict_SetItemString(sysdict, "pydebug", Py_True); -+#else -+ PyDict_SetItemString(sysdict, "pydebug", Py_False); -+#endif -+ - #undef SET_SYS_FROM_STRING - if (PyErr_Occurred()) - return NULL; diff --git a/python.spec b/python.spec index 93ea449..df4b585 100644 --- a/python.spec +++ b/python.spec @@ -93,8 +93,8 @@ Summary: An interpreted, interactive, object-oriented programming language Name: %{python} # Remember to also rebase python-docs when changing this: -Version: 2.7.1 -Release: 10%{?dist} +Version: 2.7.3 +Release: 1%{?dist} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} @@ -236,11 +236,8 @@ Patch7: python-2.5.1-sqlite-encoding.patch # (rhbz:307221) Patch10: python-2.7rc1-binutils-no-dep.patch -# FIXME: appears to relate to: -#* Tue Oct 30 2007 James Antill - 2.5.1-15 -#- Do codec lowercase in C Locale. -#- Resolves: 207134 191096 -Patch11: python-2.7rc1-codec-ascii-tolower.patch +# Upstream as of Python 2.7.3: +# Patch11: python-2.7rc1-codec-ascii-tolower.patch # Add various constants to the socketmodule (rhbz#436560): # TODO: these patches were added in 2.5.1-22 and 2.5.1-24 but appear not to @@ -286,7 +283,7 @@ Patch101: python-2.3.4-lib64-regex.patch # and add the /usr/lib64/pythonMAJOR.MINOR/site-packages to sitedirs, in front of # /usr/lib/pythonMAJOR.MINOR/site-packages # Not upstream -Patch102: python-2.7.1-lib64.patch +Patch102: python-2.7.3-lib64.patch # Python 2.7 split out much of the path-handling from distutils/sysconfig.py to # a new sysconfig.py (in r77704). @@ -357,7 +354,7 @@ Patch111: python-2.7rc1-no-static-lib.patch # python$(VERSION)-config, so that the two configuration get different paths # for these. -Patch112: python-2.7rc1-debug-build.patch +Patch112: python-2.7.3-debug-build.patch # Add configure-time support for the COUNT_ALLOCS and CALL_PROFILE options @@ -370,9 +367,8 @@ Patch113: python-2.6.5-more-configuration-flags.patch # (rhbz:553020); partially upstream as http://bugs.python.org/issue7647 Patch114: python-2.7rc1-statvfs-f_flag-constants.patch -# Make "pydoc -k" more robust in the face of broken modules -# (rhbz:461419; patch sent upstream as http://bugs.python.org/issue7425 ) -Patch115: make-pydoc-more-robust-001.patch +# Upstream as of Python 2.7.3 +# Patch115: make-pydoc-more-robust-001.patch # Upstream r79310 removed the "Modules" directory from sys.path when Python is # running from the build directory on POSIX to fix a unit test (issue #8205). @@ -390,15 +386,11 @@ Patch115: make-pydoc-more-robust-001.patch # For now, revert this patch: Patch121: python-2.7rc2-r79310.patch -# Fix race condition in parallel make that could lead to graminit.c failing -# to compile, or linker errors with "undefined reference to -# `_PyParser_Grammar'": -# Not yet sent upstream: -Patch122: python-2.7-fix-parallel-make.patch +# Upstream as of Python 2.7.2: +# Patch122: python-2.7-fix-parallel-make.patch -# test_commmands fails on SELinux systems due to a change in the output -# of "ls" (http://bugs.python.org/issue7108) -Patch124: fix-test_commands-expected-ls-output-issue7108.patch +# Upstream as of Python 2.7.2: +# Patch124: fix-test_commands-expected-ls-output-issue7108.patch # COUNT_ALLOCS is useful for debugging, but the upstream behaviour of always # emitting debug info to stdout on exit is too verbose and makes it harder to @@ -421,14 +413,11 @@ Patch127: fix-test_structmember-on-64bit-bigendian.patch # Not yet sent upstream Patch128: python-2.7.1-fix_test_abc_with_COUNT_ALLOCS.patch -# Use the correct preprocessor definition to detect ppc: -# See http://bugs.python.org/issue10655 and rhbz#661510 -Patch130: python-3.2b2-fix-ppc-debug-build.patch +# Upstream as of Python 2.7.2: +# Patch130: python-3.2b2-fix-ppc-debug-build.patch -# Fix "import decimal" in the Turkish locale (rhbz#694928) -# Based on upstream commit: -# http://hg.python.org/cpython/rev/b4b1f557d563/ -Patch131: python-2.7.1-fix-decimal-in-turkish-locale.patch +# Upstream as of Python 2.7.2: +# Patch131: python-2.7.1-fix-decimal-in-turkish-locale.patch # This is the generated patch to "configure"; see the description of @@ -653,7 +642,7 @@ rm -r Modules/zlib || exit 1 %endif %patch10 -p1 -b .binutils-no-dep -%patch11 -p1 -b .ascii-tolower +#patch11: upstream as of Python 2.7.3 %patch13 -p1 -b .socketmodule %patch14 -p1 -b .socketmodule2 %patch16 -p1 -b .rpath @@ -672,17 +661,17 @@ rm -r Modules/zlib || exit 1 %patch114 -p1 -b .statvfs-f-flag-constants -%patch115 -p0 +#patch115: upstream as of Python 2.7.3 %patch121 -p0 -R -%patch122 -p1 -b .fix-parallel-make -%patch124 -p1 +#patch122: upstream as of Python 2.7.2 +#patch124: upstream as of Python 2.7.2 %patch125 -p1 -b .less-verbose-COUNT_ALLOCS %patch126 -p0 -b .fix-dbm_contains-on-64bit-bigendian -%patch127 -p0 -b .fix-test_structmember-on-64bit-bigendian +%patch127 -p1 -b .fix-test_structmember-on-64bit-bigendian %patch128 -p1 -%patch130 -p1 -%patch131 -p1 +#patch130: upstream as of Python 2.7.2 +#patch131: upstream as of Python 2.7.2 # This shouldn't be necesarry, but is right now (2.2a3) find -name "*~" |xargs rm -f @@ -916,7 +905,7 @@ cp -a save_bits_of_test/* %{buildroot}/%{pylibdir}/test fi %if %{main_python} -ln -s python %{buildroot}%{_bindir}/python2 +ln -s python2.7-debug-config %{buildroot}%{_bindir}/python-debug-config %if 0%{?with_debug_build} ln -s python-debug %{buildroot}%{_bindir}/python2-debug %endif # with_debug_build @@ -1507,6 +1496,7 @@ rm -fr %{buildroot} %defattr(-,root,root,-) %{_libdir}/pkgconfig/python-%{pybasever}.pc %{_libdir}/pkgconfig/python.pc +%{_libdir}/pkgconfig/python2.pc %{pylibdir}/config/* %exclude %{pylibdir}/config/Makefile %{pylibdir}/distutils/command/wininst-*.exe @@ -1691,6 +1681,13 @@ rm -fr %{buildroot} # payload file would be unpackaged) %changelog +* Fri Apr 13 2012 David Malcolm - 2.7.3-1 +- 2.7.3; refresh patches 102 (lib64) and 112 (debug build); revise patch 127 +(test_structmember); drop upstream patches 11 (tolower) 116 (pydoc robustness) +122 (parallel make) 124 (SELinux) 130 (ppc macro in debug build) 131 (decimal +in Turkish locale); add python2.pc to python-devel; regenerate the autotool +intermediates patch (patch 300) + * Thu Sep 8 2011 David Malcolm - 2.7.1-10 - don't run test_openpty and test_pty during %%check (workaround for rhbz#714627) diff --git a/sources b/sources index afab837..e9a3d3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.tar.bz2 +c57477edd6d18bd9eeca2f21add73919 Python-2.7.3.tar.bz2