diff -up ./configure.autotool-intermediates ./configure

--- ./configure.autotool-intermediates	2010-12-28 18:47:15.206934478 -0500

+++ ./configure	2010-12-28 18:47:21.053058461 -0500

@@ -1,14 +1,14 @@

 #! /bin/sh

 # From configure.in Revision: 87207 .

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.67 for python 3.2.

+# Generated by GNU Autoconf 2.65 for python 3.2.

 #

 # Report bugs to <http://bugs.python.org/>.

 #

 #

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software

-# Foundation, Inc.

+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

+# Inc.

 #

 #

 # This configure script is free software; the Free Software Foundation

@@ -320,7 +320,7 @@ $as_echo X"$as_dir" |

       test -d "$as_dir" && break

     done

     test -z "$as_dirs" || eval "mkdir $as_dirs"

-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"

+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

 } # as_fn_mkdir_p

@@ -360,19 +360,19 @@ else

 fi # as_fn_arith

-# as_fn_error STATUS ERROR [LINENO LOG_FD]

-# ----------------------------------------

+# as_fn_error ERROR [LINENO LOG_FD]

+# ---------------------------------

 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the

-# script with STATUS, using 1 if that was 0.

+# script with status $?, using 1 if that was 0.

 as_fn_error ()

 {

-  as_status=$1; test $as_status -eq 0 && as_status=1

-  if test "$4"; then

-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4

+  as_status=$?; test $as_status -eq 0 && as_status=1

+  if test "$3"; then

+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

   fi

-  $as_echo "$as_me: error: $2" >&2

+  $as_echo "$as_me: error: $1" >&2

   as_fn_exit $as_status

 } # as_fn_error

@@ -534,7 +534,7 @@ test -n "$DJDIR" || exec 7<&0 

 exec 6>&1

 # Name of the host.

-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,

+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

 # so uname gets run too.

 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`

@@ -611,6 +611,8 @@ TRUE

 MACHDEP_OBJS

 DYNLOADFILE

 DLINCLDIR

+DTRACEHDRS

+DTRACEOBJS

 THREADOBJ

 LDLAST

 USE_THREAD_MODULE

@@ -748,8 +750,11 @@ with_thread

 enable_ipv6

 with_doc_strings

 with_tsc

+with_count_allocs

+with_call_profile

 with_pymalloc

 with_valgrind

+with_dtrace

 with_fpectl

 with_libm

 with_libc

@@ -828,9 +833,8 @@ do

   fi

   case $ac_option in

-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;

-  *=)   ac_optarg= ;;

-  *)    ac_optarg=yes ;;

+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;

+  *)	ac_optarg=yes ;;

   esac

   # Accept the important Cygnus configure options, so we can diagnose typos.

@@ -875,7 +879,7 @@ do

     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`

     # Reject names that are not valid shell variable names.

     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

-      as_fn_error $? "invalid feature name: $ac_useropt"

+      as_fn_error "invalid feature name: $ac_useropt"

     ac_useropt_orig=$ac_useropt

     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

     case $ac_user_opts in

@@ -901,7 +905,7 @@ do

     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`

     # Reject names that are not valid shell variable names.

     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

-      as_fn_error $? "invalid feature name: $ac_useropt"

+      as_fn_error "invalid feature name: $ac_useropt"

     ac_useropt_orig=$ac_useropt

     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

     case $ac_user_opts in

@@ -1105,7 +1109,7 @@ do

     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`

     # Reject names that are not valid shell variable names.

     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

-      as_fn_error $? "invalid package name: $ac_useropt"

+      as_fn_error "invalid package name: $ac_useropt"

     ac_useropt_orig=$ac_useropt

     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

     case $ac_user_opts in

@@ -1121,7 +1125,7 @@ do

     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`

     # Reject names that are not valid shell variable names.

     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

-      as_fn_error $? "invalid package name: $ac_useropt"

+      as_fn_error "invalid package name: $ac_useropt"

     ac_useropt_orig=$ac_useropt

     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

     case $ac_user_opts in

@@ -1151,8 +1155,8 @@ do

   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)

     x_libraries=$ac_optarg ;;

-  -*) as_fn_error $? "unrecognized option: \`$ac_option'

-Try \`$0 --help' for more information"

+  -*) as_fn_error "unrecognized option: \`$ac_option'

+Try \`$0 --help' for more information."

     ;;

   *=*)

@@ -1160,7 +1164,7 @@ Try \`$0 --help' for more information"

     # Reject names that are not valid shell variable names.

     case $ac_envvar in #(

       '' | [0-9]* | *[!_$as_cr_alnum]* )

-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;

+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;

     esac

     eval $ac_envvar=\$ac_optarg

     export $ac_envvar ;;

@@ -1178,13 +1182,13 @@ done

 if test -n "$ac_prev"; then

   ac_option=--`echo $ac_prev | sed 's/_/-/g'`

-  as_fn_error $? "missing argument to $ac_option"

+  as_fn_error "missing argument to $ac_option"

 fi

 if test -n "$ac_unrecognized_opts"; then

   case $enable_option_checking in

     no) ;;

-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;

+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;

     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

   esac

 fi

@@ -1207,7 +1211,7 @@ do

     [\\/$]* | ?:[\\/]* )  continue;;

     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;

   esac

-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"

+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"

 done

 # There might be people who depend on the old broken behavior: `$host'

@@ -1221,8 +1225,8 @@ target=$target_alias

 if test "x$host_alias" != x; then

   if test "x$build_alias" = x; then

     cross_compiling=maybe

-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.

-    If a cross compiler is detected then cross compile mode will be used" >&2

+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

+    If a cross compiler is detected then cross compile mode will be used." >&2

   elif test "x$build_alias" != "x$host_alias"; then

     cross_compiling=yes

   fi

@@ -1237,9 +1241,9 @@ test "$silent" = yes && exec 6>/dev/null

 ac_pwd=`pwd` && test -n "$ac_pwd" &&

 ac_ls_di=`ls -di .` &&

 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||

-  as_fn_error $? "working directory cannot be determined"

+  as_fn_error "working directory cannot be determined"

 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||

-  as_fn_error $? "pwd does not report name of working directory"

+  as_fn_error "pwd does not report name of working directory"

 # Find the source files, if location was not specified.

@@ -1278,11 +1282,11 @@ else

 fi

 if test ! -r "$srcdir/$ac_unique_file"; then

   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."

-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"

+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"

 fi

 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"

 ac_abs_confdir=`(

-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"

+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"

 	pwd)`

 # When building in place, set srcdir=.

 if test "$ac_abs_confdir" = "$ac_pwd"; then

@@ -1322,7 +1326,7 @@ Configuration:

       --help=short        display options specific to this package

       --help=recursive    display the short help of all the included packages

   -V, --version           display version information and exit

-  -q, --quiet, --silent   do not print \`checking ...' messages

+  -q, --quiet, --silent   do not print \`checking...' messages

       --cache-file=FILE   cache test results in FILE [disabled]

   -C, --config-cache      alias for \`--cache-file=config.cache'

   -n, --no-create         do not create output files

@@ -1421,8 +1425,11 @@ Optional Packages:

                           deprecated; use --with(out)-threads

   --with(out)-doc-strings disable/enable documentation strings

   --with(out)-tsc         enable/disable timestamp counter profile

+  --with(out)count-allocs  enable/disable per-type instance accounting

+  --with(out)-call-profile  enable/disable statistics on function call invocation

   --with(out)-pymalloc    disable/enable specialized mallocs

   --with-valgrind         Enable Valgrind support

+  --with(out)-dtrace      disable/enable dtrace support

   --with-fpectl           enable SIGFPE catching

   --with-libm=STRING      math library

   --with-libc=STRING      C library

@@ -1508,9 +1515,9 @@ test -n "$ac_init_help" && exit $ac_stat

 if $ac_init_version; then

   cat <<\_ACEOF

 python configure 3.2

-generated by GNU Autoconf 2.67

+generated by GNU Autoconf 2.65

-Copyright (C) 2010 Free Software Foundation, Inc.

+Copyright (C) 2009 Free Software Foundation, Inc.

 This configure script is free software; the Free Software Foundation

 gives unlimited permission to copy, distribute and modify it.

 _ACEOF

@@ -1580,7 +1587,7 @@ $as_echo "$ac_try_echo"; } >&5

     mv -f conftest.er1 conftest.err

   fi

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

-  test $ac_status = 0; } > conftest.i && {

+  test $ac_status = 0; } >/dev/null && {

 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

 	 test ! -s conftest.err

        }; then :

@@ -1604,10 +1611,10 @@ fi

 ac_fn_c_check_header_mongrel ()

 {

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

-  if eval "test \"\${$3+set}\"" = set; then :

+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 fi

 eval ac_res=\$$3

@@ -1643,7 +1650,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :

 else

   ac_header_preproc=no

 fi

-rm -f conftest.err conftest.i conftest.$ac_ext

+rm -f conftest.err conftest.$ac_ext

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

 $as_echo "$ac_header_preproc" >&6; }

@@ -1666,15 +1673,17 @@ $as_echo "$as_me: WARNING: $2: see the A

 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}

     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

-( $as_echo "## -------------------------------------- ##

+( cat <<\_ASBOX

+## -------------------------------------- ##

 ## Report this to http://bugs.python.org/ ##

-## -------------------------------------- ##"

+## -------------------------------------- ##

+_ASBOX

      ) | sed "s/^/$as_me: WARNING:     /" >&2

     ;;

 esac

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   eval "$3=\$ac_header_compiler"

@@ -1738,7 +1747,7 @@ ac_fn_c_check_header_compile ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

@@ -1815,7 +1824,7 @@ ac_fn_c_check_type ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   eval "$3=no"

@@ -1869,7 +1878,7 @@ ac_fn_c_find_uintX_t ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5

 $as_echo_n "checking for uint$2_t... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   eval "$3=no"

@@ -1899,7 +1908,8 @@ if ac_fn_c_try_compile "$LINENO"; then :

 esac

 fi

 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-       if eval test \"x\$"$3"\" = x"no"; then :

+       eval as_val=\$$3

+   if test "x$as_val" = x""no; then :

 else

   break

@@ -1922,7 +1932,7 @@ ac_fn_c_find_intX_t ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5

 $as_echo_n "checking for int$2_t... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   eval "$3=no"

@@ -1933,11 +1943,11 @@ else

        cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

 $ac_includes_default

-	     enum { N = $2 / 2 - 1 };

 int

 main ()

 {

-static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];

+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };

+	     0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];

 test_array [0] = 0

   ;

@@ -1948,11 +1958,11 @@ if ac_fn_c_try_compile "$LINENO"; then :

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

 /* end confdefs.h.  */

 $ac_includes_default

-	        enum { N = $2 / 2 - 1 };

 int

 main ()

 {

-static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)

+static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 };

+		($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)

 		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];

 test_array [0] = 0

@@ -1973,7 +1983,8 @@ fi

 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi

 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

-       if eval test \"x\$"$3"\" = x"no"; then :

+       eval as_val=\$$3

+   if test "x$as_val" = x""no; then :

 else

   break

@@ -2173,7 +2184,7 @@ ac_fn_c_check_func ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

@@ -2241,7 +2252,7 @@ ac_fn_c_check_member ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5

 $as_echo_n "checking for $2.$3... " >&6; }

-if eval "test \"\${$4+set}\"" = set; then :

+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

@@ -2289,18 +2300,15 @@ $as_echo "$ac_res" >&6; }

 } # ac_fn_c_check_member

-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES

-# ---------------------------------------------

-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR

-# accordingly.

+# ac_fn_c_check_decl LINENO SYMBOL VAR

+# ------------------------------------

+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.

 ac_fn_c_check_decl ()

 {

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

-  as_decl_name=`echo $2|sed 's/ *(.*//'`

-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`

-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5

-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }

-if eval "test \"\${$3+set}\"" = set; then :

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5

+$as_echo_n "checking whether $2 is declared... " >&6; }

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

   $as_echo_n "(cached) " >&6

 else

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

@@ -2309,12 +2317,8 @@ $4

 int

 main ()

 {

-#ifndef $as_decl_name

-#ifdef __cplusplus

-  (void) $as_decl_use;

-#else

-  (void) $as_decl_name;

-#endif

+#ifndef $2

+  (void) $2;

 #endif

   ;

@@ -2339,7 +2343,7 @@ This file contains any messages produced

 running configure, to aid debugging if configure makes a mistake.

 It was created by python $as_me 3.2, which was

-generated by GNU Autoconf 2.67.  Invocation command line was

+generated by GNU Autoconf 2.65.  Invocation command line was

   $ $0 $@

@@ -2449,9 +2453,11 @@ trap 'exit_status=$?

   {

     echo

-    $as_echo "## ---------------- ##

+    cat <<\_ASBOX

+## ---------------- ##

 ## Cache variables. ##

-## ---------------- ##"

+## ---------------- ##

+_ASBOX

     echo

     # The following way of writing the cache mishandles newlines in values,

 (

@@ -2485,9 +2491,11 @@ $as_echo "$as_me: WARNING: cache variabl

 )

     echo

-    $as_echo "## ----------------- ##

+    cat <<\_ASBOX

+## ----------------- ##

 ## Output variables. ##

-## ----------------- ##"

+## ----------------- ##

+_ASBOX

     echo

     for ac_var in $ac_subst_vars

     do

@@ -2500,9 +2508,11 @@ $as_echo "$as_me: WARNING: cache variabl

     echo

     if test -n "$ac_subst_files"; then

-      $as_echo "## ------------------- ##

+      cat <<\_ASBOX

+## ------------------- ##

 ## File substitutions. ##

-## ------------------- ##"

+## ------------------- ##

+_ASBOX

       echo

       for ac_var in $ac_subst_files

       do

@@ -2516,9 +2526,11 @@ $as_echo "$as_me: WARNING: cache variabl

     fi

     if test -s confdefs.h; then

-      $as_echo "## ----------- ##

+      cat <<\_ASBOX

+## ----------- ##

 ## confdefs.h. ##

-## ----------- ##"

+## ----------- ##

+_ASBOX

       echo

       cat confdefs.h

       echo

@@ -2573,12 +2585,7 @@ _ACEOF

 ac_site_file1=NONE

 ac_site_file2=NONE

 if test -n "$CONFIG_SITE"; then

-  # We do not want a PATH search for config.site.

-  case $CONFIG_SITE in #((

-    -*)  ac_site_file1=./$CONFIG_SITE;;

-    */*) ac_site_file1=$CONFIG_SITE;;

-    *)   ac_site_file1=./$CONFIG_SITE;;

-  esac

+  ac_site_file1=$CONFIG_SITE

 elif test "x$prefix" != xNONE; then

   ac_site_file1=$prefix/share/config.site

   ac_site_file2=$prefix/etc/config.site

@@ -2593,11 +2600,7 @@ do

     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

 $as_echo "$as_me: loading site script $ac_site_file" >&6;}

     sed 's/^/| /' "$ac_site_file" >&5

-    . "$ac_site_file" \

-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "failed to load site script $ac_site_file

-See \`config.log' for more details" "$LINENO" 5 ; }

+    . "$ac_site_file"

   fi

 done

@@ -2673,7 +2676,7 @@ if $ac_cache_corrupted; then

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5

 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

 fi

 ## -------------------- ##

 ## Main body of script. ##

@@ -2774,7 +2777,7 @@ if test "${enable_universalsdk+set}" = s

 		UNIVERSALSDK=$enableval

 		if test ! -d "${UNIVERSALSDK}"

 		then

-			as_fn_error $? "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5

+			as_fn_error "--enable-universalsdk specifies non-existing SDK: ${UNIVERSALSDK}" "$LINENO" 5

 		fi

 		;;

 	esac

@@ -3166,7 +3169,7 @@ $as_echo "$without_gcc" >&6; }

 # If the user switches compilers, we can't believe the cache

 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"

 then

-  as_fn_error $? "cached CC is different -- throw away $cache_file

+  as_fn_error "cached CC is different -- throw away $cache_file

 (it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5

 fi

@@ -3476,8 +3479,8 @@ fi

 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "no acceptable C compiler found in \$PATH

-See \`config.log' for more details" "$LINENO" 5 ; }

+as_fn_error "no acceptable C compiler found in \$PATH

+See \`config.log' for more details." "$LINENO" 5; }

 # Provide some information about the compiler.

 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

@@ -3591,8 +3594,9 @@ sed 's/^/| /' conftest.$ac_ext >&5

 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error 77 "C compiler cannot create executables

-See \`config.log' for more details" "$LINENO" 5 ; }

+{ as_fn_set_status 77

+as_fn_error "C compiler cannot create executables

+See \`config.log' for more details." "$LINENO" 5; }; }

 else

   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

 $as_echo "yes" >&6; }

@@ -3634,8 +3638,8 @@ done

 else

   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "cannot compute suffix of executables: cannot compile and link

-See \`config.log' for more details" "$LINENO" 5 ; }

+as_fn_error "cannot compute suffix of executables: cannot compile and link

+See \`config.log' for more details." "$LINENO" 5; }

 fi

 rm -f conftest conftest$ac_cv_exeext

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

@@ -3692,9 +3696,9 @@ $as_echo "$ac_try_echo"; } >&5

     else

 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "cannot run C compiled programs.

+as_fn_error "cannot run C compiled programs.

 If you meant to cross compile, use \`--host'.

-See \`config.log' for more details" "$LINENO" 5 ; }

+See \`config.log' for more details." "$LINENO" 5; }

     fi

   fi

 fi

@@ -3745,8 +3749,8 @@ sed 's/^/| /' conftest.$ac_ext >&5

 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "cannot compute suffix of object files: cannot compile

-See \`config.log' for more details" "$LINENO" 5 ; }

+as_fn_error "cannot compute suffix of object files: cannot compile

+See \`config.log' for more details." "$LINENO" 5; }

 fi

 rm -f conftest.$ac_cv_objext conftest.$ac_ext

 fi

@@ -4199,7 +4203,7 @@ else

   # Broken: fails on valid input.

 continue

 fi

-rm -f conftest.err conftest.i conftest.$ac_ext

+rm -f conftest.err conftest.$ac_ext

   # OK, works on sane cases.  Now check whether nonexistent headers

   # can be detected and how.

@@ -4215,11 +4219,11 @@ else

 ac_preproc_ok=:

 break

 fi

-rm -f conftest.err conftest.i conftest.$ac_ext

+rm -f conftest.err conftest.$ac_ext

 done

 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.i conftest.err conftest.$ac_ext

+rm -f conftest.err conftest.$ac_ext

 if $ac_preproc_ok; then :

   break

 fi

@@ -4258,7 +4262,7 @@ else

   # Broken: fails on valid input.

 continue

 fi

-rm -f conftest.err conftest.i conftest.$ac_ext

+rm -f conftest.err conftest.$ac_ext

   # OK, works on sane cases.  Now check whether nonexistent headers

   # can be detected and how.

@@ -4274,18 +4278,18 @@ else

 ac_preproc_ok=:

 break

 fi

-rm -f conftest.err conftest.i conftest.$ac_ext

+rm -f conftest.err conftest.$ac_ext

 done

 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.i conftest.err conftest.$ac_ext

+rm -f conftest.err conftest.$ac_ext

 if $ac_preproc_ok; then :

 else

   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check

-See \`config.log' for more details" "$LINENO" 5 ; }

+as_fn_error "C preprocessor \"$CPP\" fails sanity check

+See \`config.log' for more details." "$LINENO" 5; }

 fi

 ac_ext=c

@@ -4346,7 +4350,7 @@ esac

   done

 IFS=$as_save_IFS

   if test -z "$ac_cv_path_GREP"; then

-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

   fi

 else

   ac_cv_path_GREP=$GREP

@@ -4412,7 +4416,7 @@ esac

   done

 IFS=$as_save_IFS

   if test -z "$ac_cv_path_EGREP"; then

-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

   fi

 else

   ac_cv_path_EGREP=$EGREP

@@ -4544,7 +4548,8 @@ do :

   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

 "

-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

+eval as_val=\$$as_ac_Header

+   if test "x$as_val" = x""yes; then :

   cat >>confdefs.h <<_ACEOF

 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

 _ACEOF

@@ -5158,22 +5163,16 @@ bsdos*|hp*|HP*)

 esac

 ac_aux_dir=

 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

-  if test -f "$ac_dir/install-sh"; then

-    ac_aux_dir=$ac_dir

-    ac_install_sh="$ac_aux_dir/install-sh -c"

-    break

-  elif test -f "$ac_dir/install.sh"; then

-    ac_aux_dir=$ac_dir

-    ac_install_sh="$ac_aux_dir/install.sh -c"

-    break

-  elif test -f "$ac_dir/shtool"; then

-    ac_aux_dir=$ac_dir