From e516bd5cb9cf4f77aa518ecd3a07469bdc2ef983 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Feb 21 2011 16:28:42 +0000 Subject: 3.2 --- diff --git a/.gitignore b/.gitignore index 0cadc11..8883189 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ Python-3.2a1.tar.bz2 /Python-3.2rc1.tar.bz2 /Python-3.2rc2.tar.bz2 /Python-3.2rc3.tar.bz2 +/Python-3.2.tar.bz2 diff --git a/autotool-intermediates.patch b/autotool-intermediates.patch index c0fb3e3..f1c15e0 100644 --- a/autotool-intermediates.patch +++ b/autotool-intermediates.patch @@ -1,10 +1,10 @@ diff -up ./configure.autotool-intermediates ./configure ---- ./configure.autotool-intermediates 2011-02-14 12:00:34.929870493 -0500 -+++ ./configure 2011-02-14 12:00:40.794102692 -0500 +--- ./configure.autotool-intermediates 2011-02-21 10:38:12.253957171 -0500 ++++ ./configure 2011-02-21 10:38:17.476956303 -0500 @@ -1,14 +1,14 @@ #! /bin/sh --# From configure.in Revision: 87698 . -+# From configure.in Revision: 88350 . +-# From configure.in Revision: 88430 . ++# From configure.in Revision: 88440 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for python 3.2. +# Generated by GNU Autoconf 2.65 for python 3.2. @@ -1292,7 +1292,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_LINUX_NETLINK_H 1 _ACEOF -@@ -6431,7 +6424,7 @@ EOF +@@ -6438,7 +6431,7 @@ EOF # Type availability checks ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" @@ -1301,7 +1301,7 @@ diff -up ./configure.autotool-intermediates ./configure else -@@ -6442,7 +6435,7 @@ _ACEOF +@@ -6449,7 +6442,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" @@ -1310,7 +1310,7 @@ diff -up ./configure.autotool-intermediates ./configure else -@@ -6453,7 +6446,7 @@ _ACEOF +@@ -6460,7 +6453,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" @@ -1319,7 +1319,7 @@ diff -up ./configure.autotool-intermediates ./configure else -@@ -6469,7 +6462,7 @@ cat >>confdefs.h <<_ACEOF +@@ -6476,7 +6469,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" @@ -1328,7 +1328,7 @@ diff -up ./configure.autotool-intermediates ./configure else -@@ -6481,7 +6474,7 @@ fi +@@ -6488,7 +6481,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; } @@ -1337,7 +1337,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -6560,7 +6553,7 @@ _ACEOF +@@ -6567,7 +6560,7 @@ _ACEOF esac ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" @@ -1346,7 +1346,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h -@@ -6575,7 +6568,7 @@ fi +@@ -6582,7 +6575,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; } @@ -1355,7 +1355,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6584,8 +6577,9 @@ else +@@ -6591,8 +6584,9 @@ else if test "$ac_cv_type_int" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1367,7 +1367,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_int=0 fi -@@ -6608,7 +6602,7 @@ _ACEOF +@@ -6615,7 +6609,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; } @@ -1376,7 +1376,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6617,8 +6611,9 @@ else +@@ -6624,8 +6618,9 @@ else if test "$ac_cv_type_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1388,7 +1388,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_long=0 fi -@@ -6641,7 +6636,7 @@ _ACEOF +@@ -6648,7 +6643,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; } @@ -1397,7 +1397,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6650,8 +6645,9 @@ else +@@ -6657,8 +6652,9 @@ else if test "$ac_cv_type_void_p" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1409,7 +1409,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_void_p=0 fi -@@ -6674,7 +6670,7 @@ _ACEOF +@@ -6681,7 +6677,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; } @@ -1418,7 +1418,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6683,8 +6679,9 @@ else +@@ -6690,8 +6686,9 @@ else if test "$ac_cv_type_short" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1430,7 +1430,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_short=0 fi -@@ -6707,7 +6704,7 @@ _ACEOF +@@ -6714,7 +6711,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; } @@ -1439,7 +1439,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6716,8 +6713,9 @@ else +@@ -6723,8 +6720,9 @@ else if test "$ac_cv_type_float" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1451,7 +1451,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_float=0 fi -@@ -6740,7 +6738,7 @@ _ACEOF +@@ -6747,7 +6745,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; } @@ -1460,7 +1460,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6749,8 +6747,9 @@ else +@@ -6756,8 +6754,9 @@ else if test "$ac_cv_type_double" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1472,7 +1472,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_double=0 fi -@@ -6773,7 +6772,7 @@ _ACEOF +@@ -6780,7 +6779,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of fpos_t" >&5 $as_echo_n "checking size of fpos_t... " >&6; } @@ -1481,7 +1481,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6782,8 +6781,9 @@ else +@@ -6789,8 +6788,9 @@ else if test "$ac_cv_type_fpos_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1493,7 +1493,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_fpos_t=0 fi -@@ -6806,7 +6806,7 @@ _ACEOF +@@ -6813,7 +6813,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; } @@ -1502,7 +1502,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6815,8 +6815,9 @@ else +@@ -6822,8 +6822,9 @@ else if test "$ac_cv_type_size_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1514,7 +1514,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_size_t=0 fi -@@ -6839,7 +6840,7 @@ _ACEOF +@@ -6846,7 +6847,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; } @@ -1523,7 +1523,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6848,8 +6849,9 @@ else +@@ -6855,8 +6856,9 @@ else if test "$ac_cv_type_pid_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1535,7 +1535,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_pid_t=0 fi -@@ -6899,7 +6901,7 @@ if test "$have_long_long" = yes ; then +@@ -6906,7 +6908,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; } @@ -1544,7 +1544,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6908,8 +6910,9 @@ else +@@ -6915,8 +6917,9 @@ else if test "$ac_cv_type_long_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1556,7 +1556,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_long_long=0 fi -@@ -6960,7 +6963,7 @@ if test "$have_long_double" = yes ; then +@@ -6967,7 +6970,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; } @@ -1565,7 +1565,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -6969,8 +6972,9 @@ else +@@ -6976,8 +6979,9 @@ else if test "$ac_cv_type_long_double" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1577,7 +1577,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_long_double=0 fi -@@ -7022,7 +7026,7 @@ if test "$have_c99_bool" = yes ; then +@@ -7029,7 +7033,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; } @@ -1586,7 +1586,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -7031,8 +7035,9 @@ else +@@ -7038,8 +7042,9 @@ else if test "$ac_cv_type__Bool" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1598,7 +1598,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof__Bool=0 fi -@@ -7058,7 +7063,7 @@ ac_fn_c_check_type "$LINENO" "uintptr_t" +@@ -7065,7 +7070,7 @@ ac_fn_c_check_type "$LINENO" "uintptr_t" #include #endif " @@ -1607,7 +1607,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_UINTPTR_T 1 -@@ -7070,7 +7075,7 @@ _ACEOF +@@ -7077,7 +7082,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; } @@ -1616,7 +1616,7 @@ diff -up ./configure.autotool-intermediates ./configure $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 : -@@ -7079,8 +7084,9 @@ else +@@ -7086,8 +7091,9 @@ else if test "$ac_cv_type_uintptr_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1628,7 +1628,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_uintptr_t=0 fi -@@ -7106,7 +7112,7 @@ fi +@@ -7113,7 +7119,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; } @@ -1637,7 +1637,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" " -@@ -7120,8 +7126,9 @@ else +@@ -7127,8 +7133,9 @@ else if test "$ac_cv_type_off_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1649,7 +1649,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_off_t=0 fi -@@ -7165,7 +7172,7 @@ fi +@@ -7172,7 +7179,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; } @@ -1658,7 +1658,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" " -@@ -7182,8 +7189,9 @@ else +@@ -7189,8 +7196,9 @@ else if test "$ac_cv_type_time_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1670,7 +1670,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_time_t=0 fi -@@ -7240,7 +7248,7 @@ if test "$have_pthread_t" = yes ; then +@@ -7247,7 +7255,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; } @@ -1679,7 +1679,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_t))" "ac_cv_sizeof_pthread_t" " -@@ -7254,8 +7262,9 @@ else +@@ -7261,8 +7269,9 @@ else if test "$ac_cv_type_pthread_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -1691,7 +1691,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_pthread_t=0 fi -@@ -7342,7 +7351,7 @@ fi +@@ -7349,7 +7358,7 @@ fi MACOSX_DEFAULT_ARCH="ppc" ;; *) @@ -1700,7 +1700,7 @@ diff -up ./configure.autotool-intermediates ./configure ;; esac else -@@ -7354,7 +7363,7 @@ fi +@@ -7361,7 +7370,7 @@ fi MACOSX_DEFAULT_ARCH="ppc64" ;; *) @@ -1709,7 +1709,7 @@ diff -up ./configure.autotool-intermediates ./configure ;; esac -@@ -7380,7 +7389,7 @@ $as_echo "#define WITH_NEXT_FRAMEWORK 1" +@@ -7387,7 +7396,7 @@ $as_echo "#define WITH_NEXT_FRAMEWORK 1" $as_echo "yes" >&6; } if test $enable_shared = "yes" then @@ -1718,7 +1718,7 @@ diff -up ./configure.autotool-intermediates ./configure fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -7687,7 +7696,7 @@ $as_echo "$SHLIBS" >&6; } +@@ -7694,7 +7703,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; } @@ -1727,7 +1727,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -7721,7 +7730,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -7728,7 +7737,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; } @@ -1736,7 +1736,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBDL 1 _ACEOF -@@ -7732,7 +7741,7 @@ fi +@@ -7739,7 +7748,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; } @@ -1745,7 +1745,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -7766,7 +7775,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -7773,7 +7782,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; } @@ -1754,7 +1754,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBDLD 1 _ACEOF -@@ -7780,7 +7789,7 @@ fi +@@ -7787,7 +7796,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; } @@ -1763,7 +1763,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -@@ -7814,11 +7823,11 @@ for ac_lib in '' pthread rt posix4; do +@@ -7821,11 +7830,11 @@ for ac_lib in '' pthread rt posix4; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext @@ -1777,7 +1777,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_search_sem_init=no -@@ -7841,7 +7850,7 @@ fi +@@ -7848,7 +7857,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; } @@ -1786,7 +1786,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -7875,7 +7884,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -7882,7 +7891,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; } @@ -1795,7 +1795,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_LIBINTL 1" >>confdefs.h -@@ -7922,7 +7931,7 @@ esac +@@ -7929,7 +7938,7 @@ esac # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5 $as_echo_n "checking for t_open in -lnsl... " >&6; } @@ -1804,7 +1804,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -7956,13 +7965,13 @@ LIBS=$ac_check_lib_save_LIBS +@@ -7963,13 +7972,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; } @@ -1820,7 +1820,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -7996,7 +8005,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -8003,7 +8012,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; } @@ -1829,7 +1829,7 @@ diff -up ./configure.autotool-intermediates ./configure LIBS="-lsocket $LIBS" fi # SVR4 sockets -@@ -8022,7 +8031,7 @@ if test -n "$ac_tool_prefix"; then +@@ -8029,7 +8038,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; } @@ -1838,7 +1838,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -8065,7 +8074,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the +@@ -8072,7 +8081,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; } @@ -1847,7 +1847,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -8176,12 +8185,12 @@ if test "${with_dbmliborder+set}" = set; +@@ -8183,12 +8192,12 @@ if test "${with_dbmliborder+set}" = set; withval=$with_dbmliborder; if test x$with_dbmliborder = xyes then @@ -1862,7 +1862,7 @@ diff -up ./configure.autotool-intermediates ./configure fi done fi -@@ -8347,7 +8356,7 @@ $as_echo "$unistd_defines_pthreads" >&6; +@@ -8354,7 +8363,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" @@ -1871,7 +1871,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h $as_echo "#define C_THREADS 1" >>confdefs.h -@@ -8360,7 +8369,7 @@ $as_echo "#define HURD_C_THREADS 1" >>co +@@ -8367,7 +8376,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" @@ -1880,7 +1880,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h $as_echo "#define C_THREADS 1" >>confdefs.h -@@ -8404,7 +8413,7 @@ else +@@ -8411,7 +8420,7 @@ else LIBS=$_libs ac_fn_c_check_func "$LINENO" "pthread_detach" "ac_cv_func_pthread_detach" @@ -1889,7 +1889,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h posix_threads=yes -@@ -8413,7 +8422,7 @@ else +@@ -8420,7 +8429,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; } @@ -1898,7 +1898,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8447,7 +8456,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -8454,7 +8463,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; } @@ -1907,7 +1907,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h posix_threads=yes -@@ -8457,7 +8466,7 @@ else +@@ -8464,7 +8473,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; } @@ -1916,7 +1916,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8491,7 +8500,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -8498,7 +8507,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; } @@ -1925,7 +1925,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h posix_threads=yes -@@ -8501,7 +8510,7 @@ else +@@ -8508,7 +8517,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; } @@ -1934,7 +1934,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8535,7 +8544,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -8542,7 +8551,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; } @@ -1943,7 +1943,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h posix_threads=yes -@@ -8545,7 +8554,7 @@ else +@@ -8552,7 +8561,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; } @@ -1952,7 +1952,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8579,7 +8588,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -8586,7 +8595,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; } @@ -1961,7 +1961,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h posix_threads=yes -@@ -8611,7 +8620,7 @@ fi +@@ -8618,7 +8627,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5 $as_echo_n "checking for usconfig in -lmpc... " >&6; } @@ -1970,7 +1970,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8645,7 +8654,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -8652,7 +8661,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; } @@ -1979,7 +1979,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h LIBS="$LIBS -lmpc" -@@ -8657,7 +8666,7 @@ fi +@@ -8664,7 +8673,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; } @@ -1988,7 +1988,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -8691,7 +8700,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -8698,7 +8707,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; } @@ -1997,7 +1997,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define WITH_THREAD 1" >>confdefs.h LIBS="$LIBS -lthread" -@@ -8740,7 +8749,7 @@ $as_echo "#define HAVE_BROKEN_POSIX_SEMA +@@ -8747,7 +8756,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; } @@ -2006,7 +2006,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -8783,7 +8792,7 @@ $as_echo "#define PTHREAD_SYSTEM_SCHED_S +@@ -8790,7 +8799,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" @@ -2015,7 +2015,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_SIGMASK 1 _ACEOF -@@ -9136,6 +9145,50 @@ $as_echo "no" >&6; } +@@ -9143,6 +9152,50 @@ $as_echo "no" >&6; } fi @@ -2066,7 +2066,7 @@ diff -up ./configure.autotool-intermediates ./configure # Check for Python-specific malloc support { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5 $as_echo_n "checking for --with-pymalloc... " >&6; } -@@ -9175,12 +9228,12 @@ fi +@@ -9182,12 +9235,12 @@ 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" @@ -2081,7 +2081,7 @@ diff -up ./configure.autotool-intermediates ./configure fi -@@ -9188,6 +9241,46 @@ fi +@@ -9195,6 +9248,46 @@ fi OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" fi @@ -2128,7 +2128,7 @@ diff -up ./configure.autotool-intermediates ./configure # -I${DLINCLDIR} is added to the compile rule for importdl.o DLINCLDIR=. -@@ -9197,7 +9290,7 @@ DLINCLDIR=. +@@ -9204,7 +9297,7 @@ DLINCLDIR=. for ac_func in dlopen do : ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" @@ -2137,7 +2137,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_DLOPEN 1 _ACEOF -@@ -9274,7 +9367,8 @@ for ac_func in alarm accept4 setitimer g +@@ -9281,7 +9374,8 @@ for ac_func in alarm accept4 setitimer g do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -2147,7 +2147,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -9524,7 +9618,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9531,7 +9625,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; } @@ -2156,7 +2156,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -9554,7 +9648,7 @@ if test "x${ac_cv_flock_decl}" = xyes; t +@@ -9561,7 +9655,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" @@ -2165,7 +2165,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_FLOCK 1 _ACEOF -@@ -9562,7 +9656,7 @@ _ACEOF +@@ -9569,7 +9663,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; } @@ -2174,7 +2174,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -9596,7 +9690,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -9603,7 +9697,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; } @@ -2183,7 +2183,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_FLOCK 1" >>confdefs.h -@@ -9645,7 +9739,7 @@ do +@@ -9652,7 +9746,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; } @@ -2192,7 +2192,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test -n "$TRUE"; then -@@ -9685,7 +9779,7 @@ test -n "$TRUE" || TRUE="/bin/true" +@@ -9692,7 +9786,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; } @@ -2201,7 +2201,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -9719,12 +9813,12 @@ LIBS=$ac_check_lib_save_LIBS +@@ -9726,12 +9820,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; } @@ -2216,7 +2216,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -9758,7 +9852,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -9765,7 +9859,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; } @@ -2225,7 +2225,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBRESOLV 1 _ACEOF -@@ -9775,7 +9869,7 @@ fi +@@ -9782,7 +9876,7 @@ fi # exit Python { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5 $as_echo_n "checking for chflags... " >&6; } @@ -2234,7 +2234,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -9809,7 +9903,7 @@ fi +@@ -9816,7 +9910,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" @@ -2243,7 +2243,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_cv_have_chflags="yes" else ac_cv_have_chflags="no" -@@ -9824,7 +9918,7 @@ fi +@@ -9831,7 +9925,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5 $as_echo_n "checking for lchflags... " >&6; } @@ -2252,7 +2252,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -9858,7 +9952,7 @@ fi +@@ -9865,7 +9959,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" @@ -2261,7 +2261,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_cv_have_lchflags="yes" else ac_cv_have_lchflags="no" -@@ -9882,7 +9976,7 @@ esac +@@ -9889,7 +9983,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 $as_echo_n "checking for inflateCopy in -lz... " >&6; } @@ -2270,7 +2270,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -9916,7 +10010,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -9923,7 +10017,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; } @@ -2279,7 +2279,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h -@@ -10059,7 +10153,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -10066,7 +10160,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" @@ -2288,7 +2288,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_OPENPTY 1 _ACEOF -@@ -10067,7 +10161,7 @@ _ACEOF +@@ -10074,7 +10168,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; } @@ -2297,7 +2297,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -10101,13 +10195,13 @@ LIBS=$ac_check_lib_save_LIBS +@@ -10108,13 +10202,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; } @@ -2313,7 +2313,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -10141,7 +10235,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -10148,7 +10242,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; } @@ -2322,7 +2322,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h LIBS="$LIBS -lbsd" fi -@@ -10156,7 +10250,7 @@ done +@@ -10163,7 +10257,7 @@ done for ac_func in forkpty do : ac_fn_c_check_func "$LINENO" "forkpty" "ac_cv_func_forkpty" @@ -2331,7 +2331,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_FORKPTY 1 _ACEOF -@@ -10164,7 +10258,7 @@ _ACEOF +@@ -10171,7 +10265,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; } @@ -2340,7 +2340,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -10198,13 +10292,13 @@ LIBS=$ac_check_lib_save_LIBS +@@ -10205,13 +10299,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; } @@ -2356,7 +2356,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -10238,7 +10332,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -10245,7 +10339,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; } @@ -2365,7 +2365,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h LIBS="$LIBS -lbsd" fi -@@ -10255,7 +10349,7 @@ done +@@ -10262,7 +10356,7 @@ done for ac_func in memmove do : ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove" @@ -2374,7 +2374,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_MEMMOVE 1 _ACEOF -@@ -10269,7 +10363,8 @@ for ac_func in fseek64 fseeko fstatvfs f +@@ -10276,7 +10370,8 @@ for ac_func in fseek64 fseeko fstatvfs f do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -2384,7 +2384,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -10278,50 +10373,31 @@ fi +@@ -10285,50 +10380,31 @@ fi done @@ -2448,7 +2448,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_GETPGRP 1 _ACEOF -@@ -10349,7 +10425,7 @@ done +@@ -10356,7 +10432,7 @@ done for ac_func in setpgrp do : ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp" @@ -2457,7 +2457,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_SETPGRP 1 _ACEOF -@@ -10377,7 +10453,7 @@ done +@@ -10384,7 +10460,7 @@ done for ac_func in gettimeofday do : ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" @@ -2466,7 +2466,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_GETTIMEOFDAY 1 _ACEOF -@@ -10479,7 +10555,7 @@ if test $have_getaddrinfo = yes +@@ -10486,7 +10562,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; } @@ -2475,7 +2475,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -10608,7 +10684,7 @@ fi +@@ -10615,7 +10691,7 @@ fi for ac_func in getnameinfo do : ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" @@ -2484,7 +2484,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_GETNAMEINFO 1 _ACEOF -@@ -10620,7 +10696,7 @@ done +@@ -10627,7 +10703,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; } @@ -2493,7 +2493,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -10655,7 +10731,7 @@ fi +@@ -10662,7 +10738,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; } @@ -2502,7 +2502,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -10692,7 +10768,7 @@ ac_fn_c_check_member "$LINENO" "struct t +@@ -10699,7 +10775,7 @@ ac_fn_c_check_member "$LINENO" "struct t #include <$ac_cv_struct_tm> " @@ -2511,7 +2511,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -10708,7 +10784,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf +@@ -10715,7 +10791,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf else ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include " @@ -2520,7 +2520,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_have_decl=1 else ac_have_decl=0 -@@ -10720,7 +10796,7 @@ _ACEOF +@@ -10727,7 +10803,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 $as_echo_n "checking for tzname... " >&6; } @@ -2529,7 +2529,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -10756,7 +10832,7 @@ $as_echo "#define HAVE_TZNAME 1" >>confd +@@ -10763,7 +10839,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" @@ -2538,7 +2538,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_RDEV 1 -@@ -10766,7 +10842,7 @@ _ACEOF +@@ -10773,7 +10849,7 @@ _ACEOF fi ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" @@ -2547,7 +2547,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -@@ -10776,7 +10852,7 @@ _ACEOF +@@ -10783,7 +10859,7 @@ _ACEOF fi ac_fn_c_check_member "$LINENO" "struct stat" "st_flags" "ac_cv_member_struct_stat_st_flags" "$ac_includes_default" @@ -2556,7 +2556,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_FLAGS 1 -@@ -10786,7 +10862,7 @@ _ACEOF +@@ -10793,7 +10869,7 @@ _ACEOF fi ac_fn_c_check_member "$LINENO" "struct stat" "st_gen" "ac_cv_member_struct_stat_st_gen" "$ac_includes_default" @@ -2565,7 +2565,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_GEN 1 -@@ -10796,7 +10872,7 @@ _ACEOF +@@ -10803,7 +10879,7 @@ _ACEOF fi ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default" @@ -2574,7 +2574,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1 -@@ -10806,7 +10882,7 @@ _ACEOF +@@ -10813,7 +10889,7 @@ _ACEOF fi ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" @@ -2583,7 +2583,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_BLOCKS 1 -@@ -10828,7 +10904,7 @@ fi +@@ -10835,7 +10911,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; } @@ -2592,7 +2592,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -10892,7 +10968,7 @@ $as_echo "$was_it_defined" >&6; } +@@ -10899,7 +10975,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; } @@ -2601,7 +2601,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -10924,7 +11000,7 @@ fi +@@ -10931,7 +11007,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5 $as_echo_n "checking for sockaddr_storage... " >&6; } @@ -2610,7 +2610,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -10960,7 +11036,7 @@ fi +@@ -10967,7 +11043,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 $as_echo_n "checking whether char is unsigned... " >&6; } @@ -2619,7 +2619,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -10992,7 +11068,7 @@ fi +@@ -10999,7 +11075,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; } @@ -2628,7 +2628,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -11280,7 +11356,7 @@ $as_echo "$va_list_is_array" >&6; } +@@ -11287,7 +11363,7 @@ $as_echo "$va_list_is_array" >&6; } ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r" @@ -2637,7 +2637,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h -@@ -11411,7 +11487,7 @@ else +@@ -11418,7 +11494,7 @@ else for ac_func in gethostbyname do : ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" @@ -2646,7 +2646,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_GETHOSTBYNAME 1 _ACEOF -@@ -11433,12 +11509,12 @@ fi +@@ -11440,12 +11516,12 @@ fi # Linux requires this for correct f.p. operations ac_fn_c_check_func "$LINENO" "__fpu_control" "ac_cv_func___fpu_control" @@ -2661,7 +2661,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -11472,7 +11548,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -11479,7 +11555,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; } @@ -2670,7 +2670,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBIEEE 1 _ACEOF -@@ -11528,7 +11604,7 @@ elif test "$withval" != yes +@@ -11535,7 +11611,7 @@ elif test "$withval" != yes then LIBM=$withval { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5 $as_echo "set LIBM=\"$withval\"" >&6; } @@ -2679,7 +2679,7 @@ diff -up ./configure.autotool-intermediates ./configure fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5 -@@ -11552,7 +11628,7 @@ elif test "$withval" != yes +@@ -11559,7 +11635,7 @@ elif test "$withval" != yes then LIBC=$withval { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5 $as_echo "set LIBC=\"$withval\"" >&6; } @@ -2688,7 +2688,7 @@ diff -up ./configure.autotool-intermediates ./configure fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5 -@@ -11566,7 +11642,7 @@ fi +@@ -11573,7 +11649,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; } @@ -2697,7 +2697,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -11608,7 +11684,7 @@ fi +@@ -11615,7 +11691,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; } @@ -2706,7 +2706,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -11654,7 +11730,7 @@ fi +@@ -11661,7 +11737,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; } @@ -2715,7 +2715,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -11802,7 +11878,8 @@ for ac_func in acosh asinh atanh copysig +@@ -11809,7 +11885,8 @@ for ac_func in acosh asinh atanh copysig do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -2725,7 +2725,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -11814,7 +11891,8 @@ for ac_func in hypot lgamma log1p round +@@ -11821,7 +11898,8 @@ for ac_func in hypot lgamma log1p round do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -2735,7 +2735,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -11824,7 +11902,7 @@ done +@@ -11831,7 +11909,7 @@ done ac_fn_c_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include " @@ -2744,7 +2744,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_have_decl=1 else ac_have_decl=0 -@@ -11835,7 +11913,7 @@ cat >>confdefs.h <<_ACEOF +@@ -11842,7 +11920,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ac_fn_c_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include " @@ -2753,7 +2753,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_have_decl=1 else ac_have_decl=0 -@@ -11846,7 +11924,7 @@ cat >>confdefs.h <<_ACEOF +@@ -11853,7 +11931,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ac_fn_c_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include " @@ -2762,7 +2762,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_have_decl=1 else ac_have_decl=0 -@@ -11861,7 +11939,7 @@ _ACEOF +@@ -11868,7 +11946,7 @@ _ACEOF # -0. on some architectures. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tanh preserves the sign of zero" >&5 $as_echo_n "checking whether tanh preserves the sign of zero... " >&6; } @@ -2771,7 +2771,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -11909,7 +11987,7 @@ then +@@ -11916,7 +11994,7 @@ then # -0. See issue #9920. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether log1p drops the sign of negative zero" >&5 $as_echo_n "checking whether log1p drops the sign of negative zero... " >&6; } @@ -2780,7 +2780,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -11961,7 +12039,7 @@ LIBS=$LIBS_SAVE +@@ -11968,7 +12046,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; } @@ -2789,7 +2789,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12012,7 +12090,7 @@ fi +@@ -12019,7 +12097,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; } @@ -2798,7 +2798,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12077,7 +12155,7 @@ no) +@@ -12084,7 +12162,7 @@ no) 15|30) ;; *) @@ -2807,7 +2807,7 @@ diff -up ./configure.autotool-intermediates ./configure esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5 $as_echo "$enable_big_digits" >&6; } -@@ -12095,7 +12173,7 @@ fi +@@ -12102,7 +12180,7 @@ fi # check for wchar.h ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" @@ -2816,7 +2816,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h -@@ -12118,7 +12196,7 @@ then +@@ -12125,7 +12203,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; } @@ -2825,7 +2825,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "#include -@@ -12128,8 +12206,9 @@ else +@@ -12135,8 +12213,9 @@ else if test "$ac_cv_type_wchar_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -2837,7 +2837,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_cv_sizeof_wchar_t=0 fi -@@ -12184,7 +12263,7 @@ then +@@ -12191,7 +12270,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; } @@ -2846,7 +2846,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -12280,7 +12359,7 @@ $as_echo "$PY_UNICODE_TYPE" >&6; } +@@ -12287,7 +12366,7 @@ $as_echo "$PY_UNICODE_TYPE" >&6; } # check for endianness { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } @@ -2855,7 +2855,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown -@@ -12498,7 +12577,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI +@@ -12505,7 +12584,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI ;; #( *) @@ -2864,7 +2864,7 @@ diff -up ./configure.autotool-intermediates ./configure presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -@@ -12571,7 +12650,7 @@ $as_echo "$SO" >&6; } +@@ -12578,7 +12657,7 @@ $as_echo "$SO" >&6; } # or fills with zeros (like the Cray J90, according to Tim Peters). { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5 $as_echo_n "checking whether right shift extends the sign bit... " >&6; } @@ -2873,7 +2873,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -12610,7 +12689,7 @@ fi +@@ -12617,7 +12696,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; } @@ -2882,7 +2882,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -12708,7 +12787,7 @@ fi +@@ -12715,7 +12794,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; } @@ -2891,7 +2891,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -12742,7 +12821,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -12749,7 +12828,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; } @@ -2900,7 +2900,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_RL_CALLBACK 1" >>confdefs.h -@@ -12760,7 +12839,7 @@ else +@@ -12767,7 +12846,7 @@ else have_readline=no fi @@ -2909,7 +2909,7 @@ diff -up ./configure.autotool-intermediates ./configure if test $have_readline = yes then cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -12794,7 +12873,7 @@ fi +@@ -12801,7 +12880,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; } @@ -2918,7 +2918,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -12828,7 +12907,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -12835,7 +12914,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; } @@ -2927,7 +2927,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h -@@ -12838,7 +12917,7 @@ fi +@@ -12845,7 +12924,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; } @@ -2936,7 +2936,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -12872,7 +12951,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -12879,7 +12958,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; } @@ -2945,7 +2945,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h -@@ -12882,7 +12961,7 @@ fi +@@ -12889,7 +12968,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; } @@ -2954,7 +2954,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -12916,7 +12995,7 @@ LIBS=$ac_check_lib_save_LIBS +@@ -12923,7 +13002,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; } @@ -2963,7 +2963,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h -@@ -12934,7 +13013,7 @@ else +@@ -12941,7 +13020,7 @@ else have_readline=no fi @@ -2972,7 +2972,7 @@ diff -up ./configure.autotool-intermediates ./configure if test $have_readline = yes then cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -12957,7 +13036,7 @@ LIBS=$LIBS_no_readline +@@ -12964,7 +13043,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; } @@ -2981,7 +2981,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -12998,7 +13077,7 @@ fi +@@ -13005,7 +13084,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5 $as_echo_n "checking for broken poll()... " >&6; } @@ -2990,7 +2990,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13053,7 +13132,7 @@ ac_fn_c_check_member "$LINENO" "struct t +@@ -13060,7 +13139,7 @@ ac_fn_c_check_member "$LINENO" "struct t #include <$ac_cv_struct_tm> " @@ -2999,7 +2999,7 @@ diff -up ./configure.autotool-intermediates ./configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -13069,7 +13148,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf +@@ -13076,7 +13155,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf else ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include " @@ -3008,7 +3008,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_have_decl=1 else ac_have_decl=0 -@@ -13081,7 +13160,7 @@ _ACEOF +@@ -13088,7 +13167,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 $as_echo_n "checking for tzname... " >&6; } @@ -3017,7 +3017,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13120,7 +13199,7 @@ fi +@@ -13127,7 +13206,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; } @@ -3026,7 +3026,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else -@@ -13217,7 +13296,7 @@ fi +@@ -13224,7 +13303,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; } @@ -3035,7 +3035,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13254,7 +13333,7 @@ fi +@@ -13261,7 +13340,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; } @@ -3044,7 +3044,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13291,7 +13370,7 @@ fi +@@ -13298,7 +13377,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; } @@ -3053,7 +3053,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13328,7 +13407,7 @@ fi +@@ -13335,7 +13414,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5 $as_echo_n "checking whether WINDOW has _flags... " >&6; } @@ -3062,7 +3062,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -13476,7 +13555,7 @@ if test "$have_long_long" = yes +@@ -13483,7 +13562,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; } @@ -3071,7 +3071,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13546,7 +13625,7 @@ fi +@@ -13553,7 +13632,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; } @@ -3080,7 +3080,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13619,7 +13698,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t" +@@ -13626,7 +13705,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t" #endif " @@ -3089,7 +3089,7 @@ diff -up ./configure.autotool-intermediates ./configure else -@@ -13630,7 +13709,7 @@ fi +@@ -13637,7 +13716,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken mbstowcs" >&5 $as_echo_n "checking for broken mbstowcs... " >&6; } @@ -3098,7 +3098,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13670,7 +13749,7 @@ fi +@@ -13677,7 +13756,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5 $as_echo_n "checking whether $CC supports computed gotos... " >&6; } @@ -3107,7 +3107,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -13750,11 +13829,11 @@ esac +@@ -13757,11 +13836,11 @@ esac case $ac_sys_system in @@ -3121,7 +3121,7 @@ diff -up ./configure.autotool-intermediates ./configure $as_echo "#define HAVE_PIPE2 1" >>confdefs.h -@@ -13849,21 +13928,10 @@ $as_echo "$as_me: WARNING: cache variabl +@@ -13856,21 +13935,10 @@ $as_echo "$as_me: WARNING: cache variabl :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then @@ -3145,7 +3145,7 @@ diff -up ./configure.autotool-intermediates ./configure 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;} -@@ -13879,7 +13947,6 @@ DEFS=-DHAVE_CONFIG_H +@@ -13886,7 +13954,6 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= @@ -3153,7 +3153,7 @@ diff -up ./configure.autotool-intermediates ./configure for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -@@ -13896,7 +13963,7 @@ LTLIBOBJS=$ac_ltlibobjs +@@ -13903,7 +13970,7 @@ LTLIBOBJS=$ac_ltlibobjs @@ -3162,7 +3162,7 @@ diff -up ./configure.autotool-intermediates ./configure ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -@@ -13997,7 +14064,6 @@ fi +@@ -14004,7 +14071,6 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -3170,7 +3170,7 @@ diff -up ./configure.autotool-intermediates ./configure case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -14043,19 +14109,19 @@ export LANGUAGE +@@ -14050,19 +14116,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -3198,7 +3198,7 @@ diff -up ./configure.autotool-intermediates ./configure as_fn_exit $as_status } # as_fn_error -@@ -14251,7 +14317,7 @@ $as_echo X"$as_dir" | +@@ -14258,7 +14324,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -3207,7 +3207,7 @@ diff -up ./configure.autotool-intermediates ./configure } # as_fn_mkdir_p -@@ -14305,7 +14371,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri +@@ -14312,7 +14378,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # values after options handling. ac_log=" This file was extended by python $as_me 3.2, which was @@ -3216,7 +3216,7 @@ diff -up ./configure.autotool-intermediates ./configure CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -14367,10 +14433,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ +@@ -14374,10 +14440,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ python config.status 3.2 @@ -3229,7 +3229,7 @@ diff -up ./configure.autotool-intermediates ./configure This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -14386,16 +14452,11 @@ ac_need_defaults=: +@@ -14393,16 +14459,11 @@ ac_need_defaults=: while test $# != 0 do case $1 in @@ -3247,7 +3247,7 @@ diff -up ./configure.autotool-intermediates ./configure *) ac_option=$1 ac_optarg=$2 -@@ -14417,7 +14478,6 @@ do +@@ -14424,7 +14485,6 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; @@ -3255,7 +3255,7 @@ diff -up ./configure.autotool-intermediates ./configure esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; -@@ -14430,7 +14490,7 @@ do +@@ -14437,7 +14497,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header @@ -3264,7 +3264,7 @@ diff -up ./configure.autotool-intermediates ./configure Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -@@ -14439,7 +14499,7 @@ Try \`$0 --help' for more information."; +@@ -14446,7 +14506,7 @@ Try \`$0 --help' for more information."; ac_cs_silent=: ;; # This is an error. @@ -3273,7 +3273,7 @@ diff -up ./configure.autotool-intermediates ./configure Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" -@@ -14498,7 +14558,7 @@ do +@@ -14505,7 +14565,7 @@ do "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;; "Modules/ld_so_aix") CONFIG_FILES="$CONFIG_FILES Modules/ld_so_aix" ;; @@ -3282,7 +3282,7 @@ diff -up ./configure.autotool-intermediates ./configure esac done -@@ -14520,10 +14580,9 @@ fi +@@ -14527,10 +14587,9 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { @@ -3295,7 +3295,7 @@ diff -up ./configure.autotool-intermediates ./configure ' 0 trap 'as_fn_exit 1' 1 2 13 15 } -@@ -14531,13 +14590,12 @@ $debug || +@@ -14538,13 +14597,12 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && @@ -3311,7 +3311,7 @@ diff -up ./configure.autotool-intermediates ./configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -14554,12 +14612,12 @@ if test "x$ac_cr" = x; then +@@ -14561,12 +14619,12 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then @@ -3326,7 +3326,7 @@ diff -up ./configure.autotool-intermediates ./configure _ACEOF -@@ -14568,18 +14626,18 @@ _ACEOF +@@ -14575,18 +14633,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -3349,7 +3349,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -14587,7 +14645,7 @@ done +@@ -14594,7 +14652,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -3358,7 +3358,7 @@ diff -up ./configure.autotool-intermediates ./configure _ACEOF sed -n ' h -@@ -14635,7 +14693,7 @@ t delim +@@ -14642,7 +14700,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK @@ -3367,7 +3367,7 @@ diff -up ./configure.autotool-intermediates ./configure for (key in S) S_is_set[key] = 1 FS = "" -@@ -14667,29 +14725,21 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n +@@ -14674,29 +14732,21 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat @@ -3406,7 +3406,7 @@ diff -up ./configure.autotool-intermediates ./configure s/^[^=]*=[ ]*$// }' fi -@@ -14701,7 +14751,7 @@ fi # test -n "$CONFIG_FILES" +@@ -14708,7 +14758,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 @@ -3415,7 +3415,7 @@ diff -up ./configure.autotool-intermediates ./configure BEGIN { _ACEOF -@@ -14713,11 +14763,11 @@ _ACEOF +@@ -14720,11 +14770,11 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do @@ -3430,7 +3430,7 @@ diff -up ./configure.autotool-intermediates ./configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -14802,7 +14852,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ +@@ -14809,7 +14859,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -3439,7 +3439,7 @@ diff -up ./configure.autotool-intermediates ./configure fi # test -n "$CONFIG_HEADERS" -@@ -14815,7 +14865,7 @@ do +@@ -14822,7 +14872,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -3448,7 +3448,7 @@ diff -up ./configure.autotool-intermediates ./configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -14834,7 +14884,7 @@ do +@@ -14841,7 +14891,7 @@ do for ac_f do case $ac_f in @@ -3457,7 +3457,7 @@ diff -up ./configure.autotool-intermediates ./configure *) # 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 `:'. -@@ -14843,7 +14893,7 @@ do +@@ -14850,7 +14900,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -3466,7 +3466,7 @@ diff -up ./configure.autotool-intermediates ./configure esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" -@@ -14869,8 +14919,8 @@ $as_echo "$as_me: creating $ac_file" >&6 +@@ -14876,8 +14926,8 @@ $as_echo "$as_me: creating $ac_file" >&6 esac case $ac_tag in @@ -3477,7 +3477,7 @@ diff -up ./configure.autotool-intermediates ./configure esac ;; esac -@@ -15000,24 +15050,23 @@ s&@abs_top_builddir@&$ac_abs_top_builddi +@@ -15007,24 +15057,23 @@ s&@abs_top_builddir@&$ac_abs_top_builddi s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " @@ -3512,7 +3512,7 @@ diff -up ./configure.autotool-intermediates ./configure ;; :H) # -@@ -15026,21 +15075,21 @@ which seems to be undefined. Please mak +@@ -15033,21 +15082,21 @@ which seems to be undefined. Please mak if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ @@ -3542,7 +3542,7 @@ diff -up ./configure.autotool-intermediates ./configure fi ;; -@@ -15060,7 +15109,7 @@ _ACEOF +@@ -15067,7 +15116,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || @@ -3551,7 +3551,7 @@ diff -up ./configure.autotool-intermediates ./configure # configure is writing to config.log, and then calls config.status. -@@ -15081,7 +15130,7 @@ if test "$no_create" != yes; then +@@ -15088,7 +15137,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -3561,8 +3561,8 @@ diff -up ./configure.autotool-intermediates ./configure if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in ---- ./pyconfig.h.in.autotool-intermediates 2011-02-14 12:00:34.924103677 -0500 -+++ ./pyconfig.h.in 2011-02-14 12:00:41.116907489 -0500 +--- ./pyconfig.h.in.autotool-intermediates 2011-02-21 10:38:12.252957078 -0500 ++++ ./pyconfig.h.in 2011-02-21 10:38:17.743831724 -0500 @@ -12,15 +12,15 @@ support for AIX C++ shared extension modules. */ #undef AIX_GENUINE_CPLUSPLUS @@ -3582,3 +3582,13 @@ diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM mixed-endian order (byte order 45670123) */ #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 +@@ -1161,6 +1161,9 @@ + /* This must be defined on some systems to enable large file support. */ + #undef _LARGEFILE_SOURCE + ++/* This must be defined on AIX systems to enable large file support. */ ++#undef _LARGE_FILES ++ + /* Define to 1 if on MINIX. */ + #undef _MINIX + diff --git a/python3.spec b/python3.spec index 4428f43..da0df0a 100644 --- a/python3.spec +++ b/python3.spec @@ -3,8 +3,6 @@ # pybasever without the dot: %global pyshortver 32 -%global alphatag rc3 - %global pylibdir %{_libdir}/python%{pybasever} %global dynload_dir %{pylibdir}/lib-dynload @@ -113,10 +111,10 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever} -Release: 0.13.%{alphatag}%{?dist} +Release: 1%{?dist} License: Python Group: Development/Languages -Source: http://python.org/ftp/python/%{version}/Python-%{version}%{alphatag}.tar.bz2 +Source: http://python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 # Avoid having various bogus auto-generated Provides lines for the various # python c modules' SONAMEs: @@ -352,7 +350,7 @@ can load its own extensions. %endif # with_debug_build %prep -%setup -q -n Python-%{version}%{alphatag} +%setup -q -n Python-%{version} chmod +x %{SOURCE1} %if 0%{?with_systemtap} @@ -837,7 +835,7 @@ rm -fr %{buildroot} %doc LICENSE README %dir %{pylibdir} %dir %{dynload_dir} -%{dynload_dir}/Python-%{version}%{alphatag}-py%{pybasever}.egg-info +%{dynload_dir}/Python-%{version}-py%{pybasever}.egg-info %{dynload_dir}/_bisect.%{SOABI_optimized}.so %{dynload_dir}/_codecs_cn.%{SOABI_optimized}.so %{dynload_dir}/_codecs_hk.%{SOABI_optimized}.so @@ -1175,6 +1173,11 @@ rm -fr %{buildroot} %changelog +* Mon Feb 21 2011 David Malcolm - 3.2-1 +- 3.2 +- drop alphatag +- regenerate autotool patch + * Mon Feb 14 2011 David Malcolm - 3.2-0.13.rc3 - add a /usr/bin/python3-debug symlink within the debug subpackage diff --git a/sources b/sources index 3bc9e24..48f3848 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25379af4bb6b0001e175d9d9b2ba4f63 Python-3.2rc3.tar.bz2 +92e94b5b6652b96349d6362b8337811d Python-3.2.tar.bz2