From 34c15c7789f299317178b38fe0b3a1ed1b2dcf1d Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Jan 17 2011 21:25:14 +0000
Subject: 3.2rc1


* Mon Jan 17 2011 David Malcolm <dmalcolm@redhat.com> - 3.2-0.9.rc1
- 3.2rc1
- rework patch 6 (static lib removal)
- remove upstreamed patch 130 (ppc debug build)
- regenerate patch 300 (autotool intermediates)
- updated packaging to reflect upstream rewrite of "Demo" (issue 7962)
- added libpython3.so and 2to3-3.2

---

diff --git a/.gitignore b/.gitignore
index 474e8a7..84f6983 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ libpython-36a517ef7848cbd0b3dcc7371f32e47ac4c87eba.tar.gz
 Python-3.1.2.tar.bz2
 Python-3.2a1.tar.bz2
 /Python-3.2b2.tar.bz2
+/Python-3.2rc1.tar.bz2
diff --git a/autotool-intermediates.patch b/autotool-intermediates.patch
index 8af26e3..fa49d8b 100644
--- a/autotool-intermediates.patch
+++ b/autotool-intermediates.patch
@@ -1,70 +1,13 @@
 diff -up ./configure.autotool-intermediates ./configure
---- ./configure.autotool-intermediates	2010-12-28 18:47:15.206934478 -0500
-+++ ./configure	2010-12-28 18:47:21.053058461 -0500
-@@ -1,14 +1,14 @@
+--- ./configure.autotool-intermediates	2011-01-17 13:09:50.836697224 -0500
++++ ./configure	2011-01-17 13:09:56.662690482 -0500
+@@ -1,5 +1,5 @@
  #! /bin/sh
- # From configure.in Revision: 87207 .
+-# From configure.in Revision: 87646 .
++# From configure.in Revision: 87698 .
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.67 for python 3.2.
-+# Generated by GNU Autoconf 2.65 for python 3.2.
+ # Generated by GNU Autoconf 2.65 for python 3.2.
  #
- # Report bugs to <http://bugs.python.org/>.
- #
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
-@@ -320,7 +320,7 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -360,19 +360,19 @@ else
- fi # as_fn_arith
- 
- 
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$1; test $as_status -eq 0 && as_status=1
--  if test "$4"; then
--    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-   fi
--  $as_echo "$as_me: error: $2" >&2
-+  $as_echo "$as_me: error: $1" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -534,7 +534,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
- exec 6>&1
- 
- # Name of the host.
--# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
 @@ -611,6 +611,8 @@ TRUE
  MACHDEP_OBJS
  DYNLOADFILE
@@ -74,7 +17,7 @@ diff -up ./configure.autotool-intermediates ./configure
  THREADOBJ
  LDLAST
  USE_THREAD_MODULE
-@@ -748,8 +750,11 @@ with_thread
+@@ -749,8 +751,11 @@ with_thread
  enable_ipv6
  with_doc_strings
  with_tsc
@@ -86,146 +29,7 @@ diff -up ./configure.autotool-intermediates ./configure
  with_fpectl
  with_libm
  with_libc
-@@ -828,9 +833,8 @@ do
-   fi
- 
-   case $ac_option in
--  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
--  *=)   ac_optarg= ;;
--  *)    ac_optarg=yes ;;
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-   esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -875,7 +879,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid feature name: $ac_useropt"
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -901,7 +905,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid feature name: $ac_useropt"
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1105,7 +1109,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid package name: $ac_useropt"
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1121,7 +1125,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      as_fn_error $? "invalid package name: $ac_useropt"
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1151,8 +1155,8 @@ do
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) as_fn_error $? "unrecognized option: \`$ac_option'
--Try \`$0 --help' for more information"
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
-     ;;
- 
-   *=*)
-@@ -1160,7 +1164,7 @@ Try \`$0 --help' for more information"
-     # Reject names that are not valid shell variable names.
-     case $ac_envvar in #(
-       '' | [0-9]* | *[!_$as_cr_alnum]* )
--      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-     esac
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
-@@ -1178,13 +1182,13 @@ done
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  as_fn_error $? "missing argument to $ac_option"
-+  as_fn_error "missing argument to $ac_option"
- fi
- 
- if test -n "$ac_unrecognized_opts"; then
-   case $enable_option_checking in
-     no) ;;
--    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
- fi
-@@ -1207,7 +1211,7 @@ do
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1221,8 +1225,8 @@ target=$target_alias
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
--    If a cross compiler is detected then cross compile mode will be used" >&2
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-   fi
-@@ -1237,9 +1241,9 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  as_fn_error $? "working directory cannot be determined"
-+  as_fn_error "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  as_fn_error $? "pwd does not report name of working directory"
-+  as_fn_error "pwd does not report name of working directory"
- 
- 
- # Find the source files, if location was not specified.
-@@ -1278,11 +1282,11 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
- 	pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1322,7 +1326,7 @@ Configuration:
-       --help=short        display options specific to this package
-       --help=recursive    display the short help of all the included packages
-   -V, --version           display version information and exit
--  -q, --quiet, --silent   do not print \`checking ...' messages
-+  -q, --quiet, --silent   do not print \`checking...' messages
-       --cache-file=FILE   cache test results in FILE [disabled]
-   -C, --config-cache      alias for \`--cache-file=config.cache'
-   -n, --no-create         do not create output files
-@@ -1421,8 +1425,11 @@ Optional Packages:
+@@ -1421,8 +1426,11 @@ Optional Packages:
                            deprecated; use --with(out)-threads
    --with(out)-doc-strings disable/enable documentation strings
    --with(out)-tsc         enable/disable timestamp counter profile
@@ -237,775 +41,7 @@ diff -up ./configure.autotool-intermediates ./configure
    --with-fpectl           enable SIGFPE catching
    --with-libm=STRING      math library
    --with-libc=STRING      C library
-@@ -1508,9 +1515,9 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
-   cat <<\_ACEOF
- python configure 3.2
--generated by GNU Autoconf 2.67
-+generated by GNU Autoconf 2.65
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1580,7 +1587,7 @@ $as_echo "$ac_try_echo"; } >&5
-     mv -f conftest.er1 conftest.err
-   fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } > conftest.i && {
-+  test $ac_status = 0; } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then :
-@@ -1604,10 +1611,10 @@ fi
- ac_fn_c_check_header_mongrel ()
- {
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if eval "test \"\${$3+set}\"" = set; then :
-+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- fi
- eval ac_res=\$$3
-@@ -1643,7 +1650,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
- else
-   ac_header_preproc=no
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
- 
-@@ -1666,15 +1673,17 @@ $as_echo "$as_me: WARNING: $2: see the A
- $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--( $as_echo "## -------------------------------------- ##
-+( cat <<\_ASBOX
-+## -------------------------------------- ##
- ## Report this to http://bugs.python.org/ ##
--## -------------------------------------- ##"
-+## -------------------------------------- ##
-+_ASBOX
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=\$ac_header_compiler"
-@@ -1738,7 +1747,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1815,7 +1824,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -1869,7 +1878,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -1899,7 +1908,8 @@ if ac_fn_c_try_compile "$LINENO"; then :
- esac
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--       if eval test \"x\$"$3"\" = x"no"; then :
-+       eval as_val=\$$3
-+   if test "x$as_val" = x""no; then :
- 
- else
-   break
-@@ -1922,7 +1932,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   eval "$3=no"
-@@ -1933,11 +1943,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
- 
-   ;
-@@ -1948,11 +1958,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 ()
- {
--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
- 
-@@ -1973,7 +1983,8 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--       if eval test \"x\$"$3"\" = x"no"; then :
-+       eval as_val=\$$3
-+   if test "x$as_val" = x""no; then :
- 
- else
-   break
-@@ -2173,7 +2184,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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2241,7 +2252,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 { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2289,18 +2300,15 @@ $as_echo "$ac_res" >&6; }
- 
- } # ac_fn_c_check_member
- 
--# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
--# ---------------------------------------------
--# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
--# accordingly.
-+# ac_fn_c_check_decl LINENO SYMBOL VAR
-+# ------------------------------------
-+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
- ac_fn_c_check_decl ()
- {
-   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  as_decl_name=`echo $2|sed 's/ *(.*//'`
--  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
--$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
--if eval "test \"\${$3+set}\"" = set; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-+$as_echo_n "checking whether $2 is declared... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2309,12 +2317,8 @@ $4
- int
- main ()
- {
--#ifndef $as_decl_name
--#ifdef __cplusplus
--  (void) $as_decl_use;
--#else
--  (void) $as_decl_name;
--#endif
-+#ifndef $2
-+  (void) $2;
- #endif
- 
-   ;
-@@ -2339,7 +2343,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by python $as_me 3.2, which was
--generated by GNU Autoconf 2.67.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -2449,9 +2453,11 @@ trap 'exit_status=$?
-   {
-     echo
- 
--    $as_echo "## ---------------- ##
-+    cat <<\_ASBOX
-+## ---------------- ##
- ## Cache variables. ##
--## ---------------- ##"
-+## ---------------- ##
-+_ASBOX
-     echo
-     # The following way of writing the cache mishandles newlines in values,
- (
-@@ -2485,9 +2491,11 @@ $as_echo "$as_me: WARNING: cache variabl
- )
-     echo
- 
--    $as_echo "## ----------------- ##
-+    cat <<\_ASBOX
-+## ----------------- ##
- ## Output variables. ##
--## ----------------- ##"
-+## ----------------- ##
-+_ASBOX
-     echo
-     for ac_var in $ac_subst_vars
-     do
-@@ -2500,9 +2508,11 @@ $as_echo "$as_me: WARNING: cache variabl
-     echo
- 
-     if test -n "$ac_subst_files"; then
--      $as_echo "## ------------------- ##
-+      cat <<\_ASBOX
-+## ------------------- ##
- ## File substitutions. ##
--## ------------------- ##"
-+## ------------------- ##
-+_ASBOX
-       echo
-       for ac_var in $ac_subst_files
-       do
-@@ -2516,9 +2526,11 @@ $as_echo "$as_me: WARNING: cache variabl
-     fi
- 
-     if test -s confdefs.h; then
--      $as_echo "## ----------- ##
-+      cat <<\_ASBOX
-+## ----------- ##
- ## confdefs.h. ##
--## ----------- ##"
-+## ----------- ##
-+_ASBOX
-       echo
-       cat confdefs.h
-       echo
-@@ -2573,12 +2585,7 @@ _ACEOF
- ac_site_file1=NONE
- ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
--  # We do not want a PATH search for config.site.
--  case $CONFIG_SITE in #((
--    -*)  ac_site_file1=./$CONFIG_SITE;;
--    */*) ac_site_file1=$CONFIG_SITE;;
--    *)   ac_site_file1=./$CONFIG_SITE;;
--  esac
-+  ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
-   ac_site_file1=$prefix/share/config.site
-   ac_site_file2=$prefix/etc/config.site
-@@ -2593,11 +2600,7 @@ do
-     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
--    . "$ac_site_file" \
--      || { { $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 ; }
-+    . "$ac_site_file"
-   fi
- done
- 
-@@ -2673,7 +2676,7 @@ if $ac_cache_corrupted; then
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
- ## -------------------- ##
- ## Main body of script. ##
-@@ -2774,7 +2777,7 @@ if test "${enable_universalsdk+set}" = s
- 		UNIVERSALSDK=$enableval
- 		if test ! -d "${UNIVERSALSDK}"
- 		then
--			as_fn_error $? "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5
-+			as_fn_error "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5
- 		fi
- 		;;
- 	esac
-@@ -3166,7 +3169,7 @@ $as_echo "$without_gcc" >&6; }
- # If the user switches compilers, we can't believe the cache
- if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
- then
--  as_fn_error $? "cached CC is different -- throw away $cache_file
-+  as_fn_error "cached CC is different -- throw away $cache_file
- (it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5
- fi
- 
-@@ -3476,8 +3479,8 @@ fi
- 
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "no acceptable C compiler found in \$PATH
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
- 
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3591,8 +3594,9 @@ 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 ; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -3634,8 +3638,8 @@ done
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3692,9 +3696,9 @@ $as_echo "$ac_try_echo"; } >&5
-     else
- 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details" "$LINENO" 5 ; }
-+See \`config.log' for more details." "$LINENO" 5; }
-     fi
-   fi
- fi
-@@ -3745,8 +3749,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot compute suffix of object files: cannot compile
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
-@@ -4199,7 +4203,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4215,11 +4219,11 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-   break
- fi
-@@ -4258,7 +4262,7 @@ else
-   # Broken: fails on valid input.
- continue
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-@@ -4274,18 +4278,18 @@ else
- ac_preproc_ok=:
- break
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- 
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5 ; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- 
- ac_ext=c
-@@ -4346,7 +4350,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_GREP"; then
--    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_GREP=$GREP
-@@ -4412,7 +4416,7 @@ esac
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_EGREP=$EGREP
-@@ -4544,7 +4548,8 @@ do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -5158,22 +5163,16 @@ bsdos*|hp*|HP*)
- esac
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
--  if test -f "$ac_dir/install-sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install-sh -c"
--    break
--  elif test -f "$ac_dir/install.sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install.sh -c"
--    break
--  elif test -f "$ac_dir/shtool"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/shtool install -c"
--    break
--  fi
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
- done
- if test -z "$ac_aux_dir"; then
--  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
- 
- # These three variables are undocumented and unsupported,
-@@ -5511,7 +5510,7 @@ $as_echo "$CC" >&6; }
- 		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
- 
- 		 else
--	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
-+	           as_fn_error "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
- 
- 		 fi
- 
-@@ -6005,7 +6004,8 @@ bluetooth/bluetooth.h linux/tipc.h spawn
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -6019,7 +6019,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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6046,7 +6046,8 @@ fi
- eval ac_res=\$$as_ac_Header
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
- _ACEOF
-@@ -6566,8 +6567,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;}
--as_fn_error 77 "cannot compute sizeof (int)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (int)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_int=0
-    fi
-@@ -6599,8 +6601,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;}
--as_fn_error 77 "cannot compute sizeof (long)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_long=0
-    fi
-@@ -6632,8 +6635,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;}
--as_fn_error 77 "cannot compute sizeof (void *)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (void *)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_void_p=0
-    fi
-@@ -6665,8 +6669,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;}
--as_fn_error 77 "cannot compute sizeof (short)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (short)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_short=0
-    fi
-@@ -6698,8 +6703,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;}
--as_fn_error 77 "cannot compute sizeof (float)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (float)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_float=0
-    fi
-@@ -6731,8 +6737,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;}
--as_fn_error 77 "cannot compute sizeof (double)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (double)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_double=0
-    fi
-@@ -6764,8 +6771,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;}
--as_fn_error 77 "cannot compute sizeof (fpos_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (fpos_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_fpos_t=0
-    fi
-@@ -6797,8 +6805,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;}
--as_fn_error 77 "cannot compute sizeof (size_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (size_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_size_t=0
-    fi
-@@ -6830,8 +6839,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;}
--as_fn_error 77 "cannot compute sizeof (pid_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (pid_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_pid_t=0
-    fi
-@@ -6890,8 +6900,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;}
--as_fn_error 77 "cannot compute sizeof (long long)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_long_long=0
-    fi
-@@ -6951,8 +6962,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;}
--as_fn_error 77 "cannot compute sizeof (long double)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long double)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_long_double=0
-    fi
-@@ -7013,8 +7025,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;}
--as_fn_error 77 "cannot compute sizeof (_Bool)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (_Bool)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof__Bool=0
-    fi
-@@ -7061,8 +7074,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;}
--as_fn_error 77 "cannot compute sizeof (uintptr_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (uintptr_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_uintptr_t=0
-    fi
-@@ -7102,8 +7116,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;}
--as_fn_error 77 "cannot compute sizeof (off_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (off_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_off_t=0
-    fi
-@@ -7164,8 +7179,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;}
--as_fn_error 77 "cannot compute sizeof (time_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (time_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_time_t=0
-    fi
-@@ -7236,8 +7252,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;}
--as_fn_error 77 "cannot compute sizeof (pthread_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (pthread_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_pthread_t=0
-    fi
-@@ -7324,7 +7341,7 @@ fi
-     		MACOSX_DEFAULT_ARCH="ppc"
-     		;;
-     	*)
--    		as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
-+    		as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 5
-     		;;
-     	esac
-     else
-@@ -7336,7 +7353,7 @@ fi
-     		MACOSX_DEFAULT_ARCH="ppc64"
-     		;;
-     	*)
--    		as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
-+    		as_fn_error "Unexpected output of 'arch' on OSX" "$LINENO" 5
-     		;;
-     	esac
- 
-@@ -7362,7 +7379,7 @@ $as_echo "#define WITH_NEXT_FRAMEWORK 1"
- $as_echo "yes" >&6; }
- 	if test $enable_shared = "yes"
- 	then
--		as_fn_error $? "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 5
-+		as_fn_error "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 5
- 	fi
- else
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -8158,12 +8175,12 @@ if test "${with_dbmliborder+set}" = set;
-   withval=$with_dbmliborder;
- if test x$with_dbmliborder = xyes
- then
--as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
-+as_fn_error "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
- else
-   for db in `echo $with_dbmliborder | sed 's/:/ /g'`; do
-     if test x$db != xndbm && test x$db != xgdbm && test x$db != xbdb
-     then
--      as_fn_error $? "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
-+      as_fn_error "proper usage is --with-dbmliborder=db1:db2:..." "$LINENO" 5
-     fi
-   done
- fi
-@@ -9118,6 +9135,50 @@ $as_echo "no" >&6; }
+@@ -9138,6 +9146,50 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -1056,16 +92,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; }
-@@ -9162,7 +9223,7 @@ if test "x$ac_cv_header_valgrind_valgrin
- $as_echo "#define WITH_VALGRIND 1" >>confdefs.h
- 
- else
--  as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5
-+  as_fn_error "Valgrind support requested but headers not available" "$LINENO" 5
- 
- fi
- 
-@@ -9170,6 +9231,46 @@ fi
+@@ -9190,6 +9242,46 @@ fi
      OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
  fi
  
@@ -1112,494 +139,20 @@ diff -up ./configure.autotool-intermediates ./configure
  # -I${DLINCLDIR} is added to the compile rule for importdl.o
  
  DLINCLDIR=.
-@@ -9256,7 +9357,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"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -10251,7 +10353,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"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -10260,44 +10363,25 @@ fi
- done
- 
- 
--ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
--if test "x$ac_cv_func_dup2" = x""yes; then :
--  $as_echo "#define HAVE_DUP2 1" >>confdefs.h
--
--else
--  case " $LIBOBJS " in
--  *" dup2.$ac_objext "* ) ;;
--  *) LIBOBJS="$LIBOBJS dup2.$ac_objext"
-- ;;
--esac
--
--fi
--
--ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
--if test "x$ac_cv_func_getcwd" = x""yes; then :
--  $as_echo "#define HAVE_GETCWD 1" >>confdefs.h
--
--else
--  case " $LIBOBJS " in
--  *" getcwd.$ac_objext "* ) ;;
--  *) LIBOBJS="$LIBOBJS getcwd.$ac_objext"
-- ;;
--esac
--
--fi
--
--ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
--if test "x$ac_cv_func_strdup" = x""yes; then :
--  $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
-+for ac_func in dup2 getcwd strdup
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
+@@ -14304,8 +14396,8 @@ esac
  
- else
-   case " $LIBOBJS " in
--  *" strdup.$ac_objext "* ) ;;
--  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
-+  *" $ac_func.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
-  ;;
- esac
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ # Files that config.status was made for.
+-config_files="`echo $ac_config_files`"
+-config_headers="`echo $ac_config_headers`"
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
  
- fi
-+done
- 
- 
- for ac_func in getpgrp
-@@ -11510,7 +11594,7 @@ elif test "$withval" != yes
- then LIBM=$withval
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5
- $as_echo "set LIBM=\"$withval\"" >&6; }
--else as_fn_error $? "proper usage is --with-libm=STRING" "$LINENO" 5
-+else as_fn_error "proper usage is --with-libm=STRING" "$LINENO" 5
- fi
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5
-@@ -11534,7 +11618,7 @@ elif test "$withval" != yes
- then LIBC=$withval
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5
- $as_echo "set LIBC=\"$withval\"" >&6; }
--else as_fn_error $? "proper usage is --with-libc=STRING" "$LINENO" 5
-+else as_fn_error "proper usage is --with-libc=STRING" "$LINENO" 5
- fi
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5
-@@ -11784,7 +11868,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"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -11796,7 +11881,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"
--if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -12059,7 +12145,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; }
-@@ -12110,8 +12196,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;}
--as_fn_error 77 "cannot compute sizeof (wchar_t)
--See \`config.log' for more details" "$LINENO" 5 ; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (wchar_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
-      ac_cv_sizeof_wchar_t=0
-    fi
-@@ -12480,8 +12567,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI
- 
-      ;; #(
-    *)
--     as_fn_error $? "unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
-+     as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-  esac
- 
- 
-@@ -12742,7 +12829,7 @@ else
-   have_readline=no
- 
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if test $have_readline = yes
- then
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12916,7 +13003,7 @@ else
-   have_readline=no
- 
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_ext
- if test $have_readline = yes
- then
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13732,7 +13819,7 @@ esac
- 
  
- case $ac_sys_system in
--  OSF*) as_fn_error $? "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5  ;;
-+  OSF*) as_fn_error "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5 ;;
- esac
- 
- ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2"
-@@ -13850,7 +13937,6 @@ DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
--U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
-   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -14013,19 +14099,19 @@ export LANGUAGE
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- 
--# as_fn_error STATUS ERROR [LINENO LOG_FD]
--# ----------------------------------------
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
--# script with STATUS, using 1 if that was 0.
-+# script with status $?, using 1 if that was 0.
- as_fn_error ()
- {
--  as_status=$1; test $as_status -eq 0 && as_status=1
--  if test "$4"; then
--    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-   fi
--  $as_echo "$as_me: error: $2" >&2
-+  $as_echo "$as_me: error: $1" >&2
-   as_fn_exit $as_status
- } # as_fn_error
- 
-@@ -14221,7 +14307,7 @@ $as_echo X"$as_dir" |
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- 
- 
- } # as_fn_mkdir_p
-@@ -14275,7 +14361,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by python $as_me 3.2, which was
--generated by GNU Autoconf 2.67.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -14337,10 +14423,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
--configured by $0, generated by GNU Autoconf 2.67,
-+configured by $0, generated by GNU Autoconf 2.65,
-   with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2010 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -14356,16 +14442,11 @@ ac_need_defaults=:
- while test $# != 0
- do
-   case $1 in
--  --*=?*)
-+  --*=*)
-     ac_option=`expr "X$1" : 'X\([^=]*\)='`
-     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
--  --*=)
--    ac_option=`expr "X$1" : 'X\([^=]*\)='`
--    ac_optarg=
--    ac_shift=:
--    ;;
-   *)
-     ac_option=$1
-     ac_optarg=$2
-@@ -14387,7 +14468,6 @@ do
-     $ac_shift
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
--    '') as_fn_error $? "missing file argument" ;;
-     esac
-     as_fn_append CONFIG_FILES " '$ac_optarg'"
-     ac_need_defaults=false;;
-@@ -14400,7 +14480,7 @@ do
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    as_fn_error $? "ambiguous option: \`$1'
-+    as_fn_error "ambiguous option: \`$1'
- Try \`$0 --help' for more information.";;
-   --help | --hel | -h )
-     $as_echo "$ac_cs_usage"; exit ;;
-@@ -14409,7 +14489,7 @@ Try \`$0 --help' for more information.";
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) as_fn_error $? "unrecognized option: \`$1'
-+  -*) as_fn_error "unrecognized option: \`$1'
- Try \`$0 --help' for more information." ;;
- 
-   *) as_fn_append ac_config_targets " $1"
-@@ -14468,7 +14548,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
- 
-@@ -14505,7 +14585,7 @@ $debug ||
- {
-   tmp=./conf$$-$RANDOM
-   (umask 077 && mkdir "$tmp")
--} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
- 
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -14522,7 +14602,7 @@ if test "x$ac_cr" = x; then
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
--  ac_cs_awk_cr='\\r'
-+  ac_cs_awk_cr='\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
-@@ -14536,18 +14616,18 @@ _ACEOF
-   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-   echo "_ACEOF"
- } >conf$$subs.sh ||
--  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
--ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   . ./conf$$subs.sh ||
--    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- 
-   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-   if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -14636,28 +14716,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
- else
-   cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
--  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
- 
--# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
--# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
--h
--s///
--s/^/:/
--s/[	 ]*$/:/
--s/:\$(srcdir):/:/g
--s/:\${srcdir}:/:/g
--s/:@srcdir@:/:/g
--s/^:*//
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
- s/:*$//
--x
--s/\(=[	 ]*\).*/\1/
--G
--s/\n//
- s/^[^=]*=[	 ]*$//
- }'
- fi
-@@ -14685,7 +14757,7 @@ for ac_last_try in false false :; do
-   if test -z "$ac_t"; then
-     break
-   elif $ac_last_try; then
--    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -14770,7 +14842,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
- 
- 
-@@ -14783,7 +14855,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
-@@ -14811,7 +14883,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 "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'"
-@@ -14838,7 +14910,7 @@ $as_echo "$as_me: creating $ac_file" >&6
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-     esac
-     ;;
-   esac
-@@ -14969,22 +15041,22 @@ 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
-+  || 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"; } &&
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined" >&5
-+which seems to be undefined.  Please make sure it is defined." >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
--which seems to be undefined.  Please make sure it is defined" >&2;}
-+which seems to be undefined.  Please make sure it is defined." >&2;}
- 
-   rm -f "$tmp/stdin"
-   case $ac_file in
-   -) cat "$tmp/out" && rm -f "$tmp/out";;
-   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-   esac \
--  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-  ;;
-   :H)
-   #
-@@ -14995,19 +15067,19 @@ which seems to be undefined.  Please mak
-       $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-     } >"$tmp/config.h" \
--      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       rm -f "$ac_file"
-       mv "$tmp/config.h" "$ac_file" \
--	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-     fi
-   else
-     $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
--      || as_fn_error $? "could not create -" "$LINENO" 5
-+      || as_fn_error "could not create -" "$LINENO" 5
-   fi
-  ;;
- 
-@@ -15027,7 +15099,7 @@ _ACEOF
- ac_clean_files=$ac_clean_files_save
- 
- test $ac_write_fail = 0 ||
--  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
- 
- 
- # configure is writing to config.log, and then calls config.status.
-@@ -15048,7 +15120,7 @@ if test "$no_create" != yes; then
-   exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
--  $ac_cs_success || as_fn_exit 1
-+  $ac_cs_success || as_fn_exit $?
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
---- ./pyconfig.h.in.autotool-intermediates	2010-12-28 18:47:15.203935226 -0500
-+++ ./pyconfig.h.in	2010-12-28 18:47:21.330060783 -0500
+--- ./pyconfig.h.in.autotool-intermediates	2011-01-17 13:09:50.827696887 -0500
++++ ./pyconfig.h.in	2011-01-17 13:09:56.963611199 -0500
 @@ -12,15 +12,15 @@
     support for AIX C++ shared extension modules. */
  #undef AIX_GENUINE_CPLUSPLUS
@@ -1619,13 +172,3 @@ diff -up ./pyconfig.h.in.autotool-intermediates ./pyconfig.h.in
  /* Define if C doubles are 64-bit IEEE 754 binary format, stored in ARM
     mixed-endian order (byte order 45670123) */
  #undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754
-@@ -503,6 +503,9 @@
- /* Define to 1 if you have the `pause' function. */
- #undef HAVE_PAUSE
- 
-+/* Define if the OS supports pipe2() */
-+#undef HAVE_PIPE2
-+
- /* Define to 1 if you have the `plock' function. */
- #undef HAVE_PLOCK
- 
diff --git a/python-3.2b2-no-static-lib.patch b/python-3.2b2-no-static-lib.patch
deleted file mode 100644
index 3ef3bc2..0000000
--- a/python-3.2b2-no-static-lib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -up Python-3.2b2/Makefile.pre.in.no-static-lib Python-3.2b2/Makefile.pre.in
---- Python-3.2b2/Makefile.pre.in.no-static-lib	2010-12-13 13:04:23.000000000 -0500
-+++ Python-3.2b2/Makefile.pre.in	2010-12-28 16:57:11.484065804 -0500
-@@ -420,7 +420,7 @@ coverage:
- 
- 
- # Build the interpreter
--$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
-+$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY)
- 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
- 
- platform: $(BUILDPYTHON)
-@@ -434,18 +434,6 @@ sharedmods: $(BUILDPYTHON)
- 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
- 	esac
- 
--# Build static library
--# avoid long command lines, same as LIBRARY_OBJS
--$(LIBRARY): $(LIBRARY_OBJS)
--	-rm -f $@
--	$(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
--	$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
--	$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
--	$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
--	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
--	$(AR) $(ARFLAGS) $@ $(MODOBJS)
--	$(RANLIB) $@
--
- libpython$(LDVERSION).so: $(LIBRARY_OBJS)
- 	if test $(INSTSONAME) != $(LDLIBRARY); then \
- 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -1035,18 +1023,6 @@ libainstall:	all python-config
- 		else	true; \
- 		fi; \
- 	done
--	@if test -d $(LIBRARY); then :; else \
--		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
--			if test "$(SO)" = .dll; then \
--				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
--			else \
--				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
--			fi; \
--		else \
--			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
--		fi; \
--	fi
- 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
- 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
- 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
diff --git a/python-3.2rc1-no-static-lib.patch b/python-3.2rc1-no-static-lib.patch
new file mode 100644
index 0000000..5b32bc7
--- /dev/null
+++ b/python-3.2rc1-no-static-lib.patch
@@ -0,0 +1,50 @@
+diff -up Python-3.2rc1/Makefile.pre.in.no-static-lib Python-3.2rc1/Makefile.pre.in
+--- Python-3.2rc1/Makefile.pre.in.no-static-lib	2010-12-30 17:12:40.000000000 -0500
++++ Python-3.2rc1/Makefile.pre.in	2011-01-17 12:58:32.123947161 -0500
+@@ -421,7 +421,7 @@ coverage:
+ 
+ 
+ # Build the interpreter
+-$(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
++$(BUILDPYTHON):	Modules/python.o $(LDLIBRARY) $(PY3LIBRARY)
+ 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ platform: $(BUILDPYTHON)
+@@ -435,18 +435,6 @@ sharedmods: $(BUILDPYTHON)
+ 	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+ 	esac
+ 
+-# Build static library
+-# avoid long command lines, same as LIBRARY_OBJS
+-$(LIBRARY): $(LIBRARY_OBJS)
+-	-rm -f $@
+-	$(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
+-	$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
+-	$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
+-	$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
+-	$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
+-	$(AR) $(ARFLAGS) $@ $(MODOBJS)
+-	$(RANLIB) $@
+-
+ libpython$(LDVERSION).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+ 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+@@ -1048,18 +1036,6 @@ libainstall:	all python-config
+ 		else	true; \
+ 		fi; \
+ 	done
+-	@if test -d $(LIBRARY); then :; else \
+-		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
+-			if test "$(SO)" = .dll; then \
+-				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
+-			else \
+-				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+-				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+-			fi; \
+-		else \
+-			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
+-		fi; \
+-	fi
+ 	$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
+ 	$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
+ 	$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
diff --git a/python3.spec b/python3.spec
index 56208eb..f4f23db 100644
--- a/python3.spec
+++ b/python3.spec
@@ -3,7 +3,7 @@
 # pybasever without the dot:
 %global pyshortver 32
 
-%global alphatag  b2
+%global alphatag  rc1
 
 %global pylibdir %{_libdir}/python%{pybasever}
 %global dynload_dir %{pylibdir}/lib-dynload
@@ -113,7 +113,7 @@
 Summary: Version 3 of the Python programming language aka Python 3000
 Name: python3
 Version: %{pybasever}
-Release: 0.8.%{alphatag}%{?dist}
+Release: 0.9.%{alphatag}%{?dist}
 License: Python
 Group: Development/Languages
 Source: http://python.org/ftp/python/%{version}/Python-%{version}%{alphatag}.tar.bz2
@@ -178,7 +178,7 @@ Patch3: python-3.2b2-remove-mimeaudio-tests.patch
 
 # Patch the Makefile.pre.in so that the generated Makefile doesn't try to build
 # a libpythonMAJOR.MINOR.a (bug 550692):
-Patch6: python-3.2b2-no-static-lib.patch
+Patch6: python-3.2rc1-no-static-lib.patch
 
 # Systemtap support: add statically-defined probe points
 # Patch based on upstream bug: http://bugs.python.org/issue4111
@@ -231,10 +231,6 @@ Patch128: python-3.2b2-test_sys-COUNT_ALLOCS.patch
 # Not yet sent upstream
 Patch129: python-3.2b2-fix-test-subprocess-with-nonreadable-path-dir.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
-
 # This is the generated patch to "configure"; see the description of
 #   %{regenerate_autotooling_patch}
 # above:
@@ -402,7 +398,6 @@ rm -r Modules/zlib || exit 1
 %patch127 -p1
 %patch128 -p1
 %patch129 -p1
-%patch130 -p1
 
 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
 # are many differences between 2.6 and the Python 3 library.
@@ -597,7 +592,7 @@ install -m755 -d %{buildroot}%{pylibdir}/Doc
 cp -ar Doc/tools %{buildroot}%{pylibdir}/Doc/
 
 # Demo scripts
-cp -ar Demo %{buildroot}%{pylibdir}/
+cp -ar Tools/demo %{buildroot}%{pylibdir}/Tools/
 
 # Fix for bug #136654
 rm -f %{buildroot}%{pylibdir}/email/test/data/audiotest.au %{buildroot}%{pylibdir}/test/audiotest.au
@@ -681,12 +676,8 @@ find %{buildroot} \
 
 # Remove executable flag from files that shouldn't have it:
 chmod a-x \
-  %{buildroot}%{pylibdir}/Demo/comparisons/patterns \
   %{buildroot}%{pylibdir}/distutils/tests/Setup.sample \
-  %{buildroot}%{pylibdir}/Demo/rpc/test \
-  %{buildroot}%{pylibdir}/Tools/README \
-  %{buildroot}%{pylibdir}/Demo/scripts/newslist.doc \
-  %{buildroot}%{pylibdir}/Demo/md5test/foo
+  %{buildroot}%{pylibdir}/Tools/README
 
 # Get rid of DOS batch files:
 find %{buildroot} -name \*.bat -exec rm {} \;
@@ -1000,6 +991,7 @@ rm -fr %{buildroot}
 %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
 
 %{_libdir}/%{py_INSTSONAME_optimized}
+%{_libdir}/libpython3.so
 %if 0%{?with_systemtap}
 %{tapsetdir}/%{libpython_stp_optimized}
 %doc systemtap-example.stp pyfuntop.stp
@@ -1025,11 +1017,9 @@ rm -fr %{buildroot}
 %files tools
 %defattr(-,root,root,755)
 %{_bindir}/python3-2to3
+%{_bindir}/2to3-%{pybasever}
 %{_bindir}/idle*
 %{pylibdir}/Tools
-%doc %{pylibdir}/Demo
-%exclude %{pylibdir}/Demo/distutils
-%exclude %{pylibdir}/Demo/md5test
 %doc %{pylibdir}/Doc
 
 %files tkinter
@@ -1057,8 +1047,6 @@ rm -fr %{buildroot}
 %{dynload_dir}/_ctypes_test.%{SOABI_optimized}.so
 %{dynload_dir}/_testcapi.%{SOABI_optimized}.so
 %{pylibdir}/lib2to3/tests
-%doc %{pylibdir}/Demo/distutils
-%doc %{pylibdir}/Demo/md5test
 %{pylibdir}/tkinter/test
 %{pylibdir}/unittest/test
 
@@ -1179,6 +1167,14 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Jan 17 2011 David Malcolm <dmalcolm@redhat.com> - 3.2-0.9.rc1
+- 3.2rc1
+- rework patch 6 (static lib removal)
+- remove upstreamed patch 130 (ppc debug build)
+- regenerate patch 300 (autotool intermediates)
+- updated packaging to reflect upstream rewrite of "Demo" (issue 7962)
+- added libpython3.so and 2to3-3.2
+
 * Wed Jan  5 2011 David Malcolm <dmalcolm@redhat.com> - 3.2-0.8.b2
 - set EXTRA_CFLAGS to our CFLAGS, rather than overriding OPT, fixing a linker
 error with dynamic annotations (when configured using --with-valgrind)
diff --git a/sources b/sources
index 812bc20..470bbec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b371e1f7a0e98e7a0d1792823fd0f58c  Python-3.2a1.tar.bz2
-45ab5ff5edfb73ec277b1c763f3d5a42  Python-3.2b2.tar.bz2
+057cb4b2ba64e166cb0a3342bec9125e  Python-3.2rc1.tar.bz2