From 3f75b3e8930d76d07e281739c07cdc362ce320de Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Feb 14 2011 18:55:48 +0000 Subject: 3.2rc3 --- diff --git a/autotool-intermediates.patch b/autotool-intermediates.patch index fa49d8b..c0fb3e3 100644 --- a/autotool-intermediates.patch +++ b/autotool-intermediates.patch @@ -1,14 +1,100 @@ diff -up ./configure.autotool-intermediates ./configure ---- ./configure.autotool-intermediates 2011-01-17 13:09:50.836697224 -0500 -+++ ./configure 2011-01-17 13:09:56.662690482 -0500 -@@ -1,5 +1,5 @@ +--- ./configure.autotool-intermediates 2011-02-14 12:00:34.929870493 -0500 ++++ ./configure 2011-02-14 12:00:40.794102692 -0500 +@@ -1,14 +1,14 @@ #! /bin/sh --# From configure.in Revision: 87646 . -+# From configure.in Revision: 87698 . +-# From configure.in Revision: 87698 . ++# From configure.in Revision: 88350 . # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.65 for python 3.2. +-# Generated by GNU Autoconf 2.68 for python 3.2. ++# Generated by GNU Autoconf 2.65 for python 3.2. # -@@ -611,6 +611,8 @@ TRUE + # Report bugs to . + # + # + # 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 +@@ -92,7 +92,6 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -218,18 +217,11 @@ IFS=$as_save_IFS + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. +- # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL +- case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +- esac +- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + + if test x$as_have_required = xno; then : +@@ -328,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 +@@ -368,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 + +@@ -542,7 +534,7 @@ test -n "$DJDIR" || exec 7<&0 &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` + +@@ -619,6 +611,8 @@ TRUE MACHDEP_OBJS DYNLOADFILE DLINCLDIR @@ -17,7 +103,7 @@ diff -up ./configure.autotool-intermediates ./configure THREADOBJ LDLAST USE_THREAD_MODULE -@@ -749,8 +751,11 @@ with_thread +@@ -757,8 +751,11 @@ with_thread enable_ipv6 with_doc_strings with_tsc @@ -29,7 +115,155 @@ diff -up ./configure.autotool-intermediates ./configure with_fpectl with_libm with_libc -@@ -1421,8 +1426,11 @@ Optional Packages: +@@ -837,9 +834,8 @@ do + fi + + case $ac_option in +- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *=) ac_optarg= ;; +- *) ac_optarg=yes ;; ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -884,7 +880,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 +@@ -910,7 +906,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 +@@ -1114,7 +1110,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 +@@ -1130,7 +1126,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 +@@ -1160,8 +1156,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." + ;; + + *=*) +@@ -1169,7 +1165,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 ;; +@@ -1179,7 +1175,7 @@ Try \`$0 --help' for more information" + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac +@@ -1187,13 +1183,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 +@@ -1216,7 +1212,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' +@@ -1230,8 +1226,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 +@@ -1246,9 +1242,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. +@@ -1287,11 +1283,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 +@@ -1331,7 +1327,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 +@@ -1430,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 @@ -41,7 +275,1747 @@ diff -up ./configure.autotool-intermediates ./configure --with-fpectl enable SIGFPE catching --with-libm=STRING math library --with-libc=STRING C library -@@ -9138,6 +9146,50 @@ $as_echo "no" >&6; } +@@ -1517,9 +1516,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.68 ++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 +@@ -1563,7 +1562,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile +@@ -1589,7 +1588,7 @@ $as_echo "$ac_try_echo"; } >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } > conftest.i && { ++ test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1600,7 +1599,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp +@@ -1613,10 +1612,10 @@ fi + ac_fn_c_check_header_mongrel () + { + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if eval \${$3+:} false; then : ++ if { 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 \${$3+:} false; then : ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + fi + eval ac_res=\$$3 +@@ -1652,7 +1651,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.i conftest.$ac_ext ++rm -f conftest.err conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -1675,15 +1674,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 \${$3+:} false; then : ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=\$ac_header_compiler" +@@ -1692,7 +1693,7 @@ eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_header_mongrel + +@@ -1733,7 +1734,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=$ac_status + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_run +@@ -1747,7 +1748,7 @@ ac_fn_c_check_header_compile () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -1765,7 +1766,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_header_compile + +@@ -1810,7 +1811,7 @@ fi + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_try_link +@@ -1824,7 +1825,7 @@ ac_fn_c_check_type () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -1865,7 +1866,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_type + +@@ -1878,7 +1879,7 @@ ac_fn_c_find_uintX_t () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 + $as_echo_n "checking for uint$2_t... " >&6; } +-if eval \${$3+:} false; then : ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -1908,7 +1909,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 +@@ -1918,7 +1920,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_find_uintX_t + +@@ -1931,7 +1933,7 @@ ac_fn_c_find_intX_t () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 + $as_echo_n "checking for int$2_t... " >&6; } +-if eval \${$3+:} false; then : ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + eval "$3=no" +@@ -1942,11 +1944,11 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default +- enum { N = $2 / 2 - 1 }; + int + main () + { +-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; ++static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; ++ 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; + test_array [0] = 0 + + ; +@@ -1957,11 +1959,11 @@ if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default +- enum { N = $2 / 2 - 1 }; + int + main () + { +-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 + +@@ -1982,7 +1984,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 +@@ -1992,7 +1995,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_find_intX_t + +@@ -2169,7 +2172,7 @@ rm -f core *.core core.conftest.* gmon.o + rm -f conftest.val + + fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int +@@ -2182,7 +2185,7 @@ ac_fn_c_check_func () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 + $as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2237,7 +2240,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_func + +@@ -2250,7 +2253,7 @@ ac_fn_c_check_member () + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 + $as_echo_n "checking for $2.$3... " >&6; } +-if eval \${$4+:} false; then : ++if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -2294,22 +2297,19 @@ fi + eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_member + +-# 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 \${$3+:} false; 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 +@@ -2318,12 +2318,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 + + ; +@@ -2340,7 +2336,7 @@ fi + eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_decl + cat >config.log <<_ACEOF +@@ -2348,7 +2344,7 @@ This file contains any messages produced + running configure, to aid debugging if configure makes a mistake. + + It was created by python $as_me 3.2, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ + +@@ -2458,9 +2454,11 @@ trap 'exit_status=$? + { + echo + +- $as_echo "## ---------------- ## ++ cat <<\_ASBOX ++## ---------------- ## + ## Cache variables. ## +-## ---------------- ##" ++## ---------------- ## ++_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -2494,9 +2492,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 +@@ -2509,9 +2509,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 +@@ -2525,9 +2527,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 +@@ -2582,12 +2586,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 +@@ -2602,11 +2601,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 + +@@ -2682,7 +2677,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. ## +@@ -2783,7 +2778,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 +@@ -3175,7 +3170,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 + +@@ -3195,7 +3190,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3235,7 +3230,7 @@ if test -z "$ac_cv_prog_CC"; then + set dummy gcc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3288,7 +3283,7 @@ if test -z "$CC"; then + set dummy ${ac_tool_prefix}cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3328,7 +3323,7 @@ if test -z "$CC"; then + set dummy cc; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3387,7 +3382,7 @@ if test -z "$CC"; then + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3431,7 +3426,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3485,8 +3480,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 +@@ -3600,8 +3595,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; } +@@ -3643,8 +3639,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 +@@ -3701,9 +3697,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 +@@ -3714,7 +3710,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex + ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if ${ac_cv_objext+:} false; then : ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3754,8 +3750,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 +@@ -3765,7 +3761,7 @@ OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if ${ac_cv_c_compiler_gnu+:} false; then : ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -3802,7 +3798,7 @@ ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if ${ac_cv_prog_cc_g+:} false; then : ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag +@@ -3880,7 +3876,7 @@ else + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if ${ac_cv_prog_cc_c89+:} false; then : ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no +@@ -4015,7 +4011,7 @@ then + set dummy g++; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_CXX+:} false; then : ++if test "${ac_cv_path_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $CXX in +@@ -4056,7 +4052,7 @@ fi + set dummy c++; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_CXX+:} false; then : ++if test "${ac_cv_path_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $CXX in +@@ -4107,7 +4103,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CXX+:} false; then : ++if test "${ac_cv_prog_CXX+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CXX"; then +@@ -4178,7 +4174,7 @@ if test -n "$CPP" && test -d "$CPP"; the + CPP= + fi + if test -z "$CPP"; then +- if ${ac_cv_prog_CPP+:} false; then : ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -4208,7 +4204,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.i conftest.$ac_ext ++rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4224,11 +4220,11 @@ else + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.i conftest.$ac_ext ++rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -4267,7 +4263,7 @@ else + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.i conftest.$ac_ext ++rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -4283,18 +4279,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 +@@ -4306,7 +4302,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if ${ac_cv_path_GREP+:} false; then : ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -4355,7 +4351,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 +@@ -4369,7 +4365,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if ${ac_cv_path_EGREP+:} false; then : ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -4421,7 +4417,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 +@@ -4436,7 +4432,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4553,7 +4549,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 +@@ -4565,7 +4562,7 @@ done + + + ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +-if test "x$ac_cv_header_minix_config_h" = xyes; then : ++if test "x$ac_cv_header_minix_config_h" = x""yes; then : + MINIX=yes + else + MINIX= +@@ -4587,7 +4584,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 + $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +-if ${ac_cv_safe_to_define___extensions__+:} false; then : ++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4780,7 +4777,7 @@ $as_echo "$GNULD" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 + $as_echo_n "checking for inline... " >&6; } +-if ${ac_cv_c_inline+:} false; then : ++if test "${ac_cv_c_inline+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_c_inline=no +@@ -4981,7 +4978,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_RANLIB+:} false; then : ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -5021,7 +5018,7 @@ if test -z "$ac_cv_prog_RANLIB"; then + set dummy ranlib; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -5075,7 +5072,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_AR+:} false; then : ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -5125,7 +5122,7 @@ fi + set dummy svnversion; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_SVNVERSION+:} false; then : ++if test "${ac_cv_prog_SVNVERSION+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$SVNVERSION"; then +@@ -5176,22 +5173,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, +@@ -5220,7 +5211,7 @@ ac_configure="$SHELL $ac_aux_dir/configu + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if ${ac_cv_path_install+:} false; then : ++if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -5406,7 +5397,7 @@ $as_echo_n "checking whether $CC accepts + ac_save_cc="$CC" + CC="$CC -fno-strict-aliasing" + save_CFLAGS="$CFLAGS" +- if ${ac_cv_no_strict_aliasing+:} false; then : ++ if test "${ac_cv_no_strict_aliasing+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5529,7 +5520,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 + +@@ -5662,7 +5653,7 @@ fi + # options before we can check whether -Kpthread improves anything. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads are available without options" >&5 + $as_echo_n "checking whether pthreads are available without options... " >&6; } +-if ${ac_cv_pthread_is_default+:} false; then : ++if test "${ac_cv_pthread_is_default+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -5715,7 +5706,7 @@ else + # function available. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kpthread" >&5 + $as_echo_n "checking whether $CC accepts -Kpthread... " >&6; } +-if ${ac_cv_kpthread+:} false; then : ++if test "${ac_cv_kpthread+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cc="$CC" +@@ -5764,7 +5755,7 @@ then + # function available. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kthread" >&5 + $as_echo_n "checking whether $CC accepts -Kthread... " >&6; } +-if ${ac_cv_kthread+:} false; then : ++if test "${ac_cv_kthread+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cc="$CC" +@@ -5813,7 +5804,7 @@ then + # function available. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5 + $as_echo_n "checking whether $CC accepts -pthread... " >&6; } +-if ${ac_cv_thread+:} false; then : ++if test "${ac_cv_thread+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_cc="$CC" +@@ -5898,7 +5889,7 @@ CXX="$ac_save_cxx" + # checks for header files + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -6023,7 +6014,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 +@@ -6037,7 +6029,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/di + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 + $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +-if eval \${$as_ac_Header+:} false; then : ++if { 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 +@@ -6064,7 +6056,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 +@@ -6077,7 +6070,7 @@ done + if test $ac_header_dirent = dirent.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 + $as_echo_n "checking for library containing opendir... " >&6; } +-if ${ac_cv_search_opendir+:} false; then : ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +@@ -6111,11 +6104,11 @@ for ac_lib in '' dir; do + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext +- if ${ac_cv_search_opendir+:} false; then : ++ if test "${ac_cv_search_opendir+set}" = set; then : + break + fi + done +-if ${ac_cv_search_opendir+:} false; then : ++if test "${ac_cv_search_opendir+set}" = set; then : + + else + ac_cv_search_opendir=no +@@ -6134,7 +6127,7 @@ fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 + $as_echo_n "checking for library containing opendir... " >&6; } +-if ${ac_cv_search_opendir+:} false; then : ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +@@ -6168,11 +6161,11 @@ for ac_lib in '' x; do + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext +- if ${ac_cv_search_opendir+:} false; then : ++ if test "${ac_cv_search_opendir+set}" = set; then : + break + fi + done +-if ${ac_cv_search_opendir+:} false; then : ++if test "${ac_cv_search_opendir+set}" = set; then : + + else + ac_cv_search_opendir=no +@@ -6192,7 +6185,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 + $as_echo_n "checking whether sys/types.h defines makedev... " >&6; } +-if ${ac_cv_header_sys_types_h_makedev+:} false; then : ++if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -6220,7 +6213,7 @@ $as_echo "$ac_cv_header_sys_types_h_make + + if test $ac_cv_header_sys_types_h_makedev = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : ++if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then : + + $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h + +@@ -6230,7 +6223,7 @@ fi + + if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : ++if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then : + + $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h + +@@ -6250,7 +6243,7 @@ do : + #endif + + " +-if test "x$ac_cv_header_term_h" = xyes; then : ++if test "x$ac_cv_header_term_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_TERM_H 1 + _ACEOF +@@ -6272,7 +6265,7 @@ do : + #endif + + " +-if test "x$ac_cv_header_linux_netlink_h" = xyes; then : ++if test "x$ac_cv_header_linux_netlink_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LINUX_NETLINK_H 1 + _ACEOF +@@ -6431,7 +6424,7 @@ EOF + + # Type availability checks + ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +-if test "x$ac_cv_type_mode_t" = xyes; then : ++if test "x$ac_cv_type_mode_t" = x""yes; then : + + else + +@@ -6442,7 +6435,7 @@ _ACEOF + fi + + ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +-if test "x$ac_cv_type_off_t" = xyes; then : ++if test "x$ac_cv_type_off_t" = x""yes; then : + + else + +@@ -6453,7 +6446,7 @@ _ACEOF + fi + + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +-if test "x$ac_cv_type_pid_t" = xyes; then : ++if test "x$ac_cv_type_pid_t" = x""yes; then : + + else + +@@ -6469,7 +6462,7 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +-if test "x$ac_cv_type_size_t" = xyes; then : ++if test "x$ac_cv_type_size_t" = x""yes; then : + + else + +@@ -6481,7 +6474,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 + $as_echo_n "checking for uid_t in sys/types.h... " >&6; } +-if ${ac_cv_type_uid_t+:} false; then : ++if test "${ac_cv_type_uid_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -6560,7 +6553,7 @@ _ACEOF + esac + + ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" +-if test "x$ac_cv_type_ssize_t" = xyes; then : ++if test "x$ac_cv_type_ssize_t" = x""yes; then : + + $as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h + +@@ -6575,7 +6568,7 @@ fi + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 + $as_echo_n "checking size of int... " >&6; } +-if ${ac_cv_sizeof_int+:} false; then : ++if test "${ac_cv_sizeof_int+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : +@@ -6584,8 +6577,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 +@@ -6608,7 +6602,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 + $as_echo_n "checking size of long... " >&6; } +-if ${ac_cv_sizeof_long+:} false; then : ++if test "${ac_cv_sizeof_long+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : +@@ -6617,8 +6611,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 +@@ -6641,7 +6636,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 + $as_echo_n "checking size of void *... " >&6; } +-if ${ac_cv_sizeof_void_p+:} false; then : ++if test "${ac_cv_sizeof_void_p+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : +@@ -6650,8 +6645,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 +@@ -6674,7 +6670,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 + $as_echo_n "checking size of short... " >&6; } +-if ${ac_cv_sizeof_short+:} false; then : ++if test "${ac_cv_sizeof_short+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : +@@ -6683,8 +6679,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 +@@ -6707,7 +6704,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 + $as_echo_n "checking size of float... " >&6; } +-if ${ac_cv_sizeof_float+:} false; then : ++if test "${ac_cv_sizeof_float+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then : +@@ -6716,8 +6713,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 +@@ -6740,7 +6738,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 + $as_echo_n "checking size of double... " >&6; } +-if ${ac_cv_sizeof_double+:} false; then : ++if test "${ac_cv_sizeof_double+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : +@@ -6749,8 +6747,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 +@@ -6773,7 +6772,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of fpos_t" >&5 + $as_echo_n "checking size of fpos_t... " >&6; } +-if ${ac_cv_sizeof_fpos_t+:} false; then : ++if test "${ac_cv_sizeof_fpos_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fpos_t))" "ac_cv_sizeof_fpos_t" "$ac_includes_default"; then : +@@ -6782,8 +6781,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 +@@ -6806,7 +6806,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 + $as_echo_n "checking size of size_t... " >&6; } +-if ${ac_cv_sizeof_size_t+:} false; then : ++if test "${ac_cv_sizeof_size_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : +@@ -6815,8 +6815,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 +@@ -6839,7 +6840,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 + $as_echo_n "checking size of pid_t... " >&6; } +-if ${ac_cv_sizeof_pid_t+:} false; then : ++if test "${ac_cv_sizeof_pid_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then : +@@ -6848,8 +6849,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 +@@ -6899,7 +6901,7 @@ if test "$have_long_long" = yes ; then + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 + $as_echo_n "checking size of long long... " >&6; } +-if ${ac_cv_sizeof_long_long+:} false; then : ++if test "${ac_cv_sizeof_long_long+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : +@@ -6908,8 +6910,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 +@@ -6960,7 +6963,7 @@ if test "$have_long_double" = yes ; then + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5 + $as_echo_n "checking size of long double... " >&6; } +-if ${ac_cv_sizeof_long_double+:} false; then : ++if test "${ac_cv_sizeof_long_double+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then : +@@ -6969,8 +6972,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 +@@ -7022,7 +7026,7 @@ if test "$have_c99_bool" = yes ; then + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5 + $as_echo_n "checking size of _Bool... " >&6; } +-if ${ac_cv_sizeof__Bool+:} false; then : ++if test "${ac_cv_sizeof__Bool+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool" "$ac_includes_default"; then : +@@ -7031,8 +7035,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 +@@ -7058,7 +7063,7 @@ ac_fn_c_check_type "$LINENO" "uintptr_t" + #include + #endif + " +-if test "x$ac_cv_type_uintptr_t" = xyes; then : ++if test "x$ac_cv_type_uintptr_t" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_UINTPTR_T 1 +@@ -7070,7 +7075,7 @@ _ACEOF + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5 + $as_echo_n "checking size of uintptr_t... " >&6; } +-if ${ac_cv_sizeof_uintptr_t+:} false; then : ++if test "${ac_cv_sizeof_uintptr_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t" "$ac_includes_default"; then : +@@ -7079,8 +7084,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 +@@ -7106,7 +7112,7 @@ fi + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 + $as_echo_n "checking size of off_t... " >&6; } +-if ${ac_cv_sizeof_off_t+:} false; then : ++if test "${ac_cv_sizeof_off_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" " +@@ -7120,8 +7126,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 +@@ -7165,7 +7172,7 @@ fi + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 + $as_echo_n "checking size of time_t... " >&6; } +-if ${ac_cv_sizeof_time_t+:} false; then : ++if test "${ac_cv_sizeof_time_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" " +@@ -7182,8 +7189,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 +@@ -7240,7 +7248,7 @@ if test "$have_pthread_t" = yes ; then + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_t" >&5 + $as_echo_n "checking size of pthread_t... " >&6; } +-if ${ac_cv_sizeof_pthread_t+:} false; then : ++if test "${ac_cv_sizeof_pthread_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_t))" "ac_cv_sizeof_pthread_t" " +@@ -7254,8 +7262,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 +@@ -7342,7 +7351,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 +@@ -7354,7 +7363,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 + +@@ -7380,7 +7389,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 +@@ -7687,7 +7696,7 @@ $as_echo "$SHLIBS" >&6; } + # checks for libraries + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if ${ac_cv_lib_dl_dlopen+:} false; then : ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7721,7 +7730,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = xyes; then : ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBDL 1 + _ACEOF +@@ -7732,7 +7741,7 @@ fi + # Dynamic linking for SunOS/Solaris and SYSV + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 + $as_echo_n "checking for shl_load in -ldld... " >&6; } +-if ${ac_cv_lib_dld_shl_load+:} false; then : ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7766,7 +7775,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = xyes; then : ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBDLD 1 + _ACEOF +@@ -7780,7 +7789,7 @@ fi + if test "$with_threads" = "yes" -o -z "$with_threads"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5 + $as_echo_n "checking for library containing sem_init... " >&6; } +-if ${ac_cv_search_sem_init+:} false; then : ++if test "${ac_cv_search_sem_init+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS +@@ -7814,11 +7823,11 @@ for ac_lib in '' pthread rt posix4; do + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext +- if ${ac_cv_search_sem_init+:} false; then : ++ if test "${ac_cv_search_sem_init+set}" = set; then : + break + fi + done +-if ${ac_cv_search_sem_init+:} false; then : ++if test "${ac_cv_search_sem_init+set}" = set; then : + + else + ac_cv_search_sem_init=no +@@ -7841,7 +7850,7 @@ fi + # check if we need libintl for locale functions + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for textdomain in -lintl" >&5 + $as_echo_n "checking for textdomain in -lintl... " >&6; } +-if ${ac_cv_lib_intl_textdomain+:} false; then : ++if test "${ac_cv_lib_intl_textdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7875,7 +7884,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_textdomain" >&5 + $as_echo "$ac_cv_lib_intl_textdomain" >&6; } +-if test "x$ac_cv_lib_intl_textdomain" = xyes; then : ++if test "x$ac_cv_lib_intl_textdomain" = x""yes; then : + + $as_echo "#define WITH_LIBINTL 1" >>confdefs.h + +@@ -7922,7 +7931,7 @@ esac + # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5 + $as_echo_n "checking for t_open in -lnsl... " >&6; } +-if ${ac_cv_lib_nsl_t_open+:} false; then : ++if test "${ac_cv_lib_nsl_t_open+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7956,13 +7965,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_t_open" >&5 + $as_echo "$ac_cv_lib_nsl_t_open" >&6; } +-if test "x$ac_cv_lib_nsl_t_open" = xyes; then : ++if test "x$ac_cv_lib_nsl_t_open" = x""yes; then : + LIBS="-lnsl $LIBS" + fi + # SVR4 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 + $as_echo_n "checking for socket in -lsocket... " >&6; } +-if ${ac_cv_lib_socket_socket+:} false; then : ++if test "${ac_cv_lib_socket_socket+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -7996,7 +8005,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 + $as_echo "$ac_cv_lib_socket_socket" >&6; } +-if test "x$ac_cv_lib_socket_socket" = xyes; then : ++if test "x$ac_cv_lib_socket_socket" = x""yes; then : + LIBS="-lsocket $LIBS" + fi + # SVR4 sockets +@@ -8022,7 +8031,7 @@ if test -n "$ac_tool_prefix"; then + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PKG_CONFIG+:} false; then : ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $PKG_CONFIG in +@@ -8065,7 +8074,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the + set dummy pkg-config; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $ac_pt_PKG_CONFIG in +@@ -8176,12 +8185,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 +@@ -8347,7 +8356,7 @@ $as_echo "$unistd_defines_pthreads" >&6; + $as_echo "#define _REENTRANT 1" >>confdefs.h + + ac_fn_c_check_header_mongrel "$LINENO" "cthreads.h" "ac_cv_header_cthreads_h" "$ac_includes_default" +-if test "x$ac_cv_header_cthreads_h" = xyes; then : ++if test "x$ac_cv_header_cthreads_h" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + $as_echo "#define C_THREADS 1" >>confdefs.h +@@ -8360,7 +8369,7 @@ $as_echo "#define HURD_C_THREADS 1" >>co + else + + ac_fn_c_check_header_mongrel "$LINENO" "mach/cthreads.h" "ac_cv_header_mach_cthreads_h" "$ac_includes_default" +-if test "x$ac_cv_header_mach_cthreads_h" = xyes; then : ++if test "x$ac_cv_header_mach_cthreads_h" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + $as_echo "#define C_THREADS 1" >>confdefs.h +@@ -8404,7 +8413,7 @@ else + + LIBS=$_libs + ac_fn_c_check_func "$LINENO" "pthread_detach" "ac_cv_func_pthread_detach" +-if test "x$ac_cv_func_pthread_detach" = xyes; then : ++if test "x$ac_cv_func_pthread_detach" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + posix_threads=yes +@@ -8413,7 +8422,7 @@ else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5 + $as_echo_n "checking for pthread_create in -lpthreads... " >&6; } +-if ${ac_cv_lib_pthreads_pthread_create+:} false; then : ++if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8447,7 +8456,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5 + $as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; } +-if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then : ++if test "x$ac_cv_lib_pthreads_pthread_create" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + posix_threads=yes +@@ -8457,7 +8466,7 @@ else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 + $as_echo_n "checking for pthread_create in -lc_r... " >&6; } +-if ${ac_cv_lib_c_r_pthread_create+:} false; then : ++if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8491,7 +8500,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5 + $as_echo "$ac_cv_lib_c_r_pthread_create" >&6; } +-if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then : ++if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + posix_threads=yes +@@ -8501,7 +8510,7 @@ else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_create_system in -lpthread" >&5 + $as_echo_n "checking for __pthread_create_system in -lpthread... " >&6; } +-if ${ac_cv_lib_pthread___pthread_create_system+:} false; then : ++if test "${ac_cv_lib_pthread___pthread_create_system+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8535,7 +8544,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_create_system" >&5 + $as_echo "$ac_cv_lib_pthread___pthread_create_system" >&6; } +-if test "x$ac_cv_lib_pthread___pthread_create_system" = xyes; then : ++if test "x$ac_cv_lib_pthread___pthread_create_system" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + posix_threads=yes +@@ -8545,7 +8554,7 @@ else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lcma" >&5 + $as_echo_n "checking for pthread_create in -lcma... " >&6; } +-if ${ac_cv_lib_cma_pthread_create+:} false; then : ++if test "${ac_cv_lib_cma_pthread_create+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8579,7 +8588,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5 + $as_echo "$ac_cv_lib_cma_pthread_create" >&6; } +-if test "x$ac_cv_lib_cma_pthread_create" = xyes; then : ++if test "x$ac_cv_lib_cma_pthread_create" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + posix_threads=yes +@@ -8611,7 +8620,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5 + $as_echo_n "checking for usconfig in -lmpc... " >&6; } +-if ${ac_cv_lib_mpc_usconfig+:} false; then : ++if test "${ac_cv_lib_mpc_usconfig+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8645,7 +8654,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpc_usconfig" >&5 + $as_echo "$ac_cv_lib_mpc_usconfig" >&6; } +-if test "x$ac_cv_lib_mpc_usconfig" = xyes; then : ++if test "x$ac_cv_lib_mpc_usconfig" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + LIBS="$LIBS -lmpc" +@@ -8657,7 +8666,7 @@ fi + if test "$posix_threads" != "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thr_create in -lthread" >&5 + $as_echo_n "checking for thr_create in -lthread... " >&6; } +-if ${ac_cv_lib_thread_thr_create+:} false; then : ++if test "${ac_cv_lib_thread_thr_create+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -8691,7 +8700,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_thread_thr_create" >&5 + $as_echo "$ac_cv_lib_thread_thr_create" >&6; } +-if test "x$ac_cv_lib_thread_thr_create" = xyes; then : ++if test "x$ac_cv_lib_thread_thr_create" = x""yes; then : + $as_echo "#define WITH_THREAD 1" >>confdefs.h + + LIBS="$LIBS -lthread" +@@ -8740,7 +8749,7 @@ $as_echo "#define HAVE_BROKEN_POSIX_SEMA + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5 + $as_echo_n "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; } +- if ${ac_cv_pthread_system_supported+:} false; then : ++ if test "${ac_cv_pthread_system_supported+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -8783,7 +8792,7 @@ $as_echo "#define PTHREAD_SYSTEM_SCHED_S + for ac_func in pthread_sigmask + do : + ac_fn_c_check_func "$LINENO" "pthread_sigmask" "ac_cv_func_pthread_sigmask" +-if test "x$ac_cv_func_pthread_sigmask" = xyes; then : ++if test "x$ac_cv_func_pthread_sigmask" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_PTHREAD_SIGMASK 1 + _ACEOF +@@ -9136,6 +9145,50 @@ $as_echo "no" >&6; } fi @@ -92,7 +2066,22 @@ 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; } -@@ -9190,6 +9242,46 @@ fi +@@ -9175,12 +9228,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" +-if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then : ++if test "x$ac_cv_header_valgrind_valgrind_h" = x""yes; then : + + $as_echo "#define WITH_VALGRIND 1" >>confdefs.h + + 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 + +@@ -9188,6 +9241,46 @@ fi OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" fi @@ -139,20 +2128,1441 @@ diff -up ./configure.autotool-intermediates ./configure # -I${DLINCLDIR} is added to the compile rule for importdl.o DLINCLDIR=. -@@ -14304,8 +14396,8 @@ esac +@@ -9197,7 +9290,7 @@ DLINCLDIR=. + for ac_func in dlopen + do : + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +-if test "x$ac_cv_func_dlopen" = xyes; then : ++if test "x$ac_cv_func_dlopen" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_DLOPEN 1 + _ACEOF +@@ -9274,7 +9367,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 +@@ -9524,7 +9618,7 @@ rm -f core conftest.err conftest.$ac_obj + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock declaration" >&5 + $as_echo_n "checking for flock declaration... " >&6; } +-if ${ac_cv_flock_decl+:} false; then : ++if test "${ac_cv_flock_decl+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -9554,7 +9648,7 @@ if test "x${ac_cv_flock_decl}" = xyes; t + for ac_func in flock + do : + ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock" +-if test "x$ac_cv_func_flock" = xyes; then : ++if test "x$ac_cv_func_flock" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_FLOCK 1 + _ACEOF +@@ -9562,7 +9656,7 @@ _ACEOF + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5 + $as_echo_n "checking for flock in -lbsd... " >&6; } +-if ${ac_cv_lib_bsd_flock+:} false; then : ++if test "${ac_cv_lib_bsd_flock+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -9596,7 +9690,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5 + $as_echo "$ac_cv_lib_bsd_flock" >&6; } +-if test "x$ac_cv_lib_bsd_flock" = xyes; then : ++if test "x$ac_cv_lib_bsd_flock" = x""yes; then : + $as_echo "#define HAVE_FLOCK 1" >>confdefs.h + + +@@ -9645,7 +9739,7 @@ do + set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_TRUE+:} false; then : ++if test "${ac_cv_prog_TRUE+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$TRUE"; then +@@ -9685,7 +9779,7 @@ test -n "$TRUE" || TRUE="/bin/true" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lc" >&5 + $as_echo_n "checking for inet_aton in -lc... " >&6; } +-if ${ac_cv_lib_c_inet_aton+:} false; then : ++if test "${ac_cv_lib_c_inet_aton+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -9719,12 +9813,12 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inet_aton" >&5 + $as_echo "$ac_cv_lib_c_inet_aton" >&6; } +-if test "x$ac_cv_lib_c_inet_aton" = xyes; then : ++if test "x$ac_cv_lib_c_inet_aton" = x""yes; then : + $ac_cv_prog_TRUE + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5 + $as_echo_n "checking for inet_aton in -lresolv... " >&6; } +-if ${ac_cv_lib_resolv_inet_aton+:} false; then : ++if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -9758,7 +9852,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5 + $as_echo "$ac_cv_lib_resolv_inet_aton" >&6; } +-if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then : ++if test "x$ac_cv_lib_resolv_inet_aton" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBRESOLV 1 + _ACEOF +@@ -9775,7 +9869,7 @@ fi + # exit Python + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5 + $as_echo_n "checking for chflags... " >&6; } +-if ${ac_cv_have_chflags+:} false; then : ++if test "${ac_cv_have_chflags+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -9809,7 +9903,7 @@ fi + $as_echo "$ac_cv_have_chflags" >&6; } + if test "$ac_cv_have_chflags" = cross ; then + ac_fn_c_check_func "$LINENO" "chflags" "ac_cv_func_chflags" +-if test "x$ac_cv_func_chflags" = xyes; then : ++if test "x$ac_cv_func_chflags" = x""yes; then : + ac_cv_have_chflags="yes" + else + ac_cv_have_chflags="no" +@@ -9824,7 +9918,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5 + $as_echo_n "checking for lchflags... " >&6; } +-if ${ac_cv_have_lchflags+:} false; then : ++if test "${ac_cv_have_lchflags+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -9858,7 +9952,7 @@ fi + $as_echo "$ac_cv_have_lchflags" >&6; } + if test "$ac_cv_have_lchflags" = cross ; then + ac_fn_c_check_func "$LINENO" "lchflags" "ac_cv_func_lchflags" +-if test "x$ac_cv_func_lchflags" = xyes; then : ++if test "x$ac_cv_func_lchflags" = x""yes; then : + ac_cv_have_lchflags="yes" + else + ac_cv_have_lchflags="no" +@@ -9882,7 +9976,7 @@ esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 + $as_echo_n "checking for inflateCopy in -lz... " >&6; } +-if ${ac_cv_lib_z_inflateCopy+:} false; then : ++if test "${ac_cv_lib_z_inflateCopy+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -9916,7 +10010,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5 + $as_echo "$ac_cv_lib_z_inflateCopy" >&6; } +-if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : ++if test "x$ac_cv_lib_z_inflateCopy" = x""yes; then : + + $as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h + +@@ -10059,7 +10153,7 @@ rm -f core conftest.err conftest.$ac_obj + for ac_func in openpty + do : + ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty" +-if test "x$ac_cv_func_openpty" = xyes; then : ++if test "x$ac_cv_func_openpty" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_OPENPTY 1 + _ACEOF +@@ -10067,7 +10161,7 @@ _ACEOF + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5 + $as_echo_n "checking for openpty in -lutil... " >&6; } +-if ${ac_cv_lib_util_openpty+:} false; then : ++if test "${ac_cv_lib_util_openpty+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10101,13 +10195,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5 + $as_echo "$ac_cv_lib_util_openpty" >&6; } +-if test "x$ac_cv_lib_util_openpty" = xyes; then : ++if test "x$ac_cv_lib_util_openpty" = x""yes; then : + $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h + LIBS="$LIBS -lutil" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5 + $as_echo_n "checking for openpty in -lbsd... " >&6; } +-if ${ac_cv_lib_bsd_openpty+:} false; then : ++if test "${ac_cv_lib_bsd_openpty+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10141,7 +10235,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5 + $as_echo "$ac_cv_lib_bsd_openpty" >&6; } +-if test "x$ac_cv_lib_bsd_openpty" = xyes; then : ++if test "x$ac_cv_lib_bsd_openpty" = x""yes; then : + $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h + LIBS="$LIBS -lbsd" + fi +@@ -10156,7 +10250,7 @@ done + for ac_func in forkpty + do : + ac_fn_c_check_func "$LINENO" "forkpty" "ac_cv_func_forkpty" +-if test "x$ac_cv_func_forkpty" = xyes; then : ++if test "x$ac_cv_func_forkpty" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_FORKPTY 1 + _ACEOF +@@ -10164,7 +10258,7 @@ _ACEOF + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5 + $as_echo_n "checking for forkpty in -lutil... " >&6; } +-if ${ac_cv_lib_util_forkpty+:} false; then : ++if test "${ac_cv_lib_util_forkpty+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10198,13 +10292,13 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5 + $as_echo "$ac_cv_lib_util_forkpty" >&6; } +-if test "x$ac_cv_lib_util_forkpty" = xyes; then : ++if test "x$ac_cv_lib_util_forkpty" = x""yes; then : + $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h + LIBS="$LIBS -lutil" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lbsd" >&5 + $as_echo_n "checking for forkpty in -lbsd... " >&6; } +-if ${ac_cv_lib_bsd_forkpty+:} false; then : ++if test "${ac_cv_lib_bsd_forkpty+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10238,7 +10332,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_forkpty" >&5 + $as_echo "$ac_cv_lib_bsd_forkpty" >&6; } +-if test "x$ac_cv_lib_bsd_forkpty" = xyes; then : ++if test "x$ac_cv_lib_bsd_forkpty" = x""yes; then : + $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h + LIBS="$LIBS -lbsd" + fi +@@ -10255,7 +10349,7 @@ done + for ac_func in memmove + do : + ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove" +-if test "x$ac_cv_func_memmove" = xyes; then : ++if test "x$ac_cv_func_memmove" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_MEMMOVE 1 + _ACEOF +@@ -10269,7 +10363,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 +@@ -10278,50 +10373,31 @@ fi + done + + +-ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2" +-if test "x$ac_cv_func_dup2" = xyes; 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" = xyes; 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" = xyes; 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 + + else + case " $LIBOBJS " in +- *" strdup.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS strdup.$ac_objext" ++ *" $ac_func.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + ;; + esac + + fi ++done + + + for ac_func in getpgrp + do : + ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp" +-if test "x$ac_cv_func_getpgrp" = xyes; then : ++if test "x$ac_cv_func_getpgrp" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_GETPGRP 1 + _ACEOF +@@ -10349,7 +10425,7 @@ done + for ac_func in setpgrp + do : + ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp" +-if test "x$ac_cv_func_setpgrp" = xyes; then : ++if test "x$ac_cv_func_setpgrp" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SETPGRP 1 + _ACEOF +@@ -10377,7 +10453,7 @@ done + for ac_func in gettimeofday + do : + ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +-if test "x$ac_cv_func_gettimeofday" = xyes; then : ++if test "x$ac_cv_func_gettimeofday" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_GETTIMEOFDAY 1 + _ACEOF +@@ -10479,7 +10555,7 @@ if test $have_getaddrinfo = yes + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking getaddrinfo bug" >&5 + $as_echo_n "checking getaddrinfo bug... " >&6; } +- if ${ac_cv_buggy_getaddrinfo+:} false; then : ++ if test "${ac_cv_buggy_getaddrinfo+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -10608,7 +10684,7 @@ fi + for ac_func in getnameinfo + do : + ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" +-if test "x$ac_cv_func_getnameinfo" = xyes; then : ++if test "x$ac_cv_func_getnameinfo" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_GETNAMEINFO 1 + _ACEOF +@@ -10620,7 +10696,7 @@ done + # checks for structures + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 + $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +-if ${ac_cv_header_time+:} false; then : ++if test "${ac_cv_header_time+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10655,7 +10731,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 + $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +-if ${ac_cv_struct_tm+:} false; then : ++if test "${ac_cv_struct_tm+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10692,7 +10768,7 @@ ac_fn_c_check_member "$LINENO" "struct t + #include <$ac_cv_struct_tm> + + " +-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : ++if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_TM_TM_ZONE 1 +@@ -10708,7 +10784,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf + else + ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include + " +-if test "x$ac_cv_have_decl_tzname" = xyes; then : ++if test "x$ac_cv_have_decl_tzname" = x""yes; then : + ac_have_decl=1 + else + ac_have_decl=0 +@@ -10720,7 +10796,7 @@ _ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 + $as_echo_n "checking for tzname... " >&6; } +-if ${ac_cv_var_tzname+:} false; then : ++if test "${ac_cv_var_tzname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10756,7 +10832,7 @@ $as_echo "#define HAVE_TZNAME 1" >>confd + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then : ++if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_RDEV 1 +@@ -10766,7 +10842,7 @@ _ACEOF + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : ++if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_BLKSIZE 1 +@@ -10776,7 +10852,7 @@ _ACEOF + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_flags" "ac_cv_member_struct_stat_st_flags" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_flags" = xyes; then : ++if test "x$ac_cv_member_struct_stat_st_flags" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_FLAGS 1 +@@ -10786,7 +10862,7 @@ _ACEOF + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_gen" "ac_cv_member_struct_stat_st_gen" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_gen" = xyes; then : ++if test "x$ac_cv_member_struct_stat_st_gen" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_GEN 1 +@@ -10796,7 +10872,7 @@ _ACEOF + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then : ++if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1 +@@ -10806,7 +10882,7 @@ _ACEOF + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : ++if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_BLOCKS 1 +@@ -10828,7 +10904,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 + $as_echo_n "checking for time.h that defines altzone... " >&6; } +-if ${ac_cv_header_time_altzone+:} false; then : ++if test "${ac_cv_header_time_altzone+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -10892,7 +10968,7 @@ $as_echo "$was_it_defined" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for addrinfo" >&5 + $as_echo_n "checking for addrinfo... " >&6; } +-if ${ac_cv_struct_addrinfo+:} false; then : ++if test "${ac_cv_struct_addrinfo+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10924,7 +11000,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5 + $as_echo_n "checking for sockaddr_storage... " >&6; } +-if ${ac_cv_struct_sockaddr_storage+:} false; then : ++if test "${ac_cv_struct_sockaddr_storage+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10960,7 +11036,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 + $as_echo_n "checking whether char is unsigned... " >&6; } +-if ${ac_cv_c_char_unsigned+:} false; then : ++if test "${ac_cv_c_char_unsigned+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10992,7 +11068,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 + $as_echo_n "checking for an ANSI C-conforming const... " >&6; } +-if ${ac_cv_c_const+:} false; then : ++if test "${ac_cv_c_const+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11280,7 +11356,7 @@ $as_echo "$va_list_is_array" >&6; } + + + ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r" +-if test "x$ac_cv_func_gethostbyname_r" = xyes; then : ++if test "x$ac_cv_func_gethostbyname_r" = x""yes; then : + + $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h + +@@ -11411,7 +11487,7 @@ else + for ac_func in gethostbyname + do : + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +-if test "x$ac_cv_func_gethostbyname" = xyes; then : ++if test "x$ac_cv_func_gethostbyname" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_GETHOSTBYNAME 1 + _ACEOF +@@ -11433,12 +11509,12 @@ fi + + # Linux requires this for correct f.p. operations + ac_fn_c_check_func "$LINENO" "__fpu_control" "ac_cv_func___fpu_control" +-if test "x$ac_cv_func___fpu_control" = xyes; then : ++if test "x$ac_cv_func___fpu_control" = x""yes; then : + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpu_control in -lieee" >&5 + $as_echo_n "checking for __fpu_control in -lieee... " >&6; } +-if ${ac_cv_lib_ieee___fpu_control+:} false; then : ++if test "${ac_cv_lib_ieee___fpu_control+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -11472,7 +11548,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee___fpu_control" >&5 + $as_echo "$ac_cv_lib_ieee___fpu_control" >&6; } +-if test "x$ac_cv_lib_ieee___fpu_control" = xyes; then : ++if test "x$ac_cv_lib_ieee___fpu_control" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBIEEE 1 + _ACEOF +@@ -11528,7 +11604,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 +@@ -11552,7 +11628,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 +@@ -11566,7 +11642,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C doubles are little-endian IEEE 754 binary64" >&5 + $as_echo_n "checking whether C doubles are little-endian IEEE 754 binary64... " >&6; } +-if ${ac_cv_little_endian_double+:} false; then : ++if test "${ac_cv_little_endian_double+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -11608,7 +11684,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C doubles are big-endian IEEE 754 binary64" >&5 + $as_echo_n "checking whether C doubles are big-endian IEEE 754 binary64... " >&6; } +-if ${ac_cv_big_endian_double+:} false; then : ++if test "${ac_cv_big_endian_double+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +@@ -11654,7 +11730,7 @@ fi + # conversions work. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C doubles are ARM mixed-endian IEEE 754 binary64" >&5 + $as_echo_n "checking whether C doubles are ARM mixed-endian IEEE 754 binary64... " >&6; } +-if ${ac_cv_mixed_endian_double+:} false; then : ++if test "${ac_cv_mixed_endian_double+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -11802,7 +11878,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 +@@ -11814,7 +11891,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 +@@ -11824,7 +11902,7 @@ done + + ac_fn_c_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include + " +-if test "x$ac_cv_have_decl_isinf" = xyes; then : ++if test "x$ac_cv_have_decl_isinf" = x""yes; then : + ac_have_decl=1 + else + ac_have_decl=0 +@@ -11835,7 +11913,7 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + ac_fn_c_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include + " +-if test "x$ac_cv_have_decl_isnan" = xyes; then : ++if test "x$ac_cv_have_decl_isnan" = x""yes; then : + ac_have_decl=1 + else + ac_have_decl=0 +@@ -11846,7 +11924,7 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + ac_fn_c_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include + " +-if test "x$ac_cv_have_decl_isfinite" = xyes; then : ++if test "x$ac_cv_have_decl_isfinite" = x""yes; then : + ac_have_decl=1 + else + ac_have_decl=0 +@@ -11861,7 +11939,7 @@ _ACEOF + # -0. on some architectures. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tanh preserves the sign of zero" >&5 + $as_echo_n "checking whether tanh preserves the sign of zero... " >&6; } +-if ${ac_cv_tanh_preserves_zero_sign+:} false; then : ++if test "${ac_cv_tanh_preserves_zero_sign+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -11909,7 +11987,7 @@ then + # -0. See issue #9920. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether log1p drops the sign of negative zero" >&5 + $as_echo_n "checking whether log1p drops the sign of negative zero... " >&6; } +- if ${ac_cv_log1p_drops_zero_sign+:} false; then : ++ if test "${ac_cv_log1p_drops_zero_sign+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -11961,7 +12039,7 @@ LIBS=$LIBS_SAVE + # sem_open results in a 'Signal 12' error. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX semaphores are enabled" >&5 + $as_echo_n "checking whether POSIX semaphores are enabled... " >&6; } +-if ${ac_cv_posix_semaphores_enabled+:} false; then : ++if test "${ac_cv_posix_semaphores_enabled+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12012,7 +12090,7 @@ fi + # Multiprocessing check for broken sem_getvalue + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken sem_getvalue" >&5 + $as_echo_n "checking for broken sem_getvalue... " >&6; } +-if ${ac_cv_broken_sem_getvalue+:} false; then : ++if test "${ac_cv_broken_sem_getvalue+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -12077,7 +12155,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; } +@@ -12095,7 +12173,7 @@ fi + + # check for wchar.h + ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" +-if test "x$ac_cv_header_wchar_h" = xyes; then : ++if test "x$ac_cv_header_wchar_h" = x""yes; then : + + + $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h +@@ -12118,7 +12196,7 @@ then + # This bug is HP SR number 8606223364. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 + $as_echo_n "checking size of wchar_t... " >&6; } +-if ${ac_cv_sizeof_wchar_t+:} false; then : ++if test "${ac_cv_sizeof_wchar_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "#include +@@ -12128,8 +12206,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 +@@ -12184,7 +12263,7 @@ then + # check whether wchar_t is signed or not + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5 + $as_echo_n "checking whether wchar_t is signed... " >&6; } +- if ${ac_cv_wchar_t_signed+:} false; then : ++ if test "${ac_cv_wchar_t_signed+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12280,7 +12359,7 @@ $as_echo "$PY_UNICODE_TYPE" >&6; } + # check for endianness + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 + $as_echo_n "checking whether byte ordering is bigendian... " >&6; } +-if ${ac_cv_c_bigendian+:} false; then : ++if test "${ac_cv_c_bigendian+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_c_bigendian=unknown +@@ -12498,7 +12577,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI + + ;; #( + *) +- as_fn_error $? "unknown endianness ++ as_fn_error "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac + +@@ -12571,7 +12650,7 @@ $as_echo "$SO" >&6; } + # or fills with zeros (like the Cray J90, according to Tim Peters). + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5 + $as_echo_n "checking whether right shift extends the sign bit... " >&6; } +-if ${ac_cv_rshift_extends_sign+:} false; then : ++if test "${ac_cv_rshift_extends_sign+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12610,7 +12689,7 @@ fi + # check for getc_unlocked and related locking functions + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getc_unlocked() and friends" >&5 + $as_echo_n "checking for getc_unlocked() and friends... " >&6; } +-if ${ac_cv_have_getc_unlocked+:} false; then : ++if test "${ac_cv_have_getc_unlocked+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12708,7 +12787,7 @@ fi + # check for readline 2.1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5 + $as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; } +-if ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then : ++if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12742,7 +12821,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5 + $as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; } +-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = xyes; then : ++if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then : + + $as_echo "#define HAVE_RL_CALLBACK 1" >>confdefs.h + +@@ -12760,7 +12839,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 +@@ -12794,7 +12873,7 @@ fi + # check for readline 4.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -lreadline" >&5 + $as_echo_n "checking for rl_pre_input_hook in -lreadline... " >&6; } +-if ${ac_cv_lib_readline_rl_pre_input_hook+:} false; then : ++if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12828,7 +12907,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pre_input_hook" >&5 + $as_echo "$ac_cv_lib_readline_rl_pre_input_hook" >&6; } +-if test "x$ac_cv_lib_readline_rl_pre_input_hook" = xyes; then : ++if test "x$ac_cv_lib_readline_rl_pre_input_hook" = x""yes; then : + + $as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h + +@@ -12838,7 +12917,7 @@ fi + # also in 4.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -lreadline" >&5 + $as_echo_n "checking for rl_completion_display_matches_hook in -lreadline... " >&6; } +-if ${ac_cv_lib_readline_rl_completion_display_matches_hook+:} false; then : ++if test "${ac_cv_lib_readline_rl_completion_display_matches_hook+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12872,7 +12951,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_display_matches_hook" >&5 + $as_echo "$ac_cv_lib_readline_rl_completion_display_matches_hook" >&6; } +-if test "x$ac_cv_lib_readline_rl_completion_display_matches_hook" = xyes; then : ++if test "x$ac_cv_lib_readline_rl_completion_display_matches_hook" = x""yes; then : + + $as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h + +@@ -12882,7 +12961,7 @@ fi + # check for readline 4.2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5 + $as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; } +-if ${ac_cv_lib_readline_rl_completion_matches+:} false; then : ++if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -12916,7 +12995,7 @@ LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5 + $as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; } +-if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then : ++if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then : + + $as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h + +@@ -12934,7 +13013,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 +@@ -12957,7 +13036,7 @@ LIBS=$LIBS_no_readline + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5 + $as_echo_n "checking for broken nice()... " >&6; } +-if ${ac_cv_broken_nice+:} false; then : ++if test "${ac_cv_broken_nice+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -12998,7 +13077,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5 + $as_echo_n "checking for broken poll()... " >&6; } +-if ${ac_cv_broken_poll+:} false; then : ++if test "${ac_cv_broken_poll+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -13053,7 +13132,7 @@ ac_fn_c_check_member "$LINENO" "struct t + #include <$ac_cv_struct_tm> + + " +-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : ++if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_TM_TM_ZONE 1 +@@ -13069,7 +13148,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>conf + else + ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include + " +-if test "x$ac_cv_have_decl_tzname" = xyes; then : ++if test "x$ac_cv_have_decl_tzname" = x""yes; then : + ac_have_decl=1 + else + ac_have_decl=0 +@@ -13081,7 +13160,7 @@ _ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 + $as_echo_n "checking for tzname... " >&6; } +-if ${ac_cv_var_tzname+:} false; then : ++if test "${ac_cv_var_tzname+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -13120,7 +13199,7 @@ fi + # check tzset(3) exists and works like we expect it to + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5 + $as_echo_n "checking for working tzset()... " >&6; } +-if ${ac_cv_working_tzset+:} false; then : ++if test "${ac_cv_working_tzset+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -13217,7 +13296,7 @@ fi + # Look for subsecond timestamps in struct stat + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5 + $as_echo_n "checking for tv_nsec in struct stat... " >&6; } +-if ${ac_cv_stat_tv_nsec+:} false; then : ++if test "${ac_cv_stat_tv_nsec+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -13254,7 +13333,7 @@ fi + # Look for BSD style subsecond timestamps in struct stat + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5 + $as_echo_n "checking for tv_nsec2 in struct stat... " >&6; } +-if ${ac_cv_stat_tv_nsec2+:} false; then : ++if test "${ac_cv_stat_tv_nsec2+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -13291,7 +13370,7 @@ fi + # On HP/UX 11.0, mvwdelch is a block with a return statement + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5 + $as_echo_n "checking whether mvwdelch is an expression... " >&6; } +-if ${ac_cv_mvwdelch_is_expression+:} false; then : ++if test "${ac_cv_mvwdelch_is_expression+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -13328,7 +13407,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5 + $as_echo_n "checking whether WINDOW has _flags... " >&6; } +-if ${ac_cv_window_has_flags+:} false; then : ++if test "${ac_cv_window_has_flags+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -13476,7 +13555,7 @@ if test "$have_long_long" = yes + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for %lld and %llu printf() format support" >&5 + $as_echo_n "checking for %lld and %llu printf() format support... " >&6; } +- if ${ac_cv_have_long_long_format+:} false; then : ++ if test "${ac_cv_have_long_long_format+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -13546,7 +13625,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5 + $as_echo_n "checking for %zd printf() format support... " >&6; } +-if ${ac_cv_have_size_t_format+:} false; then : ++if test "${ac_cv_have_size_t_format+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -13619,7 +13698,7 @@ ac_fn_c_check_type "$LINENO" "socklen_t" + #endif + + " +-if test "x$ac_cv_type_socklen_t" = xyes; then : ++if test "x$ac_cv_type_socklen_t" = x""yes; then : + + else + +@@ -13630,7 +13709,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken mbstowcs" >&5 + $as_echo_n "checking for broken mbstowcs... " >&6; } +-if ${ac_cv_broken_mbstowcs+:} false; then : ++if test "${ac_cv_broken_mbstowcs+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -13670,7 +13749,7 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5 + $as_echo_n "checking whether $CC supports computed gotos... " >&6; } +-if ${ac_cv_computed_gotos+:} false; then : ++if test "${ac_cv_computed_gotos+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -13750,11 +13829,11 @@ 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" +-if test "x$ac_cv_func_pipe2" = xyes; then : ++if test "x$ac_cv_func_pipe2" = x""yes; then : + + $as_echo "#define HAVE_PIPE2 1" >>confdefs.h + +@@ -13849,21 +13928,10 @@ $as_echo "$as_me: WARNING: cache variabl + :end' >>confcache + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then +- if test "x$cache_file" != "x/dev/null"; then ++ test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} +- if test ! -f "$cache_file" || test -h "$cache_file"; then +- cat confcache >"$cache_file" +- else +- case $cache_file in #( +- */* | ?:*) +- mv -f confcache "$cache_file"$$ && +- mv -f "$cache_file"$$ "$cache_file" ;; #( +- *) +- mv -f confcache "$cache_file" ;; +- esac +- fi +- fi ++ cat confcache >$cache_file + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +@@ -13879,7 +13947,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$//' +@@ -13896,7 +13963,7 @@ LTLIBOBJS=$ac_ltlibobjs + + + +-: "${CONFIG_STATUS=./config.status}" ++: ${CONFIG_STATUS=./config.status} + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +@@ -13997,7 +14064,6 @@ fi + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-as_myself= + case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -14043,19 +14109,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 + +@@ -14251,7 +14317,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 +@@ -14305,7 +14371,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri + # values after options handling. + ac_log=" + This file was extended by python $as_me 3.2, which was +-generated by GNU Autoconf 2.68. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -14367,10 +14433,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.68, ++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." + +@@ -14386,16 +14452,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 +@@ -14417,7 +14478,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;; +@@ -14430,7 +14490,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 ;; +@@ -14439,7 +14499,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" +@@ -14498,7 +14558,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 + +@@ -14520,10 +14580,9 @@ fi + # after its creation but before its name has been assigned to `$tmp'. + $debug || + { +- tmp= ac_tmp= ++ tmp= + trap 'exit_status=$? +- : "${ac_tmp:=$tmp}" +- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 + trap 'as_fn_exit 1' 1 2 13 15 + } +@@ -14531,13 +14590,12 @@ $debug || + + { + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -d "$tmp" ++ test -n "$tmp" && test -d "$tmp" + } || + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +-ac_tmp=$tmp ++} || 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. +@@ -14554,12 +14612,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 +- ac_cs_awk_cr='\\r' ++ ac_cs_awk_cr='\r' + else + ac_cs_awk_cr=$ac_cr + fi + +-echo 'BEGIN {' >"$ac_tmp/subs1.awk" && ++echo 'BEGIN {' >"$tmp/subs1.awk" && + _ACEOF + + +@@ -14568,18 +14626,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 +@@ -14587,7 +14645,7 @@ done + rm -f conf$$subs.sh + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && + _ACEOF + sed -n ' + h +@@ -14635,7 +14693,7 @@ t delim + rm -f conf$$subs.awk 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" + _ACAWK +-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && ++cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" +@@ -14667,29 +14725,21 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" + else + cat +-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ +- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ ++ || 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 +@@ -14701,7 +14751,7 @@ fi # test -n "$CONFIG_FILES" + # No need to generate them if there are no CONFIG_HEADERS. + # This happens for instance with `./config.status Makefile'. + if test -n "$CONFIG_HEADERS"; then +-cat >"$ac_tmp/defines.awk" <<\_ACAWK || ++cat >"$tmp/defines.awk" <<\_ACAWK || + BEGIN { _ACEOF +@@ -14713,11 +14763,11 @@ _ACEOF + # handling of long lines. + ac_delim='%!_!# ' + for ac_last_try in false false :; do +- ac_tt=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_tt"; then ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_t"; then + break + elif $ac_last_try; then +- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -14802,7 +14852,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" + + +@@ -14815,7 +14865,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 +@@ -14834,7 +14884,7 @@ do + for ac_f + do + case $ac_f in +- -) ac_f="$ac_tmp/stdin";; ++ -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. +@@ -14843,7 +14893,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'" +@@ -14869,8 +14919,8 @@ $as_echo "$as_me: creating $ac_file" >&6 + esac + + case $ac_tag in +- *:-:* | *:-) cat >"$ac_tmp/stdin" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; ++ *:-:* | *:-) cat >"$tmp/stdin" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -15000,24 +15050,23 @@ s&@abs_top_builddir@&$ac_abs_top_builddi + s&@INSTALL@&$ac_INSTALL&;t t + $ac_datarootdir_hack + " +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ +- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ +- "$ac_tmp/out"`; test -z "$ac_out"; } && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined" >&5 ++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 "$ac_tmp/stdin" ++ rm -f "$tmp/stdin" + case $ac_file in +- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; +- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; ++ -) cat "$tmp/out" && rm -f "$tmp/out";; ++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -15026,21 +15075,21 @@ which seems to be undefined. Please mak + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" +- } >"$ac_tmp/config.h" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" ++ } >"$tmp/config.h" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" +- mv "$ac_tmp/config.h" "$ac_file" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ mv "$tmp/config.h" "$ac_file" \ ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error $? "could not create -" "$LINENO" 5 ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error "could not create -" "$LINENO" 5 + fi + ;; + +@@ -15060,7 +15109,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. +@@ -15081,7 +15130,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 2011-01-17 13:09:50.827696887 -0500 -+++ ./pyconfig.h.in 2011-01-17 13:09:56.963611199 -0500 +--- ./pyconfig.h.in.autotool-intermediates 2011-02-14 12:00:34.924103677 -0500 ++++ ./pyconfig.h.in 2011-02-14 12:00:41.116907489 -0500 @@ -12,15 +12,15 @@ support for AIX C++ shared extension modules. */ #undef AIX_GENUINE_CPLUSPLUS diff --git a/python3.spec b/python3.spec index 2922a5c..0d79ab1 100644 --- a/python3.spec +++ b/python3.spec @@ -3,7 +3,7 @@ # pybasever without the dot: %global pyshortver 32 -%global alphatag rc2 +%global alphatag rc3 %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.11.%{alphatag}%{?dist} +Release: 0.12.%{alphatag}%{?dist} License: Python Group: Development/Languages Source: http://python.org/ftp/python/%{version}/Python-%{version}%{alphatag}.tar.bz2 @@ -1167,6 +1167,10 @@ rm -fr %{buildroot} %changelog +* Mon Feb 14 2011 David Malcolm - 3.2-0.12.rc3 +- 3.2rc3 +- regenerate autotool patch + * Wed Feb 09 2011 Fedora Release Engineering - 3.2-0.11.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild