added a test for wxAtomicDec return value

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 6ecfba5cf7993972928ef8fc040df76fb399b940..b9d6e695803f0f6fa886424c3ecb9408b3827dca 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,57 +1,28 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 47822 2007-07-29 19:08:51Z VZ .
+# From configure.in Id: configure.in 48569 2007-09-05 18:55:18Z RR .

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

-# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.9.0.

 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #

-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.

 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 

-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'

-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix

 fi
 fi

+DUALCASE=1; export DUALCASE # for MKS sh

 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then


@@ -61,43 +32,8 @@ else
 fi
 
 
 fi
 
 

-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-

 # Work around bugs in pre-3.0 UWIN ksh.
 # Work around bugs in pre-3.0 UWIN ksh.

-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH

 PS1='$ '
 PS2='> '
 PS4='+ '
 PS1='$ '
 PS2='> '
 PS4='+ '


@@ -111,19 +47,18 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else

-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+    $as_unset $as_var

   fi
 done
 
 # Required to use basename.
   fi
 done
 
 # Required to use basename.

-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then

   as_expr=expr
 else
   as_expr=false
 fi
 
   as_expr=expr
 else
   as_expr=false
 fi
 

-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then

   as_basename=basename
 else
   as_basename=false
   as_basename=basename
 else
   as_basename=false


@@ -131,388 +66,157 @@ fi
 
 
 # Name of the executable.
 
 
 # Name of the executable.

-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||

 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
         X"$0" : 'X\(//\)$' \| \
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
         X"$0" : 'X\(//\)$' \| \

-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+        X"$0" : 'X\(/\)$' \| \
+        .     : '\(.\)' 2>/dev/null ||

 echo X/"$0" |
 echo X/"$0" |

-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+         /^X\/\(\/\/\)$/{ s//\1/; q; }
+         /^X\/\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`

 
 
 
 

-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes &&    (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits

 
 

-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh

 fi
 
 fi
 

-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi

 
 

-test \$exitcode = 0) || { (exit 1); exit 1; }
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done

 
 

-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')

     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.

-  case $as_dir in
+  for as_base in sh bash ksh sh5; do
+        case $as_dir in

         /*)
         /*)

-          for as_base in sh bash ksh sh5; do
-            as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-          done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-        # Try only shells that exist, to save several forks.
-        if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-               { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-              as_have_required=yes
-              if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
+          if ("$as_dir/$as_base" -c '

   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO

+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

   test "x$as_lineno_1" != "x$as_lineno_2" &&
   test "x$as_lineno_1" != "x$as_lineno_2" &&

-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+            $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+            $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+            CONFIG_SHELL=$as_dir/$as_base
+            export CONFIG_SHELL
+            exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+          fi;;
+        esac
+       done
+done
+;;
+  esac

 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a

-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.

   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |

     sed '
     sed '

-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno

       N
       N

-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,

       t loop
       t loop

-      s/-\n.*//
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,

     ' >$as_me.lineno &&
     ' >$as_me.lineno &&

-  chmod +x "$as_me.lineno" ||
+  chmod +x $as_me.lineno ||

     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the

-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno

   # Exit status is that of the last command.
   exit
 }
 
 
   # Exit status is that of the last command.
   exit
 }
 
 

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='     ' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;

 esac
 
 esac
 

-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then

   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file

-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi

 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then

-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links

     as_ln_s='cp -p'
     as_ln_s='cp -p'

+  else
+    as_ln_s='ln -s'
+  fi

 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi

-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file

 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:


@@ -521,28 +225,7 @@ else
   as_mkdir_p=false
 fi
 
   as_mkdir_p=false
 fi
 

-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-       case $1 in
-        -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"

 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"


@@ -551,27 +234,39 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 

+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS="  $as_nl"
+
+# CDPATH.
+$as_unset CDPATH

 
 

-exec 7<&0 </dev/null 6>&1

 
 # Name of the host.
 # 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`
 
 
 # Name of the host.
 # 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`
 

+exec 6>&1
+

 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local

-ac_clean_files=

 ac_config_libobj_dir=.
 ac_config_libobj_dir=.

-LIBOBJS=

 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 

+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+

 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'


@@ -583,478 +278,43 @@ ac_unique_file="wx-config.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>

-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H

 # include <sys/types.h>
 #endif
 # include <sys/types.h>
 #endif

-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H

 # include <sys/stat.h>
 #endif
 # include <sys/stat.h>
 #endif

-#ifdef STDC_HEADERS
+#if STDC_HEADERS

 # include <stdlib.h>
 # include <stddef.h>
 #else
 # include <stdlib.h>
 # include <stddef.h>
 #else

-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H

 #  include <stdlib.h>
 # endif
 #endif
 #  include <stdlib.h>
 # endif
 #endif

-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H

 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif

-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H

 # include <strings.h>
 #endif
 # include <strings.h>
 #endif

-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H

 # include <inttypes.h>
 # include <inttypes.h>

+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif

 #endif
 #endif

-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H

 # include <unistd.h>
 #endif"
 
 # include <unistd.h>
 #endif"
 

-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-wx_top_builddir
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CPP
-GREP
-EGREP
-CXX
-CXXFLAGS
-ac_ct_CXX
-AR
-subdirs
-PKG_CONFIG
-GTK_CFLAGS
-GTK_LIBS
-GTK_CONFIG
-DIRECTFB_CFLAGS
-DIRECTFB_LIBS
-XMKMF
-X_CFLAGS
-X_PRE_LIBS
-X_LIBS
-X_EXTRA_LIBS
-PANGOX_CFLAGS
-PANGOX_LIBS
-PANGOFT2_CFLAGS
-PANGOFT2_LIBS
-PANGOXFT_CFLAGS
-PANGOXFT_LIBS
-CFLAGS_VISIBILITY
-CXXFLAGS_VISIBILITY
-REZ
-DEREZ
-SETFILE
-LIBICONV
-SDL_CONFIG
-SDL_CFLAGS
-SDL_LIBS
-LIBGNOMEPRINTUI_CFLAGS
-LIBGNOMEPRINTUI_LIBS
-GNOMEVFS_CFLAGS
-GNOMEVFS_LIBS
-HILDON_CFLAGS
-HILDON_LIBS
-CAIRO_CFLAGS
-CAIRO_LIBS
-GST_CFLAGS
-GST_LIBS
-ALL_WX_LIBS
-BUILT_WX_LIBS
-STD_BASE_LIBS
-STD_GUI_LIBS
-wxUSE_ZLIB
-wxUSE_REGEX
-wxUSE_EXPAT
-wxUSE_ODBC
-wxUSE_LIBJPEG
-wxUSE_LIBPNG
-wxUSE_LIBTIFF
-VENDOR
-OFFICIAL_BUILD
-WX_FLAVOUR
-WX_LIB_FLAVOUR
-WXUNIV
-MONOLITHIC
-USE_PLUGINS
-CXXWARNINGS
-EXTRALIBS
-EXTRALIBS_XML
-EXTRALIBS_HTML
-EXTRALIBS_ODBC
-EXTRALIBS_GUI
-EXTRALIBS_OPENGL
-EXTRALIBS_SDL
-WITH_PLUGIN_SDL
-EXTRALIBS_GNOMEPRINT
-EXTRALIBS_GNOMEVFS
-EXTRALIBS_HILDON
-UNICODE
-BUILD
-DEBUG_INFO
-DEBUG_FLAG
-TOOLKIT_LOWERCASE
-TOOLKIT_VERSION
-SAMPLES_RPATH_FLAG
-SAMPLES_RPATH_POSTLINK
-HOST_SUFFIX
-CPPUNIT_CFLAGS
-CPPUNIT_LIBS
-RANLIB
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-LN_S
-SET_MAKE
-MAKE_SET
-AROPTIONS
-STRIP
-NM
-INSTALL_DIR
-LDFLAGS_GUI
-IF_GNU_MAKE
-PLATFORM_UNIX
-PLATFORM_WIN32
-PLATFORM_MSDOS
-PLATFORM_MAC
-PLATFORM_MACOS
-PLATFORM_MACOSX
-PLATFORM_OS2
-PLATFORM_BEOS
-SO_SUFFIX
-SO_SUFFIX_MODULE
-DLLIMP_SUFFIX
-LIBPREFIX
-LIBEXT
-DLLPREFIX
-DLLPREFIX_MODULE
-dlldir
-AIX_CXX_LD
-SHARED_LD_CC
-SHARED_LD_CXX
-SHARED_LD_MODULE_CC
-SHARED_LD_MODULE_CXX
-PIC_FLAG
-WINDOWS_IMPLIB
-USE_SOVERSION
-USE_SOVERLINUX
-USE_SOVERSOLARIS
-USE_SOVERCYGWIN
-USE_MACVERSION
-USE_SOSYMLINKS
-SONAME_FLAG
-DEPS_TRACKING
-BK_DEPS
-WINDRES
-GCC_PCH
-ICC_PCH
-BK_MAKE_PCH
-COND_BUILD_DEBUG
-COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT
-COND_BUILD_DEBUG_UNICODE_0
-COND_BUILD_DEBUG_UNICODE_1
-COND_BUILD_RELEASE
-COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
-COND_BUILD_RELEASE_UNICODE_0
-COND_BUILD_RELEASE_UNICODE_1
-COND_DEBUG_FLAG_1
-COND_DEBUG_INFO_0
-COND_DEBUG_INFO_1
-COND_DEPS_TRACKING_0
-COND_DEPS_TRACKING_1
-COND_GCC_PCH_1
-COND_ICC_PCH_1
-COND_MONOLITHIC_0
-COND_MONOLITHIC_0_SHARED_0
-COND_MONOLITHIC_0_SHARED_0_USE_AUI_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1
-COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
-COND_MONOLITHIC_0_SHARED_0_USE_STC_1
-COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
-COND_MONOLITHIC_0_SHARED_1
-COND_MONOLITHIC_0_SHARED_1_USE_AUI_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1
-COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
-COND_MONOLITHIC_0_SHARED_1_USE_STC_1
-COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
-COND_MONOLITHIC_0_USE_AUI_1
-COND_MONOLITHIC_0_USE_GUI_1
-COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1
-COND_MONOLITHIC_0_USE_HTML_1
-COND_MONOLITHIC_0_USE_MEDIA_1
-COND_MONOLITHIC_0_USE_ODBC_1
-COND_MONOLITHIC_0_USE_QA_1
-COND_MONOLITHIC_0_USE_RICHTEXT_1
-COND_MONOLITHIC_0_USE_STC_1
-COND_MONOLITHIC_0_USE_XRC_1
-COND_MONOLITHIC_1
-COND_MONOLITHIC_1_SHARED_0
-COND_MONOLITHIC_1_SHARED_1
-COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1
-COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1
-COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
-COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
-COND_PLATFORM_MACOSX_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11
-COND_PLATFORM_MACOSX_1_USE_GUI_1
-COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
-COND_PLATFORM_MACOS_1
-COND_PLATFORM_MAC_1
-COND_PLATFORM_MSDOS_0
-COND_PLATFORM_MSDOS_1
-COND_PLATFORM_OS2_1
-COND_PLATFORM_UNIX_0
-COND_PLATFORM_UNIX_1
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1
-COND_PLATFORM_UNIX_1_USE_GUI_1
-COND_PLATFORM_UNIX_1_USE_PLUGINS_0
-COND_PLATFORM_WIN32_0
-COND_PLATFORM_WIN32_1
-COND_SHARED_0
-COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
-COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
-COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
-COND_SHARED_0_USE_STC_1
-COND_SHARED_0_USE_XRC_1
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN
-COND_SHARED_0_WXUSE_ODBC_BUILTIN
-COND_SHARED_0_WXUSE_REGEX_BUILTIN
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN
-COND_SHARED_1
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_1_USE_XRC_1
-COND_TOOLKIT_
-COND_TOOLKIT_COCOA
-COND_TOOLKIT_COCOA_USE_GUI_1
-COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_DFB
-COND_TOOLKIT_DFB_USE_GUI_1
-COND_TOOLKIT_GTK
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_GTK_USE_GUI_1
-COND_TOOLKIT_MAC
-COND_TOOLKIT_MAC_USE_GUI_1
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_MGL
-COND_TOOLKIT_MGL_USE_GUI_1
-COND_TOOLKIT_MOTIF
-COND_TOOLKIT_MOTIF_USE_GUI_1
-COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_MSW
-COND_TOOLKIT_MSW_USE_GUI_1
-COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_MSW_WXUNIV_0
-COND_TOOLKIT_PM
-COND_TOOLKIT_PM_USE_GUI_1
-COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_WINCE
-COND_TOOLKIT_WINCE_USE_GUI_1
-COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_WINCE_WXUNIV_0
-COND_TOOLKIT_X11
-COND_TOOLKIT_X11_USE_GUI_1
-COND_UNICODE_1
-COND_USE_EXCEPTIONS_0
-COND_USE_EXCEPTIONS_1
-COND_USE_GUI_0
-COND_USE_GUI_1
-COND_USE_GUI_1_USE_OPENGL_1
-COND_USE_GUI_1_WXUNIV_0
-COND_USE_GUI_1_WXUNIV_1
-COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
-COND_USE_ODBC_1
-COND_USE_OPENGL_1
-COND_USE_PCH_1
-COND_USE_PLUGINS_0
-COND_USE_RTTI_0
-COND_USE_RTTI_1
-COND_USE_SOSYMLINKS_1
-COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1
-COND_USE_SOVERLINUX_1
-COND_USE_SOVERSION_0
-COND_USE_SOVERSOLARIS_1
-COND_USE_STC_1
-COND_USE_THREADS_0
-COND_USE_THREADS_1
-COND_USE_XRC_1
-COND_WINDOWS_IMPLIB_1
-COND_WITH_PLUGIN_SDL_1
-COND_WXUNIV_0
-COND_WXUNIV_1
-COND_WXUSE_EXPAT_BUILTIN
-COND_WXUSE_LIBJPEG_BUILTIN
-COND_WXUSE_LIBPNG_BUILTIN
-COND_WXUSE_LIBTIFF_BUILTIN
-COND_WXUSE_ODBC_BUILTIN
-COND_WXUSE_REGEX_BUILTIN
-COND_WXUSE_ZLIB_BUILTIN
-SHARED
-WX_LIBRARY_BASENAME_NOGUI
-WX_LIBRARY_BASENAME_GUI
-USE_GUI
-AFMINSTALL
-WIN32INSTALL
-TOOLKIT
-TOOLKIT_DIR
-TOOLCHAIN_NAME
-TOOLCHAIN_FULLNAME
-cross_compiling
-WIDGET_SET
-WX_RELEASE
-WX_VERSION
-WX_SUBVERSION
-WX_CHARTYPE
-WX_DEBUGTYPE
-WXCONFIG_CPPFLAGS
-WXCONFIG_CFLAGS
-WXCONFIG_CXXFLAGS
-WXCONFIG_LIBS
-WXCONFIG_RPATH
-WXCONFIG_LDFLAGS_GUI
-WXCONFIG_RESFLAGS
-EXE_LINKER
-GUIDIST
-DISTDIR
-SAMPLES_SUBDIRS
-LDFLAGS_GL
-OPENGL_LIBS
-DMALLOC_LIBS
-WX_VERSION_TAG
-RESCOMP
-RESFLAGS
-RESPROGRAMOBJ
-WX_RESOURCES_MACOSX_ASCII
-WX_RESOURCES_MACOSX_DATA
-LIBWXMACRES
-POSTLINK_COMMAND
-MACSETFILE
-GCC
-DLLTOOL
-CPPUNIT_CONFIG
-LIBOBJS
-LTLIBOBJS'
+ac_subdirs_all="$ac_subdirs_all src/expat"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os wx_top_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX AR ac_ct_AR subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG ac_pt_PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY LIBICONV SDL_CONFIG SDL_CFLAGS SDL_LIBS GTKPRINT_CFLAGS GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS GST_LIBS ALL_WX_LIBS BUILT_WX_LIBS STD_BASE_LIBS STD_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GTKPRINT EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE MAKE_SET AROPTIONS STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS WINDRES ac_ct_WINDRES REZ SETFILE GCC_PCH ICC_PCH BK_MAKE_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_ICC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_AUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_GUI_1 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 COND_MONOLITHIC_0_USE_XRC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_0 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_TOOLKIT_MGL COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_STC_1 COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_DFB COND_TOOLKIT_DFB_USE_GUI_1 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_TOOLKIT_VERSION_ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_USE_OPENGL_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PCH_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_STC_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WINDOWS_IMPLIB_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN DEREZ SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_CPPFLAGS WXCONFIG_CFLAGS WXCONFIG_CXXFLAGS WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESCOMP RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 ac_subst_files=''

-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-PKG_CONFIG
-DIRECTFB_CFLAGS
-DIRECTFB_LIBS
-XMKMF
-PANGOX_CFLAGS
-PANGOX_LIBS
-PANGOFT2_CFLAGS
-PANGOFT2_LIBS
-PANGOXFT_CFLAGS
-PANGOXFT_LIBS
-LIBGNOMEPRINTUI_CFLAGS
-LIBGNOMEPRINTUI_LIBS
-GNOMEVFS_CFLAGS
-GNOMEVFS_LIBS
-HILDON_CFLAGS
-HILDON_LIBS
-CAIRO_CFLAGS
-CAIRO_LIBS
-GST_CFLAGS
-GST_LIBS'
-ac_subdirs_all='src/expat'

 
 # Initialize some variables set by options.
 ac_init_help=
 
 # Initialize some variables set by options.
 ac_init_help=


@@ -1081,48 +341,34 @@ x_libraries=NONE
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.

-# (The list follows the same order as the GNU Coding Standards.)

 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'

-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
+datadir='${prefix}/share'

 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'

+libdir='${exec_prefix}/lib'

 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'

-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+infodir='${prefix}/info'
+mandir='${prefix}/man'

 
 ac_prev=
 
 ac_prev=

-ac_dashdash=

 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then

-    eval $ac_prev=\$ac_option
+    eval "$ac_prev=\$ac_option"

     ac_prev=
     continue
   fi
 
     ac_prev=
     continue
   fi
 

-  case $ac_option in
-  *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)   ac_optarg=yes ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`

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

-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
+  case $ac_option in

 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;


@@ -1144,45 +390,33 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
   --config-cache | -C)
     cache_file=config.cache ;;
 

-  -datadir | --datadir | --datadi | --datad)
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)

     ac_prev=datadir ;;
     ac_prev=datadir ;;

-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)

     datadir=$ac_optarg ;;
 
     datadir=$ac_optarg ;;
 

-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-

   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.

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

       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;

 
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
 
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.

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

       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_$ac_feature='$ac_optarg'" ;;

 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \


@@ -1209,12 +443,6 @@ do
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 

-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-

   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;


@@ -1239,16 +467,13 @@ do
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 

-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-

   -localstatedir | --localstatedir | --localstatedi | --localstated \
   -localstatedir | --localstatedir | --localstatedi | --localstated \

-  | --localstate | --localstat | --localsta | --localst | --locals)
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)

     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \

-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)

     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)


@@ -1313,16 +538,6 @@ do
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 

-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-

   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;


@@ -1375,20 +590,24 @@ do
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.

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

       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_$ac_package='$ac_optarg'" ;;

 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.

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

       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;

 
   --x)
     # Obsolete; use --with-x.
 
   --x)
     # Obsolete; use --with-x.


@@ -1419,7 +638,8 @@ Try \`$0 --help' for more information." >&2
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }

-    eval $ac_envvar=\$ac_optarg
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"

     export $ac_envvar ;;
 
   *)
     export $ac_envvar ;;
 
   *)


@@ -1439,19 +659,27 @@ if test -n "$ac_prev"; then
    { (exit 1); exit 1; }; }
 fi
 
    { (exit 1); exit 1; }; }
 fi
 

-# Be sure to have absolute directory names.
-for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
-               datadir sysconfdir sharedstatedir localstatedir includedir \
-               oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix

 do
 do

-  eval ac_val=\$$ac_var
+  eval ac_val=$`echo $ac_var`

   case $ac_val in
   case $ac_val in

-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+             localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;

   esac
   esac

-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }

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


@@ -1478,76 +706,166 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
 test "$silent" = yes && exec 6>/dev/null
 
 
 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 .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-

 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes

-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
+  # Try the directory containing this script, then its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||

 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$0" : 'X\(//\)[^/]' \| \
         X"$0" : 'X\(//\)$' \| \
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$0" : 'X\(//\)[^/]' \| \
         X"$0" : 'X\(//\)$' \| \

-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+        X"$0" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||

 echo X"$0" |
 echo X"$0" |

-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`

   srcdir=$ac_confdir
   srcdir=$ac_confdir

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

     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi

-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2

    { (exit 1); exit 1; }; }
    { (exit 1); exit 1; }; }

+  fi

 fi
 fi

-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-       cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2

    { (exit 1); exit 1; }; }
    { (exit 1); exit 1; }; }

-       pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_env_DIRECTFB_CFLAGS_set=${DIRECTFB_CFLAGS+set}
+ac_env_DIRECTFB_CFLAGS_value=$DIRECTFB_CFLAGS
+ac_cv_env_DIRECTFB_CFLAGS_set=${DIRECTFB_CFLAGS+set}
+ac_cv_env_DIRECTFB_CFLAGS_value=$DIRECTFB_CFLAGS
+ac_env_DIRECTFB_LIBS_set=${DIRECTFB_LIBS+set}
+ac_env_DIRECTFB_LIBS_value=$DIRECTFB_LIBS
+ac_cv_env_DIRECTFB_LIBS_set=${DIRECTFB_LIBS+set}
+ac_cv_env_DIRECTFB_LIBS_value=$DIRECTFB_LIBS
+ac_env_PANGOX_CFLAGS_set=${PANGOX_CFLAGS+set}
+ac_env_PANGOX_CFLAGS_value=$PANGOX_CFLAGS
+ac_cv_env_PANGOX_CFLAGS_set=${PANGOX_CFLAGS+set}
+ac_cv_env_PANGOX_CFLAGS_value=$PANGOX_CFLAGS
+ac_env_PANGOX_LIBS_set=${PANGOX_LIBS+set}
+ac_env_PANGOX_LIBS_value=$PANGOX_LIBS
+ac_cv_env_PANGOX_LIBS_set=${PANGOX_LIBS+set}
+ac_cv_env_PANGOX_LIBS_value=$PANGOX_LIBS
+ac_env_PANGOFT2_CFLAGS_set=${PANGOFT2_CFLAGS+set}
+ac_env_PANGOFT2_CFLAGS_value=$PANGOFT2_CFLAGS
+ac_cv_env_PANGOFT2_CFLAGS_set=${PANGOFT2_CFLAGS+set}
+ac_cv_env_PANGOFT2_CFLAGS_value=$PANGOFT2_CFLAGS
+ac_env_PANGOFT2_LIBS_set=${PANGOFT2_LIBS+set}
+ac_env_PANGOFT2_LIBS_value=$PANGOFT2_LIBS
+ac_cv_env_PANGOFT2_LIBS_set=${PANGOFT2_LIBS+set}
+ac_cv_env_PANGOFT2_LIBS_value=$PANGOFT2_LIBS
+ac_env_PANGOXFT_CFLAGS_set=${PANGOXFT_CFLAGS+set}
+ac_env_PANGOXFT_CFLAGS_value=$PANGOXFT_CFLAGS
+ac_cv_env_PANGOXFT_CFLAGS_set=${PANGOXFT_CFLAGS+set}
+ac_cv_env_PANGOXFT_CFLAGS_value=$PANGOXFT_CFLAGS
+ac_env_PANGOXFT_LIBS_set=${PANGOXFT_LIBS+set}
+ac_env_PANGOXFT_LIBS_value=$PANGOXFT_LIBS
+ac_cv_env_PANGOXFT_LIBS_set=${PANGOXFT_LIBS+set}
+ac_cv_env_PANGOXFT_LIBS_value=$PANGOXFT_LIBS
+ac_env_GTKPRINT_CFLAGS_set=${GTKPRINT_CFLAGS+set}
+ac_env_GTKPRINT_CFLAGS_value=$GTKPRINT_CFLAGS
+ac_cv_env_GTKPRINT_CFLAGS_set=${GTKPRINT_CFLAGS+set}
+ac_cv_env_GTKPRINT_CFLAGS_value=$GTKPRINT_CFLAGS
+ac_env_GTKPRINT_LIBS_set=${GTKPRINT_LIBS+set}
+ac_env_GTKPRINT_LIBS_value=$GTKPRINT_LIBS
+ac_cv_env_GTKPRINT_LIBS_set=${GTKPRINT_LIBS+set}
+ac_cv_env_GTKPRINT_LIBS_value=$GTKPRINT_LIBS
+ac_env_LIBGNOMEPRINTUI_CFLAGS_set=${LIBGNOMEPRINTUI_CFLAGS+set}
+ac_env_LIBGNOMEPRINTUI_CFLAGS_value=$LIBGNOMEPRINTUI_CFLAGS
+ac_cv_env_LIBGNOMEPRINTUI_CFLAGS_set=${LIBGNOMEPRINTUI_CFLAGS+set}
+ac_cv_env_LIBGNOMEPRINTUI_CFLAGS_value=$LIBGNOMEPRINTUI_CFLAGS
+ac_env_LIBGNOMEPRINTUI_LIBS_set=${LIBGNOMEPRINTUI_LIBS+set}
+ac_env_LIBGNOMEPRINTUI_LIBS_value=$LIBGNOMEPRINTUI_LIBS
+ac_cv_env_LIBGNOMEPRINTUI_LIBS_set=${LIBGNOMEPRINTUI_LIBS+set}
+ac_cv_env_LIBGNOMEPRINTUI_LIBS_value=$LIBGNOMEPRINTUI_LIBS
+ac_env_GNOMEVFS_CFLAGS_set=${GNOMEVFS_CFLAGS+set}
+ac_env_GNOMEVFS_CFLAGS_value=$GNOMEVFS_CFLAGS
+ac_cv_env_GNOMEVFS_CFLAGS_set=${GNOMEVFS_CFLAGS+set}
+ac_cv_env_GNOMEVFS_CFLAGS_value=$GNOMEVFS_CFLAGS
+ac_env_GNOMEVFS_LIBS_set=${GNOMEVFS_LIBS+set}
+ac_env_GNOMEVFS_LIBS_value=$GNOMEVFS_LIBS
+ac_cv_env_GNOMEVFS_LIBS_set=${GNOMEVFS_LIBS+set}
+ac_cv_env_GNOMEVFS_LIBS_value=$GNOMEVFS_LIBS
+ac_env_HILDON_CFLAGS_set=${HILDON_CFLAGS+set}
+ac_env_HILDON_CFLAGS_value=$HILDON_CFLAGS
+ac_cv_env_HILDON_CFLAGS_set=${HILDON_CFLAGS+set}
+ac_cv_env_HILDON_CFLAGS_value=$HILDON_CFLAGS
+ac_env_HILDON_LIBS_set=${HILDON_LIBS+set}
+ac_env_HILDON_LIBS_value=$HILDON_LIBS
+ac_cv_env_HILDON_LIBS_set=${HILDON_LIBS+set}
+ac_cv_env_HILDON_LIBS_value=$HILDON_LIBS
+ac_env_CAIRO_CFLAGS_set=${CAIRO_CFLAGS+set}
+ac_env_CAIRO_CFLAGS_value=$CAIRO_CFLAGS
+ac_cv_env_CAIRO_CFLAGS_set=${CAIRO_CFLAGS+set}
+ac_cv_env_CAIRO_CFLAGS_value=$CAIRO_CFLAGS
+ac_env_CAIRO_LIBS_set=${CAIRO_LIBS+set}
+ac_env_CAIRO_LIBS_value=$CAIRO_LIBS
+ac_cv_env_CAIRO_LIBS_set=${CAIRO_LIBS+set}
+ac_cv_env_CAIRO_LIBS_value=$CAIRO_LIBS
+ac_env_GST_CFLAGS_set=${GST_CFLAGS+set}
+ac_env_GST_CFLAGS_value=$GST_CFLAGS
+ac_cv_env_GST_CFLAGS_set=${GST_CFLAGS+set}
+ac_cv_env_GST_CFLAGS_value=$GST_CFLAGS
+ac_env_GST_LIBS_set=${GST_LIBS+set}
+ac_env_GST_LIBS_value=$GST_LIBS
+ac_cv_env_GST_LIBS_set=${GST_LIBS+set}
+ac_cv_env_GST_LIBS_value=$GST_LIBS

 
 #
 # Report the --help message.
 
 #
 # Report the --help message.


@@ -1576,6 +894,9 @@ Configuration:
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 

+_ACEOF
+
+  cat <<_ACEOF

 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                          [$ac_default_prefix]
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                          [$ac_default_prefix]


@@ -1593,22 +914,15 @@ Fine tuning of the installation directories:
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]

+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]

   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]

-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/wxwidgets]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]

 _ACEOF
 
   cat <<\_ACEOF
 _ACEOF
 
   cat <<\_ACEOF


@@ -1730,6 +1044,8 @@ Optional Features:
   --enable-protocol-ftp   FTP support in wxProtocol
   --enable-protocol-file  FILE support in wxProtocol
   --enable-threads        use threads
   --enable-protocol-ftp   FTP support in wxProtocol
   --enable-protocol-file  FILE support in wxProtocol
   --enable-threads        use threads

+  --enable-iniconf        use wxIniConfig (Win32 only)
+  --enable-regkey         use wxRegKey class (Win32 only)

   --enable-docview        use document view architecture
   --enable-help           use help subsystem
   --enable-mshtmlhelp     use MS HTML Help (win32)
   --enable-docview        use document view architecture
   --enable-help           use help subsystem
   --enable-mshtmlhelp     use MS HTML Help (win32)


@@ -1847,10 +1163,8 @@ Optional Features:
   --enable-xpm            use xpm images (XPM file format)
   --enable-icocur         use Windows ICO and CUR formats
   --enable-dccache        cache temporary wxDC objects (Win32 only)
   --enable-xpm            use xpm images (XPM file format)
   --enable-icocur         use Windows ICO and CUR formats
   --enable-dccache        cache temporary wxDC objects (Win32 only)

-  --enable-iniconf        use wxIniConfig (Win32 only)

   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
   --enable-ownerdrawn     use owner drawn controls (Win32 only)
   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
   --enable-ownerdrawn     use owner drawn controls (Win32 only)

-  --enable-regkey         use wxRegKey class (Win32 only)

   --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
   --enable-wxdib          use wxDIB class (Win32 only)
   --disable-largefile     omit support for large files
   --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
   --enable-wxdib          use wxDIB class (Win32 only)
   --disable-largefile     omit support for large files


@@ -1886,6 +1200,7 @@ Optional Packages:
   --with-libtiff          use libtiff (TIFF file format)
   --with-libxpm           use libxpm (XPM file format)
   --with-libmspack        use libmspack (CHM help files loading)
   --with-libtiff          use libtiff (TIFF file format)
   --with-libxpm           use libxpm (XPM file format)
   --with-libmspack        use libmspack (CHM help files loading)

+  --without-gtkprint      don't use GTK printing support

   --without-gnomeprint    don't use GNOME printing libraries
   --with-gnomevfs         use GNOME VFS for associating MIME types
   --with-hildon           use Hildon framework for Nokia 770
   --without-gnomeprint    don't use GNOME printing libraries
   --with-gnomevfs         use GNOME VFS for associating MIME types
   --with-hildon           use Hildon framework for Nokia 770


@@ -1912,9 +1227,8 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>

-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>

   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags


@@ -1923,7 +1237,6 @@ Some influential environment variables:
               C compiler flags for DIRECTFB, overriding pkg-config
   DIRECTFB_LIBS
               linker flags for DIRECTFB, overriding pkg-config
               C compiler flags for DIRECTFB, overriding pkg-config
   DIRECTFB_LIBS
               linker flags for DIRECTFB, overriding pkg-config

-  XMKMF       Path to xmkmf, Makefile generator for X Window System

   PANGOX_CFLAGS
               C compiler flags for PANGOX, overriding pkg-config
   PANGOX_LIBS linker flags for PANGOX, overriding pkg-config
   PANGOX_CFLAGS
               C compiler flags for PANGOX, overriding pkg-config
   PANGOX_LIBS linker flags for PANGOX, overriding pkg-config


@@ -1935,6 +1248,10 @@ Some influential environment variables:
               C compiler flags for PANGOXFT, overriding pkg-config
   PANGOXFT_LIBS
               linker flags for PANGOXFT, overriding pkg-config
               C compiler flags for PANGOXFT, overriding pkg-config
   PANGOXFT_LIBS
               linker flags for PANGOXFT, overriding pkg-config

+  GTKPRINT_CFLAGS
+              C compiler flags for GTKPRINT, overriding pkg-config
+  GTKPRINT_LIBS
+              linker flags for GTKPRINT, overriding pkg-config

   LIBGNOMEPRINTUI_CFLAGS
               C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config
   LIBGNOMEPRINTUI_LIBS
   LIBGNOMEPRINTUI_CFLAGS
               C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config
   LIBGNOMEPRINTUI_LIBS


@@ -1957,86 +1274,120 @@ it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <wx-dev@lists.wxwidgets.org>.
 _ACEOF
 
 Report bugs to <wx-dev@lists.wxwidgets.org>.
 _ACEOF

-ac_status=$?

 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.

+  ac_popdir=`pwd`

   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue

-    test -d "$ac_dir" || continue
+    test -d $ac_dir || continue

     ac_builddir=.
 
     ac_builddir=.
 

-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
+if test "$ac_dir" != .; then

   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi

 
 case $srcdir in
 
 case $srcdir in

-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.

     ac_srcdir=.
     ac_srcdir=.

-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.

     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_srcdir=$srcdir$ac_dir_suffix;

-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;

 esac
 esac

-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+          test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help

     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
+    fi
+    cd $ac_popdir

   done
 fi
 
   done
 fi
 

-test -n "$ac_init_help" && exit $ac_status
+test -n "$ac_init_help" && exit 0

 if $ac_init_version; then
   cat <<\_ACEOF
 wxWidgets configure 2.9.0
 if $ac_init_version; then
   cat <<\_ACEOF
 wxWidgets configure 2.9.0

-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.59

 
 

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.

 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF

-  exit
+  exit 0

 fi
 fi

-cat >config.log <<_ACEOF
+exec 5>config.log
+cat >&5 <<_ACEOF

 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by wxWidgets $as_me 2.9.0, which was
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by wxWidgets $as_me 2.9.0, which was

-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was

 
   $ $0 $@
 
 _ACEOF
 
   $ $0 $@
 
 _ACEOF

-exec 5>>config.log

 {
 cat <<_ASUNAME
 ## --------- ##
 {
 cat <<_ASUNAME
 ## --------- ##


@@ -2055,7 +1406,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`

-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`

 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`


@@ -2069,7 +1420,6 @@ do
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done

-IFS=$as_save_IFS

 
 } >&5
 
 
 } >&5
 


@@ -2091,6 +1441,7 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=

+ac_sep=

 ac_must_keep_next=false
 for ac_pass in 1 2
 do
 ac_must_keep_next=false
 for ac_pass in 1 2
 do


@@ -2101,7 +1452,7 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;

-    *\'*)
+    *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)

       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in


@@ -2123,7 +1474,9 @@ do
          -* ) ac_must_keep_next=true ;;
        esac
       fi
          -* ) ac_must_keep_next=true ;;
        esac
       fi

-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "

       ;;
     esac
   done
       ;;
     esac
   done


@@ -2134,8 +1487,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.

-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.

 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {


@@ -2148,34 +1501,20 @@ trap 'exit_status=$?
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,

-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
+{

   (set) 2>&1 |
   (set) 2>&1 |

-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)

       sed -n \
       sed -n \

-       "s/'\''/'\''\\\\'\'''\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
+       "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;

     *)
     *)

-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+       "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
       ;;

-    esac |
-    sort
-)
+    esac;
+}

     echo
 
     cat <<\_ASBOX
     echo
 
     cat <<\_ASBOX


@@ -2186,28 +1525,22 @@ _ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
     echo
     for ac_var in $ac_subst_vars
     do

-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"

     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX

-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
+## ------------- ##
+## Output files. ##
+## ------------- ##

 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do

-       eval ac_val=\$$ac_var
-       case $ac_val in
-       *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
-       echo "$ac_var='\''$ac_val'\''"
+       eval ac_val=$`echo $ac_var`
+       echo "$ac_var='"'"'$ac_val'"'"'"

       done | sort
       echo
     fi
       done | sort
       echo
     fi


@@ -2219,24 +1552,26 @@ _ASBOX
 ## ----------- ##
 _ASBOX
       echo
 ## ----------- ##
 _ASBOX
       echo

-      cat confdefs.h
+      sed "/^$/d" confdefs.h | sort

       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5

-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&

     exit $exit_status
     exit $exit_status

-' 0
+     ' 0

 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.

-rm -f -r conftest* confdefs.h
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h

 
 # Predefined preprocessor variables.
 
 
 # Predefined preprocessor variables.
 


@@ -2267,17 +1602,14 @@ _ACEOF
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.

-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-       "$ac_default_prefix/etc/config.site"
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi

 fi
 fi

-shift
-for ac_site_file
-do
+for ac_site_file in $CONFIG_SITE; do

   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}


@@ -2293,8 +1625,8 @@ if test -r "$cache_file"; then
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in

-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;

     esac
   fi
 else
     esac
   fi
 else


@@ -2306,11 +1638,12 @@ fi
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false

-for ac_var in $ac_precious_vars; do
+for ac_var in `(set) 2>&1 |
+              sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do

   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set

-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"

   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5


@@ -2335,7 +1668,8 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in

-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in


@@ -2352,6 +1686,12 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
    { (exit 1); exit 1; }; }
 fi
 
    { (exit 1); exit 1; }; }
 fi
 

+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+

 
 
 
 
 
 


@@ -2376,165 +1716,110 @@ fi
 
 
 
 
 
 

-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu

 
 
 
 
 
 ac_aux_dir=
 
 
 
 
 
 ac_aux_dir=

-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
+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
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break

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

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

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

     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then

-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}

    { (exit 1); exit 1; }; }
 fi
    { (exit 1); exit 1; }; }
 fi

-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.

 
 # Make sure we can run config.sub.
 
 # Make sure we can run config.sub.

-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}

    { (exit 1); exit 1; }; }
 
    { (exit 1); exit 1; }; }
 

-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6

 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&

   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }

-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}

    { (exit 1); exit 1; }; }
 
 fi
    { (exit 1); exit 1; }; }
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6

 build=$ac_cv_build
 build=$ac_cv_build

-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6

 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}

    { (exit 1); exit 1; }; }
    { (exit 1); exit 1; }; }

-fi

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6

 host=$ac_cv_host
 host=$ac_cv_host

-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6

 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+  ac_cv_target_alias=$target_alias
+test "x$ac_cv_target_alias" = "x" &&
+  ac_cv_target_alias=$ac_cv_host_alias
+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}

    { (exit 1); exit 1; }; }
    { (exit 1); exit 1; }; }

-fi

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6

 target=$ac_cv_target
 target=$ac_cv_target

-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

 
 
 # The aliases save the names the user supplied, while $host etc.
 
 
 # The aliases save the names the user supplied, while $host etc.


@@ -2982,11 +2267,12 @@ done
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; }
-          # Check whether --enable-gui was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6
+          # Check whether --enable-gui or --disable-gui was given.

 if test "${enable_gui+set}" = set; then
 if test "${enable_gui+set}" = set; then

-  enableval=$enable_gui;
+  enableval="$enable_gui"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_gui='wxUSE_GUI=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_gui='wxUSE_GUI=yes'
                           else


@@ -3006,8 +2292,7 @@ else
 
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
 
 
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_gui"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_gui"
           if test "x$cache" = xyes; then


@@ -3024,8 +2309,8 @@ fi
             result=$wxUSE_GUI
           fi
 
             result=$wxUSE_GUI
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -3038,11 +2323,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6; }
-          # Check whether --enable-monolithic was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6
+          # Check whether --enable-monolithic or --disable-monolithic was given.

 if test "${enable_monolithic+set}" = set; then
 if test "${enable_monolithic+set}" = set; then

-  enableval=$enable_monolithic;
+  enableval="$enable_monolithic"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
                           else


@@ -3062,8 +2348,7 @@ else
 
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
 
 
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_monolithic"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_monolithic"
           if test "x$cache" = xyes; then


@@ -3080,8 +2365,8 @@ fi
             result=$wxUSE_MONOLITHIC
           fi
 
             result=$wxUSE_MONOLITHIC
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -3094,11 +2379,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; }
-          # Check whether --enable-plugins was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6
+          # Check whether --enable-plugins or --disable-plugins was given.

 if test "${enable_plugins+set}" = set; then
 if test "${enable_plugins+set}" = set; then

-  enableval=$enable_plugins;
+  enableval="$enable_plugins"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_plugins='wxUSE_PLUGINS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_plugins='wxUSE_PLUGINS=yes'
                           else


@@ -3118,8 +2404,7 @@ else
 
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
 
 
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_plugins"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_plugins"
           if test "x$cache" = xyes; then


@@ -3136,8 +2421,8 @@ fi
             result=$wxUSE_PLUGINS
           fi
 
             result=$wxUSE_PLUGINS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           withstring=without
 
 
           withstring=without


@@ -3149,12 +2434,13 @@ echo "${ECHO_T}$result" >&6; }
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5
-echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5
+echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6

 
 

-# Check whether --with-subdirs was given.
+# Check whether --with-subdirs or --without-subdirs was given.

 if test "${with_subdirs+set}" = set; then
 if test "${with_subdirs+set}" = set; then

-  withval=$with_subdirs;
+  withval="$with_subdirs"
+

                         if test "$withval" = yes; then
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=yes'
                         else


@@ -3174,8 +2460,7 @@ else
 
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
 
 
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_subdirs"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_subdirs"
           if test "x$cache" = xyes; then


@@ -3192,15 +2477,15 @@ fi
             result=$wxWITH_SUBDIRS
           fi
 
             result=$wxWITH_SUBDIRS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 

-# Check whether --with-flavour was given.
+# Check whether --with-flavour or --without-flavour was given.

 if test "${with_flavour+set}" = set; then
 if test "${with_flavour+set}" = set; then

-  withval=$with_flavour; WX_FLAVOUR="$withval"
-fi
-
+  withval="$with_flavour"
+  WX_FLAVOUR="$withval"
+fi;

 
           enablestring=
           defaultval=
 
           enablestring=
           defaultval=


@@ -3212,11 +2497,12 @@ fi
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6; }
-          # Check whether --enable-official_build was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6
+          # Check whether --enable-official_build or --disable-official_build was given.

 if test "${enable_official_build+set}" = set; then
 if test "${enable_official_build+set}" = set; then

-  enableval=$enable_official_build;
+  enableval="$enable_official_build"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
                           else


@@ -3236,8 +2522,7 @@ else
 
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
 
 
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_official_build"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_official_build"
           if test "x$cache" = xyes; then


@@ -3254,14 +2539,14 @@ fi
             result=$wxUSE_OFFICIAL_BUILD
           fi
 
             result=$wxUSE_OFFICIAL_BUILD
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 

-# Check whether --enable-vendor was given.
+# Check whether --enable-vendor or --disable-vendor was given.

 if test "${enable_vendor+set}" = set; then
 if test "${enable_vendor+set}" = set; then

-  enableval=$enable_vendor; VENDOR="$enableval"
-fi
-
+  enableval="$enable_vendor"
+  VENDOR="$enableval"
+fi;

 if test "x$VENDOR" = "x"; then
     VENDOR="custom"
 fi
 if test "x$VENDOR" = "x"; then
     VENDOR="custom"
 fi


@@ -3277,11 +2562,12 @@ fi
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all-features" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6; }
-          # Check whether --enable-all-features was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all-features" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6
+          # Check whether --enable-all-features or --disable-all-features was given.

 if test "${enable_all_features+set}" = set; then
 if test "${enable_all_features+set}" = set; then

-  enableval=$enable_all_features;
+  enableval="$enable_all_features"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
                           else


@@ -3301,8 +2587,7 @@ else
 
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 
 
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_all_features"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_all_features"
           if test "x$cache" = xyes; then


@@ -3319,8 +2604,8 @@ fi
             result=$wxUSE_ALL_FEATURES
           fi
 
             result=$wxUSE_ALL_FEATURES
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -3337,11 +2622,12 @@ if test "$wxUSE_GUI" = "yes"; then
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6; }
-          # Check whether --enable-universal was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6
+          # Check whether --enable-universal or --disable-universal was given.

 if test "${enable_universal+set}" = set; then
 if test "${enable_universal+set}" = set; then

-  enableval=$enable_universal;
+  enableval="$enable_universal"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_universal='wxUSE_UNIVERSAL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_universal='wxUSE_UNIVERSAL=yes'
                           else


@@ -3361,8 +2647,7 @@ else
 
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
 
 
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_universal"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_universal"
           if test "x$cache" = xyes; then


@@ -3379,84 +2664,84 @@ fi
             result=$wxUSE_UNIVERSAL
           fi
 
             result=$wxUSE_UNIVERSAL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 if test "$wxUSE_UNIVERSAL" = "yes"; then
 
 
 if test "$wxUSE_UNIVERSAL" = "yes"; then
 

-# Check whether --with-themes was given.
+# Check whether --with-themes or --without-themes was given.

 if test "${with_themes+set}" = set; then
 if test "${with_themes+set}" = set; then

-  withval=$with_themes; wxUNIV_THEMES="$withval"
-fi
-
+  withval="$with_themes"
+  wxUNIV_THEMES="$withval"
+fi;

 fi
 
 
 fi
 
 

-# Check whether --with-gtk was given.
+# Check whether --with-gtk or --without-gtk was given.

 if test "${with_gtk+set}" = set; then
 if test "${with_gtk+set}" = set; then

-  withval=$with_gtk; wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_gtk"
+  wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-motif was given.
+# Check whether --with-motif or --without-motif was given.

 if test "${with_motif+set}" = set; then
 if test "${with_motif+set}" = set; then

-  withval=$with_motif; wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_motif"
+  wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-mac was given.
+# Check whether --with-mac or --without-mac was given.

 if test "${with_mac+set}" = set; then
 if test "${with_mac+set}" = set; then

-  withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_mac"
+  wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-cocoa was given.
+# Check whether --with-cocoa or --without-cocoa was given.

 if test "${with_cocoa+set}" = set; then
 if test "${with_cocoa+set}" = set; then

-  withval=$with_cocoa; wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_cocoa"
+  wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-wine was given.
+# Check whether --with-wine or --without-wine was given.

 if test "${with_wine+set}" = set; then
 if test "${with_wine+set}" = set; then

-  withval=$with_wine; wxUSE_WINE="$withval" CACHE_WINE=1
-fi
-
+  withval="$with_wine"
+  wxUSE_WINE="$withval" CACHE_WINE=1
+fi;

 
 

-# Check whether --with-msw was given.
+# Check whether --with-msw or --without-msw was given.

 if test "${with_msw+set}" = set; then
 if test "${with_msw+set}" = set; then

-  withval=$with_msw; wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_msw"
+  wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-pm was given.
+# Check whether --with-pm or --without-pm was given.

 if test "${with_pm+set}" = set; then
 if test "${with_pm+set}" = set; then

-  withval=$with_pm; wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_pm"
+  wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-mgl was given.
+# Check whether --with-mgl or --without-mgl was given.

 if test "${with_mgl+set}" = set; then
 if test "${with_mgl+set}" = set; then

-  withval=$with_mgl; wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_mgl"
+  wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-directfb was given.
+# Check whether --with-directfb or --without-directfb was given.

 if test "${with_directfb+set}" = set; then
 if test "${with_directfb+set}" = set; then

-  withval=$with_directfb; wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_directfb"
+  wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-microwin was given.
+# Check whether --with-microwin or --without-microwin was given.

 if test "${with_microwin+set}" = set; then
 if test "${with_microwin+set}" = set; then

-  withval=$with_microwin; wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_microwin"
+  wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1
+fi;

 
 

-# Check whether --with-x11 was given.
+# Check whether --with-x11 or --without-x11 was given.

 if test "${with_x11+set}" = set; then
 if test "${with_x11+set}" = set; then

-  withval=$with_x11; wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1
-fi
-
+  withval="$with_x11"
+  wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1
+fi;

 
           enablestring=
           defaultval=
 
           enablestring=
           defaultval=


@@ -3468,11 +2753,12 @@ fi
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; }
-          # Check whether --enable-nanox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6
+          # Check whether --enable-nanox or --disable-nanox was given.

 if test "${enable_nanox+set}" = set; then
 if test "${enable_nanox+set}" = set; then

-  enableval=$enable_nanox;
+  enableval="$enable_nanox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_nanox='wxUSE_NANOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_nanox='wxUSE_NANOX=yes'
                           else


@@ -3492,8 +2778,7 @@ else
 
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
 
 
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_nanox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_nanox"
           if test "x$cache" = xyes; then


@@ -3510,15 +2795,15 @@ fi
             result=$wxUSE_NANOX
           fi
 
             result=$wxUSE_NANOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 

-# Check whether --enable-gtk2 was given.
+# Check whether --enable-gtk2 or --disable-gtk2 was given.

 if test "${enable_gtk2+set}" = set; then
 if test "${enable_gtk2+set}" = set; then

-  enableval=$enable_gtk2; wxUSE_GTK2="$enableval"
-fi
-
+  enableval="$enable_gtk2"
+  wxUSE_GTK2="$enableval"
+fi;

 
           enablestring=
           defaultval=
 
           enablestring=
           defaultval=


@@ -3530,11 +2815,12 @@ fi
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; }
-          # Check whether --enable-gpe was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6
+          # Check whether --enable-gpe or --disable-gpe was given.

 if test "${enable_gpe+set}" = set; then
 if test "${enable_gpe+set}" = set; then

-  enableval=$enable_gpe;
+  enableval="$enable_gpe"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_gpe='wxUSE_GPE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_gpe='wxUSE_GPE=yes'
                           else


@@ -3554,8 +2840,7 @@ else
 
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
 
 
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_gpe"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_gpe"
           if test "x$cache" = xyes; then


@@ -3572,18 +2857,19 @@ fi
             result=$wxUSE_GPE
           fi
 
             result=$wxUSE_GPE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 
 
 

-          { echo "$as_me:$LINENO: checking for --with-libpng" >&5
-echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-libpng" >&5
+echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6

 
 

-# Check whether --with-libpng was given.
+# Check whether --with-libpng or --without-libpng was given.

 if test "${with_libpng+set}" = set; then
 if test "${with_libpng+set}" = set; then

-  withval=$with_libpng;
+  withval="$with_libpng"
+

                         if test "$withval" = yes; then
                           wx_cv_use_libpng='wxUSE_LIBPNG=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_libpng='wxUSE_LIBPNG=yes'
                         elif test "$withval" = no; then


@@ -3611,8 +2897,7 @@ else
 
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_libpng"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_libpng"
           if test "x$cache" = xyes; then


@@ -3620,17 +2905,17 @@ fi
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_LIBPNG" = no; then
           elif test "$wxUSE_LIBPNG" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_LIBPNG" = sys; then
           elif test "$wxUSE_LIBPNG" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_LIBPNG" = builtin; then
           elif test "$wxUSE_LIBPNG" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}


@@ -3638,12 +2923,13 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or
           fi
 
 
           fi
 
 

-          { echo "$as_me:$LINENO: checking for --with-libjpeg" >&5
-echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-libjpeg" >&5
+echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6

 
 

-# Check whether --with-libjpeg was given.
+# Check whether --with-libjpeg or --without-libjpeg was given.

 if test "${with_libjpeg+set}" = set; then
 if test "${with_libjpeg+set}" = set; then

-  withval=$with_libjpeg;
+  withval="$with_libjpeg"
+

                         if test "$withval" = yes; then
                           wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
                         elif test "$withval" = no; then


@@ -3671,8 +2957,7 @@ else
 
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_libjpeg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_libjpeg"
           if test "x$cache" = xyes; then


@@ -3680,17 +2965,17 @@ fi
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_LIBJPEG" = no; then
           elif test "$wxUSE_LIBJPEG" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_LIBJPEG" = sys; then
           elif test "$wxUSE_LIBJPEG" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_LIBJPEG" = builtin; then
           elif test "$wxUSE_LIBJPEG" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}


@@ -3698,12 +2983,13 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o
           fi
 
 
           fi
 
 

-          { echo "$as_me:$LINENO: checking for --with-libtiff" >&5
-echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-libtiff" >&5
+echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6

 
 

-# Check whether --with-libtiff was given.
+# Check whether --with-libtiff or --without-libtiff was given.

 if test "${with_libtiff+set}" = set; then
 if test "${with_libtiff+set}" = set; then

-  withval=$with_libtiff;
+  withval="$with_libtiff"
+

                         if test "$withval" = yes; then
                           wx_cv_use_libtiff='wxUSE_LIBTIFF=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_libtiff='wxUSE_LIBTIFF=yes'
                         elif test "$withval" = no; then


@@ -3731,8 +3017,7 @@ else
 
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_libtiff"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_libtiff"
           if test "x$cache" = xyes; then


@@ -3740,17 +3025,17 @@ fi
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_LIBTIFF" = no; then
           elif test "$wxUSE_LIBTIFF" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_LIBTIFF" = sys; then
           elif test "$wxUSE_LIBTIFF" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_LIBTIFF" = builtin; then
           elif test "$wxUSE_LIBTIFF" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}


@@ -3758,12 +3043,13 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o
           fi
 
 
           fi
 
 

-          { echo "$as_me:$LINENO: checking for --with-libxpm" >&5
-echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-libxpm" >&5
+echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6

 
 

-# Check whether --with-libxpm was given.
+# Check whether --with-libxpm or --without-libxpm was given.

 if test "${with_libxpm+set}" = set; then
 if test "${with_libxpm+set}" = set; then

-  withval=$with_libxpm;
+  withval="$with_libxpm"
+

                         if test "$withval" = yes; then
                           wx_cv_use_libxpm='wxUSE_LIBXPM=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_libxpm='wxUSE_LIBXPM=yes'
                         elif test "$withval" = no; then


@@ -3791,8 +3077,7 @@ else
 
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_libxpm"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_libxpm"
           if test "x$cache" = xyes; then


@@ -3800,17 +3085,17 @@ fi
           fi
 
           if test "$wxUSE_LIBXPM" = yes; then
           fi
 
           if test "$wxUSE_LIBXPM" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_LIBXPM" = no; then
           elif test "$wxUSE_LIBXPM" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_LIBXPM" = sys; then
           elif test "$wxUSE_LIBXPM" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_LIBXPM" = builtin; then
           elif test "$wxUSE_LIBXPM" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}


@@ -3827,12 +3112,13 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5
-echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5
+echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6

 
 

-# Check whether --with-libmspack was given.
+# Check whether --with-libmspack or --without-libmspack was given.

 if test "${with_libmspack+set}" = set; then
 if test "${with_libmspack+set}" = set; then

-  withval=$with_libmspack;
+  withval="$with_libmspack"
+

                         if test "$withval" = yes; then
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
                         else


@@ -3852,8 +3138,7 @@ else
 
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
 
 
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_libmspack"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_libmspack"
           if test "x$cache" = xyes; then


@@ -3870,8 +3155,8 @@ fi
             result=$wxUSE_LIBMSPACK
           fi
 
             result=$wxUSE_LIBMSPACK
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           withstring=without
 
 
           withstring=without


@@ -3883,12 +3168,69 @@ echo "${ECHO_T}$result" >&6; }
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
-echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-gtkprint" >&5
+echo $ECHO_N "checking for --${withstring:-with}-gtkprint... $ECHO_C" >&6
+
+# Check whether --with-gtkprint or --without-gtkprint was given.
+if test "${with_gtkprint+set}" = set; then
+  withval="$with_gtkprint"
+
+                        if test "$withval" = yes; then
+                          wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes'
+                        else
+                          wx_cv_use_gtkprint='wxUSE_GTKPRINT=no'
+                        fi
+                        cache=yes

 
 

-# Check whether --with-gnomeprint was given.
+else
+
+                        LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
+                        fi
+
+                        wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}"
+
+fi;
+
+          eval "$wx_cv_use_gtkprint"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_GTKPRINT = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_GTKPRINT
+          fi
+
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6
+
+
+          withstring=without
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
+echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6
+
+# Check whether --with-gnomeprint or --without-gnomeprint was given.

 if test "${with_gnomeprint+set}" = set; then
 if test "${with_gnomeprint+set}" = set; then

-  withval=$with_gnomeprint;
+  withval="$with_gnomeprint"
+

                         if test "$withval" = yes; then
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
                         else


@@ -3908,8 +3250,7 @@ else
 
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
 
 
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_gnomeprint"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_gnomeprint"
           if test "x$cache" = xyes; then


@@ -3926,8 +3267,8 @@ fi
             result=$wxUSE_LIBGNOMEPRINT
           fi
 
             result=$wxUSE_LIBGNOMEPRINT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           withstring=
 
 
           withstring=


@@ -3939,12 +3280,13 @@ echo "${ECHO_T}$result" >&6; }
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5
-echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5
+echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6

 
 

-# Check whether --with-gnomevfs was given.
+# Check whether --with-gnomevfs or --without-gnomevfs was given.

 if test "${with_gnomevfs+set}" = set; then
 if test "${with_gnomevfs+set}" = set; then

-  withval=$with_gnomevfs;
+  withval="$with_gnomevfs"
+

                         if test "$withval" = yes; then
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
                         else


@@ -3964,8 +3306,7 @@ else
 
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
 
 
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_gnomevfs"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_gnomevfs"
           if test "x$cache" = xyes; then


@@ -3982,8 +3323,8 @@ fi
             result=$wxUSE_LIBGNOMEVFS
           fi
 
             result=$wxUSE_LIBGNOMEVFS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           withstring=
 
 
           withstring=


@@ -3995,12 +3336,13 @@ echo "${ECHO_T}$result" >&6; }
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5
-echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5
+echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6

 
 

-# Check whether --with-hildon was given.
+# Check whether --with-hildon or --without-hildon was given.

 if test "${with_hildon+set}" = set; then
 if test "${with_hildon+set}" = set; then

-  withval=$with_hildon;
+  withval="$with_hildon"
+

                         if test "$withval" = yes; then
                           wx_cv_use_hildon='wxUSE_LIBHILDON=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_hildon='wxUSE_LIBHILDON=yes'
                         else


@@ -4020,8 +3362,7 @@ else
 
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
 
 
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_hildon"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_hildon"
           if test "x$cache" = xyes; then


@@ -4038,8 +3379,8 @@ fi
             result=$wxUSE_LIBHILDON
           fi
 
             result=$wxUSE_LIBHILDON
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           withstring=
 
 
           withstring=


@@ -4051,12 +3392,13 @@ echo "${ECHO_T}$result" >&6; }
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5
-echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5
+echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6

 
 

-# Check whether --with-opengl was given.
+# Check whether --with-opengl or --without-opengl was given.

 if test "${with_opengl+set}" = set; then
 if test "${with_opengl+set}" = set; then

-  withval=$with_opengl;
+  withval="$with_opengl"
+

                         if test "$withval" = yes; then
                           wx_cv_use_opengl='wxUSE_OPENGL=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_opengl='wxUSE_OPENGL=yes'
                         else


@@ -4076,8 +3418,7 @@ else
 
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
 
 
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_opengl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_opengl"
           if test "x$cache" = xyes; then


@@ -4094,8 +3435,8 @@ fi
             result=$wxUSE_OPENGL
           fi
 
             result=$wxUSE_OPENGL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 fi
 
 
 fi


@@ -4110,12 +3451,13 @@ fi
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5
-echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5
+echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6

 
 

-# Check whether --with-dmalloc was given.
+# Check whether --with-dmalloc or --without-dmalloc was given.

 if test "${with_dmalloc+set}" = set; then
 if test "${with_dmalloc+set}" = set; then

-  withval=$with_dmalloc;
+  withval="$with_dmalloc"
+

                         if test "$withval" = yes; then
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=yes'
                         else


@@ -4135,8 +3477,7 @@ else
 
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
 
 
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dmalloc"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dmalloc"
           if test "x$cache" = xyes; then


@@ -4153,8 +3494,8 @@ fi
             result=$wxUSE_DMALLOC
           fi
 
             result=$wxUSE_DMALLOC
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           withstring=
 
 
           withstring=


@@ -4166,12 +3507,13 @@ echo "${ECHO_T}$result" >&6; }
                   defaultval=no
               fi
           fi
                   defaultval=no
               fi
           fi

-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5
-echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5
+echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6

 
 

-# Check whether --with-sdl was given.
+# Check whether --with-sdl or --without-sdl was given.

 if test "${with_sdl+set}" = set; then
 if test "${with_sdl+set}" = set; then

-  withval=$with_sdl;
+  withval="$with_sdl"
+

                         if test "$withval" = yes; then
                           wx_cv_use_sdl='wxUSE_LIBSDL=yes'
                         else
                         if test "$withval" = yes; then
                           wx_cv_use_sdl='wxUSE_LIBSDL=yes'
                         else


@@ -4191,8 +3533,7 @@ else
 
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
 
 
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_sdl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_sdl"
           if test "x$cache" = xyes; then


@@ -4209,16 +3550,17 @@ fi
             result=$wxUSE_LIBSDL
           fi
 
             result=$wxUSE_LIBSDL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 

-          { echo "$as_me:$LINENO: checking for --with-regex" >&5
-echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-regex" >&5
+echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6

 
 

-# Check whether --with-regex was given.
+# Check whether --with-regex or --without-regex was given.

 if test "${with_regex+set}" = set; then
 if test "${with_regex+set}" = set; then

-  withval=$with_regex;
+  withval="$with_regex"
+

                         if test "$withval" = yes; then
                           wx_cv_use_regex='wxUSE_REGEX=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_regex='wxUSE_REGEX=yes'
                         elif test "$withval" = no; then


@@ -4246,8 +3588,7 @@ else
 
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_regex"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_regex"
           if test "x$cache" = xyes; then


@@ -4255,17 +3596,17 @@ fi
           fi
 
           if test "$wxUSE_REGEX" = yes; then
           fi
 
           if test "$wxUSE_REGEX" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_REGEX" = no; then
           elif test "$wxUSE_REGEX" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_REGEX" = sys; then
           elif test "$wxUSE_REGEX" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_REGEX" = builtin; then
           elif test "$wxUSE_REGEX" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}


@@ -4273,12 +3614,13 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or
           fi
 
 
           fi
 
 

-          { echo "$as_me:$LINENO: checking for --with-zlib" >&5
-echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-zlib" >&5
+echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6

 
 

-# Check whether --with-zlib was given.
+# Check whether --with-zlib or --without-zlib was given.

 if test "${with_zlib+set}" = set; then
 if test "${with_zlib+set}" = set; then

-  withval=$with_zlib;
+  withval="$with_zlib"
+

                         if test "$withval" = yes; then
                           wx_cv_use_zlib='wxUSE_ZLIB=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_zlib='wxUSE_ZLIB=yes'
                         elif test "$withval" = no; then


@@ -4306,8 +3648,7 @@ else
 
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_zlib"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_zlib"
           if test "x$cache" = xyes; then


@@ -4315,17 +3656,17 @@ fi
           fi
 
           if test "$wxUSE_ZLIB" = yes; then
           fi
 
           if test "$wxUSE_ZLIB" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_ZLIB" = no; then
           elif test "$wxUSE_ZLIB" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_ZLIB" = sys; then
           elif test "$wxUSE_ZLIB" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_ZLIB" = builtin; then
           elif test "$wxUSE_ZLIB" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}


@@ -4333,12 +3674,13 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
           fi
 
 
           fi
 
 

-          { echo "$as_me:$LINENO: checking for --with-odbc" >&5
-echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-odbc" >&5
+echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6

 
 

-# Check whether --with-odbc was given.
+# Check whether --with-odbc or --without-odbc was given.

 if test "${with_odbc+set}" = set; then
 if test "${with_odbc+set}" = set; then

-  withval=$with_odbc;
+  withval="$with_odbc"
+

                         if test "$withval" = yes; then
                           wx_cv_use_odbc='wxUSE_ODBC=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_odbc='wxUSE_ODBC=yes'
                         elif test "$withval" = no; then


@@ -4366,8 +3708,7 @@ else
 
                         wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_odbc"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_odbc"
           if test "x$cache" = xyes; then


@@ -4375,17 +3716,17 @@ fi
           fi
 
           if test "$wxUSE_ODBC" = yes; then
           fi
 
           if test "$wxUSE_ODBC" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_ODBC" = no; then
           elif test "$wxUSE_ODBC" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_ODBC" = sys; then
           elif test "$wxUSE_ODBC" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_ODBC" = builtin; then
           elif test "$wxUSE_ODBC" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}


@@ -4393,12 +3734,13 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b
           fi
 
 
           fi
 
 

-          { echo "$as_me:$LINENO: checking for --with-expat" >&5
-echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for --with-expat" >&5
+echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6

 
 

-# Check whether --with-expat was given.
+# Check whether --with-expat or --without-expat was given.

 if test "${with_expat+set}" = set; then
 if test "${with_expat+set}" = set; then

-  withval=$with_expat;
+  withval="$with_expat"
+

                         if test "$withval" = yes; then
                           wx_cv_use_expat='wxUSE_EXPAT=yes'
                         elif test "$withval" = no; then
                         if test "$withval" = yes; then
                           wx_cv_use_expat='wxUSE_EXPAT=yes'
                         elif test "$withval" = no; then


@@ -4426,8 +3768,7 @@ else
 
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
 
 
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_expat"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_expat"
           if test "x$cache" = xyes; then


@@ -4435,17 +3776,17 @@ fi
           fi
 
           if test "$wxUSE_EXPAT" = yes; then
           fi
 
           if test "$wxUSE_EXPAT" = yes; then

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           elif test "$wxUSE_EXPAT" = no; then
           elif test "$wxUSE_EXPAT" = no; then

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           elif test "$wxUSE_EXPAT" = sys; then
           elif test "$wxUSE_EXPAT" = sys; then

-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6

           elif test "$wxUSE_EXPAT" = builtin; then
           elif test "$wxUSE_EXPAT" = builtin; then

-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
           else
             { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}


@@ -4453,12 +3794,13 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
           fi
 
 
           fi
 
 

-{ echo "$as_me:$LINENO: checking for --with-macosx-sdk" >&5
-echo $ECHO_N "checking for --with-macosx-sdk... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for --with-macosx-sdk" >&5
+echo $ECHO_N "checking for --with-macosx-sdk... $ECHO_C" >&6

 
 

-# Check whether --with-macosx-sdk was given.
+# Check whether --with-macosx-sdk or --without-macosx-sdk was given.

 if test "${with_macosx_sdk+set}" = set; then
 if test "${with_macosx_sdk+set}" = set; then

-  withval=$with_macosx_sdk;
+  withval="$with_macosx_sdk"
+

         wxUSE_MACOSX_SDK=$withval
         wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
         echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp
         wxUSE_MACOSX_SDK=$withval
         wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
         echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp


@@ -4474,17 +3816,17 @@ else
             echo "$LINE" >> ${wx_arg_cache_file}.tmp
         fi
 
             echo "$LINE" >> ${wx_arg_cache_file}.tmp
         fi
 

-fi
-
-{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_SDK" >&5
-echo "${ECHO_T}$wxUSE_MACOSX_SDK" >&6; }
+fi;
+echo "$as_me:$LINENO: result: $wxUSE_MACOSX_SDK" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_SDK" >&6

 
 

-{ echo "$as_me:$LINENO: checking for --with-macosx-version-min" >&5
-echo $ECHO_N "checking for --with-macosx-version-min... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for --with-macosx-version-min" >&5
+echo $ECHO_N "checking for --with-macosx-version-min... $ECHO_C" >&6

 
 

-# Check whether --with-macosx-version-min was given.
+# Check whether --with-macosx-version-min or --without-macosx-version-min was given.

 if test "${with_macosx_version_min+set}" = set; then
 if test "${with_macosx_version_min+set}" = set; then

-  withval=$with_macosx_version_min;
+  withval="$with_macosx_version_min"
+

         wxUSE_MACOSX_VERSION_MIN=$withval
         wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
         echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp
         wxUSE_MACOSX_VERSION_MIN=$withval
         wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
         echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp


@@ -4501,10 +3843,9 @@ else
             echo "$LINE" >> ${wx_arg_cache_file}.tmp
         fi
 
             echo "$LINE" >> ${wx_arg_cache_file}.tmp
         fi
 

-fi
-
-{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
-echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
+fi;
+echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6

 
 
 
 
 
 


@@ -4518,11 +3859,12 @@ echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
-          # Check whether --enable-shared was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6
+          # Check whether --enable-shared or --disable-shared was given.

 if test "${enable_shared+set}" = set; then
 if test "${enable_shared+set}" = set; then

-  enableval=$enable_shared;
+  enableval="$enable_shared"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_shared='wxUSE_SHARED=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_shared='wxUSE_SHARED=yes'
                           else


@@ -4542,8 +3884,7 @@ else
 
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
 
 
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_shared"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_shared"
           if test "x$cache" = xyes; then


@@ -4560,8 +3901,8 @@ fi
             result=$wxUSE_SHARED
           fi
 
             result=$wxUSE_SHARED
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=disable
 
 
           enablestring=disable


@@ -4574,11 +3915,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
-          # Check whether --enable-optimise was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6
+          # Check whether --enable-optimise or --disable-optimise was given.

 if test "${enable_optimise+set}" = set; then
 if test "${enable_optimise+set}" = set; then

-  enableval=$enable_optimise;
+  enableval="$enable_optimise"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
                           else


@@ -4598,8 +3940,7 @@ else
 
                           wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
 
 
                           wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_optimise"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_optimise"
           if test "x$cache" = xyes; then


@@ -4616,8 +3957,8 @@ fi
             result=$wxUSE_OPTIMISE
           fi
 
             result=$wxUSE_OPTIMISE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -4630,11 +3971,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
-          # Check whether --enable-debug was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6
+          # Check whether --enable-debug or --disable-debug was given.

 if test "${enable_debug+set}" = set; then
 if test "${enable_debug+set}" = set; then

-  enableval=$enable_debug;
+  enableval="$enable_debug"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_debug='wxUSE_DEBUG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_debug='wxUSE_DEBUG=yes'
                           else


@@ -4654,8 +3996,7 @@ else
 
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
 
 
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_debug"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_debug"
           if test "x$cache" = xyes; then


@@ -4672,8 +4013,8 @@ fi
             result=$wxUSE_DEBUG
           fi
 
             result=$wxUSE_DEBUG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -4686,11 +4027,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
-          # Check whether --enable-stl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6
+          # Check whether --enable-stl or --disable-stl was given.

 if test "${enable_stl+set}" = set; then
 if test "${enable_stl+set}" = set; then

-  enableval=$enable_stl;
+  enableval="$enable_stl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_stl='wxUSE_STL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_stl='wxUSE_STL=yes'
                           else


@@ -4710,8 +4052,7 @@ else
 
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
 
 
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_stl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_stl"
           if test "x$cache" = xyes; then


@@ -4728,8 +4069,8 @@ fi
             result=$wxUSE_STL
           fi
 
             result=$wxUSE_STL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -4742,11 +4083,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; }
-          # Check whether --enable-std_iostreams was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6
+          # Check whether --enable-std_iostreams or --disable-std_iostreams was given.

 if test "${enable_std_iostreams+set}" = set; then
 if test "${enable_std_iostreams+set}" = set; then

-  enableval=$enable_std_iostreams;
+  enableval="$enable_std_iostreams"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
                           else


@@ -4766,8 +4108,7 @@ else
 
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
 
 
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_std_iostreams"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_std_iostreams"
           if test "x$cache" = xyes; then


@@ -4784,8 +4125,8 @@ fi
             result=$wxUSE_STD_IOSTREAM
           fi
 
             result=$wxUSE_STD_IOSTREAM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -4798,11 +4139,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; }
-          # Check whether --enable-std_string was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6
+          # Check whether --enable-std_string or --disable-std_string was given.

 if test "${enable_std_string+set}" = set; then
 if test "${enable_std_string+set}" = set; then

-  enableval=$enable_std_string;
+  enableval="$enable_std_string"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_std_string='wxUSE_STD_STRING=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_std_string='wxUSE_STD_STRING=yes'
                           else


@@ -4822,8 +4164,7 @@ else
 
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
 
 
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_std_string"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_std_string"
           if test "x$cache" = xyes; then


@@ -4840,8 +4181,8 @@ fi
             result=$wxUSE_STD_STRING
           fi
 
             result=$wxUSE_STD_STRING
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=disable
 
 
           enablestring=disable


@@ -4854,11 +4195,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; }
-          # Check whether --enable-unicode was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6
+          # Check whether --enable-unicode or --disable-unicode was given.

 if test "${enable_unicode+set}" = set; then
 if test "${enable_unicode+set}" = set; then

-  enableval=$enable_unicode;
+  enableval="$enable_unicode"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_unicode='wxUSE_UNICODE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_unicode='wxUSE_UNICODE=yes'
                           else


@@ -4878,8 +4220,7 @@ else
 
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
 
 
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_unicode"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_unicode"
           if test "x$cache" = xyes; then


@@ -4896,8 +4237,8 @@ fi
             result=$wxUSE_UNICODE
           fi
 
             result=$wxUSE_UNICODE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -4910,11 +4251,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; }
-          # Check whether --enable-mslu was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6
+          # Check whether --enable-mslu or --disable-mslu was given.

 if test "${enable_mslu+set}" = set; then
 if test "${enable_mslu+set}" = set; then

-  enableval=$enable_mslu;
+  enableval="$enable_mslu"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
                           else


@@ -4934,8 +4276,7 @@ else
 
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
 
 
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mslu"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mslu"
           if test "x$cache" = xyes; then


@@ -4952,16 +4293,17 @@ fi
             result=$wxUSE_UNICODE_MSLU
           fi
 
             result=$wxUSE_UNICODE_MSLU
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; }
-          # Check whether --enable-utf8 was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6
+          # Check whether --enable-utf8 or --disable-utf8 was given.

 if test "${enable_utf8+set}" = set; then
 if test "${enable_utf8+set}" = set; then

-  enableval=$enable_utf8;
+  enableval="$enable_utf8"
+

                           wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
                           cache=yes
 
                           wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
                           cache=yes
 


@@ -4977,16 +4319,15 @@ else
 
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
 
 
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
 

-fi
-
+fi;

 
           eval "$wx_cv_use_utf8"
           if test "x$cache" = xyes; then
             echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp
           fi
 
 
           eval "$wx_cv_use_utf8"
           if test "x$cache" = xyes; then
             echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp
           fi
 

-          { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
-echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
+          echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
+echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -4999,11 +4340,12 @@ echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; }
-          # Check whether --enable-utf8only was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6
+          # Check whether --enable-utf8only or --disable-utf8only was given.

 if test "${enable_utf8only+set}" = set; then
 if test "${enable_utf8only+set}" = set; then

-  enableval=$enable_utf8only;
+  enableval="$enable_utf8only"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
                           else


@@ -5023,8 +4365,7 @@ else
 
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
 
 
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_utf8only"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_utf8only"
           if test "x$cache" = xyes; then


@@ -5041,8 +4382,8 @@ fi
             result=$wxUSE_UNICODE_UTF8_LOCALE
           fi
 
             result=$wxUSE_UNICODE_UTF8_LOCALE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5055,11 +4396,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; }
-          # Check whether --enable-extended_rtti was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6
+          # Check whether --enable-extended_rtti or --disable-extended_rtti was given.

 if test "${enable_extended_rtti+set}" = set; then
 if test "${enable_extended_rtti+set}" = set; then

-  enableval=$enable_extended_rtti;
+  enableval="$enable_extended_rtti"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
                           else


@@ -5079,8 +4421,7 @@ else
 
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
 
 
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_extended_rtti"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_extended_rtti"
           if test "x$cache" = xyes; then


@@ -5097,8 +4438,8 @@ fi
             result=$wxUSE_EXTENDED_RTTI
           fi
 
             result=$wxUSE_EXTENDED_RTTI
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 if test "$USE_OS2" = "1"; then
     DEFAULT_wxUSE_OMF=no
 
 if test "$USE_OS2" = "1"; then
     DEFAULT_wxUSE_OMF=no


@@ -5113,11 +4454,12 @@ if test "$USE_OS2" = "1"; then
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
-          # Check whether --enable-omf was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6
+          # Check whether --enable-omf or --disable-omf was given.

 if test "${enable_omf+set}" = set; then
 if test "${enable_omf+set}" = set; then

-  enableval=$enable_omf;
+  enableval="$enable_omf"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_omf='wxUSE_OMF=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_omf='wxUSE_OMF=yes'
                           else


@@ -5137,8 +4479,7 @@ else
 
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
 
 
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_omf"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_omf"
           if test "x$cache" = xyes; then


@@ -5155,8 +4496,8 @@ fi
             result=$wxUSE_OMF
           fi
 
             result=$wxUSE_OMF
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 fi
 
 
 fi
 


@@ -5181,11 +4522,12 @@ fi
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
-          # Check whether --enable-debug_flag was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6
+          # Check whether --enable-debug_flag or --disable-debug_flag was given.

 if test "${enable_debug_flag+set}" = set; then
 if test "${enable_debug_flag+set}" = set; then

-  enableval=$enable_debug_flag;
+  enableval="$enable_debug_flag"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                           else


@@ -5205,8 +4547,7 @@ else
 
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
 
 
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_debug_flag"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_debug_flag"
           if test "x$cache" = xyes; then


@@ -5223,8 +4564,8 @@ fi
             result=$wxUSE_DEBUG_FLAG
           fi
 
             result=$wxUSE_DEBUG_FLAG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5237,11 +4578,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
-          # Check whether --enable-debug_info was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6
+          # Check whether --enable-debug_info or --disable-debug_info was given.

 if test "${enable_debug_info+set}" = set; then
 if test "${enable_debug_info+set}" = set; then

-  enableval=$enable_debug_info;
+  enableval="$enable_debug_info"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                           else


@@ -5261,8 +4603,7 @@ else
 
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
 
 
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_debug_info"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_debug_info"
           if test "x$cache" = xyes; then


@@ -5279,8 +4620,8 @@ fi
             result=$wxUSE_DEBUG_INFO
           fi
 
             result=$wxUSE_DEBUG_INFO
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5293,11 +4634,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
-          # Check whether --enable-debug_gdb was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6
+          # Check whether --enable-debug_gdb or --disable-debug_gdb was given.

 if test "${enable_debug_gdb+set}" = set; then
 if test "${enable_debug_gdb+set}" = set; then

-  enableval=$enable_debug_gdb;
+  enableval="$enable_debug_gdb"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
                           else


@@ -5317,8 +4659,7 @@ else
 
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
 
 
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_debug_gdb"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_debug_gdb"
           if test "x$cache" = xyes; then


@@ -5335,8 +4676,8 @@ fi
             result=$wxUSE_DEBUG_GDB
           fi
 
             result=$wxUSE_DEBUG_GDB
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5349,11 +4690,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
-          # Check whether --enable-debug_cntxt was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6
+          # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.

 if test "${enable_debug_cntxt+set}" = set; then
 if test "${enable_debug_cntxt+set}" = set; then

-  enableval=$enable_debug_cntxt;
+  enableval="$enable_debug_cntxt"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                           else


@@ -5373,8 +4715,7 @@ else
 
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
 
 
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_debug_cntxt"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_debug_cntxt"
           if test "x$cache" = xyes; then


@@ -5391,8 +4732,8 @@ fi
             result=$wxUSE_DEBUG_CONTEXT
           fi
 
             result=$wxUSE_DEBUG_CONTEXT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5405,11 +4746,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
-          # Check whether --enable-mem_tracing was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6
+          # Check whether --enable-mem_tracing or --disable-mem_tracing was given.

 if test "${enable_mem_tracing+set}" = set; then
 if test "${enable_mem_tracing+set}" = set; then

-  enableval=$enable_mem_tracing;
+  enableval="$enable_mem_tracing"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
                           else


@@ -5429,8 +4771,7 @@ else
 
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
 
 
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mem_tracing"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mem_tracing"
           if test "x$cache" = xyes; then


@@ -5447,8 +4788,8 @@ fi
             result=$wxUSE_MEM_TRACING
           fi
 
             result=$wxUSE_MEM_TRACING
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5461,11 +4802,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; }
-          # Check whether --enable-profile was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6
+          # Check whether --enable-profile or --disable-profile was given.

 if test "${enable_profile+set}" = set; then
 if test "${enable_profile+set}" = set; then

-  enableval=$enable_profile;
+  enableval="$enable_profile"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_profile='wxUSE_PROFILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_profile='wxUSE_PROFILE=yes'
                           else


@@ -5485,8 +4827,7 @@ else
 
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
 
 
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_profile"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_profile"
           if test "x$cache" = xyes; then


@@ -5503,8 +4844,8 @@ fi
             result=$wxUSE_PROFILE
           fi
 
             result=$wxUSE_PROFILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5517,11 +4858,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_rtti" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; }
-          # Check whether --enable-no_rtti was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_rtti" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6
+          # Check whether --enable-no_rtti or --disable-no_rtti was given.

 if test "${enable_no_rtti+set}" = set; then
 if test "${enable_no_rtti+set}" = set; then

-  enableval=$enable_no_rtti;
+  enableval="$enable_no_rtti"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
                           else


@@ -5541,8 +4883,7 @@ else
 
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
 
 
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_no_rtti"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_no_rtti"
           if test "x$cache" = xyes; then


@@ -5559,8 +4900,8 @@ fi
             result=$wxUSE_NO_RTTI
           fi
 
             result=$wxUSE_NO_RTTI
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5573,11 +4914,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6; }
-          # Check whether --enable-no_exceptions was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6
+          # Check whether --enable-no_exceptions or --disable-no_exceptions was given.

 if test "${enable_no_exceptions+set}" = set; then
 if test "${enable_no_exceptions+set}" = set; then

-  enableval=$enable_no_exceptions;
+  enableval="$enable_no_exceptions"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
                           else


@@ -5597,8 +4939,7 @@ else
 
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
 
 
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_no_exceptions"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_no_exceptions"
           if test "x$cache" = xyes; then


@@ -5615,8 +4956,8 @@ fi
             result=$wxUSE_NO_EXCEPTIONS
           fi
 
             result=$wxUSE_NO_EXCEPTIONS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5629,11 +4970,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6; }
-          # Check whether --enable-permissive was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6
+          # Check whether --enable-permissive or --disable-permissive was given.

 if test "${enable_permissive+set}" = set; then
 if test "${enable_permissive+set}" = set; then

-  enableval=$enable_permissive;
+  enableval="$enable_permissive"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=yes'
                           else


@@ -5653,8 +4995,7 @@ else
 
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
 
 
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_permissive"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_permissive"
           if test "x$cache" = xyes; then


@@ -5671,8 +5012,8 @@ fi
             result=$wxUSE_PERMISSIVE
           fi
 
             result=$wxUSE_PERMISSIVE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -5685,11 +5026,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_deps" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; }
-          # Check whether --enable-no_deps was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_deps" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6
+          # Check whether --enable-no_deps or --disable-no_deps was given.

 if test "${enable_no_deps+set}" = set; then
 if test "${enable_no_deps+set}" = set; then

-  enableval=$enable_no_deps;
+  enableval="$enable_no_deps"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=yes'
                           else


@@ -5709,8 +5051,7 @@ else
 
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
 
 
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_no_deps"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_no_deps"
           if test "x$cache" = xyes; then


@@ -5727,8 +5068,8 @@ fi
             result=$wxUSE_NO_DEPS
           fi
 
             result=$wxUSE_NO_DEPS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=disable
 
 
           enablestring=disable


@@ -5741,11 +5082,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6; }
-          # Check whether --enable-vararg_macros was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6
+          # Check whether --enable-vararg_macros or --disable-vararg_macros was given.

 if test "${enable_vararg_macros+set}" = set; then
 if test "${enable_vararg_macros+set}" = set; then

-  enableval=$enable_vararg_macros;
+  enableval="$enable_vararg_macros"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
                           else


@@ -5765,8 +5107,7 @@ else
 
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
 
 
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_vararg_macros"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_vararg_macros"
           if test "x$cache" = xyes; then


@@ -5783,16 +5124,17 @@ fi
             result=$wxUSE_VARARG_MACROS
           fi
 
             result=$wxUSE_VARARG_MACROS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; }
-          # Check whether --enable-universal_binary was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6
+          # Check whether --enable-universal_binary or --disable-universal_binary was given.

 if test "${enable_universal_binary+set}" = set; then
 if test "${enable_universal_binary+set}" = set; then

-  enableval=$enable_universal_binary;
+  enableval="$enable_universal_binary"
+

                           wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
                           cache=yes
 
                           wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
                           cache=yes
 


@@ -5808,16 +5150,15 @@ else
 
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
 
 
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
 

-fi
-
+fi;

 
           eval "$wx_cv_use_universal_binary"
           if test "x$cache" = xyes; then
             echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp
           fi
 
 
           eval "$wx_cv_use_universal_binary"
           if test "x$cache" = xyes; then
             echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp
           fi
 

-          { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5
-echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
+          echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5
+echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6

 
 
 
 
 
 


@@ -5831,11 +5172,12 @@ echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
-          # Check whether --enable-compat26 was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6
+          # Check whether --enable-compat26 or --disable-compat26 was given.

 if test "${enable_compat26+set}" = set; then
 if test "${enable_compat26+set}" = set; then

-  enableval=$enable_compat26;
+  enableval="$enable_compat26"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
                           else


@@ -5855,8 +5197,7 @@ else
 
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
 
 
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_compat26"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_compat26"
           if test "x$cache" = xyes; then


@@ -5873,8 +5214,8 @@ fi
             result=$WXWIN_COMPATIBILITY_2_6
           fi
 
             result=$WXWIN_COMPATIBILITY_2_6
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=disable
 
 
           enablestring=disable


@@ -5887,11 +5228,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
-          # Check whether --enable-compat28 was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6
+          # Check whether --enable-compat28 or --disable-compat28 was given.

 if test "${enable_compat28+set}" = set; then
 if test "${enable_compat28+set}" = set; then

-  enableval=$enable_compat28;
+  enableval="$enable_compat28"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
                           else


@@ -5911,8 +5253,7 @@ else
 
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
 
 
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_compat28"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_compat28"
           if test "x$cache" = xyes; then


@@ -5929,8 +5270,8 @@ fi
             result=$WXWIN_COMPATIBILITY_2_8
           fi
 
             result=$WXWIN_COMPATIBILITY_2_8
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -5944,11 +5285,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; }
-          # Check whether --enable-rpath was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6
+          # Check whether --enable-rpath or --disable-rpath was given.

 if test "${enable_rpath+set}" = set; then
 if test "${enable_rpath+set}" = set; then

-  enableval=$enable_rpath;
+  enableval="$enable_rpath"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_rpath='wxUSE_RPATH=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_rpath='wxUSE_RPATH=yes'
                           else


@@ -5968,8 +5310,7 @@ else
 
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
 
 
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_rpath"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_rpath"
           if test "x$cache" = xyes; then


@@ -5986,8 +5327,8 @@ fi
             result=$wxUSE_RPATH
           fi
 
             result=$wxUSE_RPATH
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -6001,11 +5342,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6; }
-          # Check whether --enable-objc_uniquifying was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6
+          # Check whether --enable-objc_uniquifying or --disable-objc_uniquifying was given.

 if test "${enable_objc_uniquifying+set}" = set; then
 if test "${enable_objc_uniquifying+set}" = set; then

-  enableval=$enable_objc_uniquifying;
+  enableval="$enable_objc_uniquifying"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
                           else


@@ -6025,8 +5367,7 @@ else
 
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
 
 
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_objc_uniquifying"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_objc_uniquifying"
           if test "x$cache" = xyes; then


@@ -6043,8 +5384,8 @@ fi
             result=$wxUSE_OBJC_UNIQUIFYING
           fi
 
             result=$wxUSE_OBJC_UNIQUIFYING
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -6058,11 +5399,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-visibility" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; }
-          # Check whether --enable-visibility was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-visibility" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6
+          # Check whether --enable-visibility or --disable-visibility was given.

 if test "${enable_visibility+set}" = set; then
 if test "${enable_visibility+set}" = set; then

-  enableval=$enable_visibility;
+  enableval="$enable_visibility"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_visibility='wxUSE_VISIBILITY=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_visibility='wxUSE_VISIBILITY=yes'
                           else


@@ -6082,8 +5424,7 @@ else
 
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
 
 
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_visibility"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_visibility"
           if test "x$cache" = xyes; then


@@ -6100,8 +5441,8 @@ fi
             result=$wxUSE_VISIBILITY
           fi
 
             result=$wxUSE_VISIBILITY
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -6116,11 +5457,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; }
-          # Check whether --enable-intl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6
+          # Check whether --enable-intl or --disable-intl was given.

 if test "${enable_intl+set}" = set; then
 if test "${enable_intl+set}" = set; then

-  enableval=$enable_intl;
+  enableval="$enable_intl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_intl='wxUSE_INTL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_intl='wxUSE_INTL=yes'
                           else


@@ -6140,8 +5482,7 @@ else
 
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
 
 
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_intl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_intl"
           if test "x$cache" = xyes; then


@@ -6158,8 +5499,8 @@ fi
             result=$wxUSE_INTL
           fi
 
             result=$wxUSE_INTL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6172,11 +5513,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; }
-          # Check whether --enable-config was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6
+          # Check whether --enable-config or --disable-config was given.

 if test "${enable_config+set}" = set; then
 if test "${enable_config+set}" = set; then

-  enableval=$enable_config;
+  enableval="$enable_config"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_config='wxUSE_CONFIG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_config='wxUSE_CONFIG=yes'
                           else


@@ -6196,8 +5538,7 @@ else
 
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
 
 
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_config"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_config"
           if test "x$cache" = xyes; then


@@ -6214,8 +5555,8 @@ fi
             result=$wxUSE_CONFIG
           fi
 
             result=$wxUSE_CONFIG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -6229,11 +5570,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6; }
-          # Check whether --enable-protocols was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6
+          # Check whether --enable-protocols or --disable-protocols was given.

 if test "${enable_protocols+set}" = set; then
 if test "${enable_protocols+set}" = set; then

-  enableval=$enable_protocols;
+  enableval="$enable_protocols"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_protocols='wxUSE_PROTOCOL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_protocols='wxUSE_PROTOCOL=yes'
                           else


@@ -6253,8 +5595,7 @@ else
 
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_protocols"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_protocols"
           if test "x$cache" = xyes; then


@@ -6271,8 +5612,8 @@ fi
             result=$wxUSE_PROTOCOL
           fi
 
             result=$wxUSE_PROTOCOL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6285,11 +5626,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; }
-          # Check whether --enable-ftp was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6
+          # Check whether --enable-ftp or --disable-ftp was given.

 if test "${enable_ftp+set}" = set; then
 if test "${enable_ftp+set}" = set; then

-  enableval=$enable_ftp;
+  enableval="$enable_ftp"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else


@@ -6309,8 +5651,7 @@ else
 
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_ftp"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_ftp"
           if test "x$cache" = xyes; then


@@ -6327,8 +5668,8 @@ fi
             result=$wxUSE_PROTOCOL_FTP
           fi
 
             result=$wxUSE_PROTOCOL_FTP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6341,11 +5682,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; }
-          # Check whether --enable-http was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6
+          # Check whether --enable-http or --disable-http was given.

 if test "${enable_http+set}" = set; then
 if test "${enable_http+set}" = set; then

-  enableval=$enable_http;
+  enableval="$enable_http"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
                           else


@@ -6365,8 +5707,7 @@ else
 
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_http"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_http"
           if test "x$cache" = xyes; then


@@ -6383,8 +5724,8 @@ fi
             result=$wxUSE_PROTOCOL_HTTP
           fi
 
             result=$wxUSE_PROTOCOL_HTTP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6397,11 +5738,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6; }
-          # Check whether --enable-fileproto was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6
+          # Check whether --enable-fileproto or --disable-fileproto was given.

 if test "${enable_fileproto+set}" = set; then
 if test "${enable_fileproto+set}" = set; then

-  enableval=$enable_fileproto;
+  enableval="$enable_fileproto"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
                           else


@@ -6421,8 +5763,7 @@ else
 
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fileproto"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fileproto"
           if test "x$cache" = xyes; then


@@ -6439,8 +5780,8 @@ fi
             result=$wxUSE_PROTOCOL_FILE
           fi
 
             result=$wxUSE_PROTOCOL_FILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6453,11 +5794,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; }
-          # Check whether --enable-sockets was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6
+          # Check whether --enable-sockets or --disable-sockets was given.

 if test "${enable_sockets+set}" = set; then
 if test "${enable_sockets+set}" = set; then

-  enableval=$enable_sockets;
+  enableval="$enable_sockets"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_sockets='wxUSE_SOCKETS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_sockets='wxUSE_SOCKETS=yes'
                           else


@@ -6477,8 +5819,7 @@ else
 
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
 
 
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_sockets"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_sockets"
           if test "x$cache" = xyes; then


@@ -6495,8 +5836,8 @@ fi
             result=$wxUSE_SOCKETS
           fi
 
             result=$wxUSE_SOCKETS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6509,11 +5850,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; }
-          # Check whether --enable-ole was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6
+          # Check whether --enable-ole or --disable-ole was given.

 if test "${enable_ole+set}" = set; then
 if test "${enable_ole+set}" = set; then

-  enableval=$enable_ole;
+  enableval="$enable_ole"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_ole='wxUSE_OLE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_ole='wxUSE_OLE=yes'
                           else


@@ -6533,8 +5875,7 @@ else
 
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
 
 
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_ole"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_ole"
           if test "x$cache" = xyes; then


@@ -6551,8 +5892,8 @@ fi
             result=$wxUSE_OLE
           fi
 
             result=$wxUSE_OLE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6565,11 +5906,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; }
-          # Check whether --enable-dataobj was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6
+          # Check whether --enable-dataobj or --disable-dataobj was given.

 if test "${enable_dataobj+set}" = set; then
 if test "${enable_dataobj+set}" = set; then

-  enableval=$enable_dataobj;
+  enableval="$enable_dataobj"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=yes'
                           else


@@ -6589,8 +5931,7 @@ else
 
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
 
 
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dataobj"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dataobj"
           if test "x$cache" = xyes; then


@@ -6607,8 +5948,8 @@ fi
             result=$wxUSE_DATAOBJ
           fi
 
             result=$wxUSE_DATAOBJ
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -6622,11 +5963,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; }
-          # Check whether --enable-ipc was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6
+          # Check whether --enable-ipc or --disable-ipc was given.

 if test "${enable_ipc+set}" = set; then
 if test "${enable_ipc+set}" = set; then

-  enableval=$enable_ipc;
+  enableval="$enable_ipc"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_ipc='wxUSE_IPC=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_ipc='wxUSE_IPC=yes'
                           else


@@ -6646,8 +5988,7 @@ else
 
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
 
 
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_ipc"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_ipc"
           if test "x$cache" = xyes; then


@@ -6664,8 +6005,8 @@ fi
             result=$wxUSE_IPC
           fi
 
             result=$wxUSE_IPC
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -6679,11 +6020,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-baseevtloop" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6; }
-          # Check whether --enable-baseevtloop was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-baseevtloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6
+          # Check whether --enable-baseevtloop or --disable-baseevtloop was given.

 if test "${enable_baseevtloop+set}" = set; then
 if test "${enable_baseevtloop+set}" = set; then

-  enableval=$enable_baseevtloop;
+  enableval="$enable_baseevtloop"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes'
                           else


@@ -6703,8 +6045,7 @@ else
 
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
 
 
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_baseevtloop"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_baseevtloop"
           if test "x$cache" = xyes; then


@@ -6721,8 +6062,8 @@ fi
             result=$wxUSE_CONSOLE_EVENTLOOP
           fi
 
             result=$wxUSE_CONSOLE_EVENTLOOP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6735,11 +6076,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epoolloop" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; }
-          # Check whether --enable-epoolloop was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epoolloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6
+          # Check whether --enable-epoolloop or --disable-epoolloop was given.

 if test "${enable_epoolloop+set}" = set; then
 if test "${enable_epoolloop+set}" = set; then

-  enableval=$enable_epoolloop;
+  enableval="$enable_epoolloop"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes'
                           else


@@ -6759,8 +6101,7 @@ else
 
                           wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
 
 
                           wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_epoolloop"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_epoolloop"
           if test "x$cache" = xyes; then


@@ -6777,8 +6118,8 @@ fi
             result=$wxUSE_EPOLL_DISPATCHER
           fi
 
             result=$wxUSE_EPOLL_DISPATCHER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6791,11 +6132,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-selectloop" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6; }
-          # Check whether --enable-selectloop was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-selectloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6
+          # Check whether --enable-selectloop or --disable-selectloop was given.

 if test "${enable_selectloop+set}" = set; then
 if test "${enable_selectloop+set}" = set; then

-  enableval=$enable_selectloop;
+  enableval="$enable_selectloop"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes'
                           else


@@ -6815,8 +6157,7 @@ else
 
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
 
 
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_selectloop"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_selectloop"
           if test "x$cache" = xyes; then


@@ -6833,8 +6174,8 @@ fi
             result=$wxUSE_SELECT_DISPATCHER
           fi
 
             result=$wxUSE_SELECT_DISPATCHER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -6848,11 +6189,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6; }
-          # Check whether --enable-apple_ieee was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6
+          # Check whether --enable-apple_ieee or --disable-apple_ieee was given.

 if test "${enable_apple_ieee+set}" = set; then
 if test "${enable_apple_ieee+set}" = set; then

-  enableval=$enable_apple_ieee;
+  enableval="$enable_apple_ieee"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
                           else


@@ -6872,8 +6214,7 @@ else
 
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
 
 
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_apple_ieee"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_apple_ieee"
           if test "x$cache" = xyes; then


@@ -6890,8 +6231,8 @@ fi
             result=$wxUSE_APPLE_IEEE
           fi
 
             result=$wxUSE_APPLE_IEEE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6904,11 +6245,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6; }
-          # Check whether --enable-arcstream was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6
+          # Check whether --enable-arcstream or --disable-arcstream was given.

 if test "${enable_arcstream+set}" = set; then
 if test "${enable_arcstream+set}" = set; then

-  enableval=$enable_arcstream;
+  enableval="$enable_arcstream"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
                           else


@@ -6928,8 +6270,7 @@ else
 
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
 
 
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_arcstream"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_arcstream"
           if test "x$cache" = xyes; then


@@ -6946,8 +6287,8 @@ fi
             result=$wxUSE_ARCHIVE_STREAMS
           fi
 
             result=$wxUSE_ARCHIVE_STREAMS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -6960,11 +6301,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-base64" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6; }
-          # Check whether --enable-base64 was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-base64" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6
+          # Check whether --enable-base64 or --disable-base64 was given.

 if test "${enable_base64+set}" = set; then
 if test "${enable_base64+set}" = set; then

-  enableval=$enable_base64;
+  enableval="$enable_base64"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_base64='wxUSE_BASE64=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_base64='wxUSE_BASE64=yes'
                           else


@@ -6984,8 +6326,7 @@ else
 
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
 
 
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_base64"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_base64"
           if test "x$cache" = xyes; then


@@ -7002,8 +6343,8 @@ fi
             result=$wxUSE_BASE64
           fi
 
             result=$wxUSE_BASE64
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7016,11 +6357,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6; }
-          # Check whether --enable-backtrace was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6
+          # Check whether --enable-backtrace or --disable-backtrace was given.

 if test "${enable_backtrace+set}" = set; then
 if test "${enable_backtrace+set}" = set; then

-  enableval=$enable_backtrace;
+  enableval="$enable_backtrace"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=yes'
                           else


@@ -7040,8 +6382,7 @@ else
 
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
 
 
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_backtrace"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_backtrace"
           if test "x$cache" = xyes; then


@@ -7058,8 +6399,8 @@ fi
             result=$wxUSE_STACKWALKER
           fi
 
             result=$wxUSE_STACKWALKER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7072,11 +6413,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; }
-          # Check whether --enable-catch_segvs was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
+          # Check whether --enable-catch_segvs or --disable-catch_segvs was given.

 if test "${enable_catch_segvs+set}" = set; then
 if test "${enable_catch_segvs+set}" = set; then

-  enableval=$enable_catch_segvs;
+  enableval="$enable_catch_segvs"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
                           else


@@ -7096,8 +6438,7 @@ else
 
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
 
 
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_catch_segvs"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_catch_segvs"
           if test "x$cache" = xyes; then


@@ -7114,8 +6455,8 @@ fi
             result=$wxUSE_ON_FATAL_EXCEPTION
           fi
 
             result=$wxUSE_ON_FATAL_EXCEPTION
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7128,11 +6469,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; }
-          # Check whether --enable-cmdline was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6
+          # Check whether --enable-cmdline or --disable-cmdline was given.

 if test "${enable_cmdline+set}" = set; then
 if test "${enable_cmdline+set}" = set; then

-  enableval=$enable_cmdline;
+  enableval="$enable_cmdline"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                           else


@@ -7152,8 +6494,7 @@ else
 
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
 
 
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_cmdline"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_cmdline"
           if test "x$cache" = xyes; then


@@ -7170,8 +6511,8 @@ fi
             result=$wxUSE_CMDLINE_PARSER
           fi
 
             result=$wxUSE_CMDLINE_PARSER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7184,11 +6525,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; }
-          # Check whether --enable-datetime was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6
+          # Check whether --enable-datetime or --disable-datetime was given.

 if test "${enable_datetime+set}" = set; then
 if test "${enable_datetime+set}" = set; then

-  enableval=$enable_datetime;
+  enableval="$enable_datetime"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_datetime='wxUSE_DATETIME=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_datetime='wxUSE_DATETIME=yes'
                           else


@@ -7208,8 +6550,7 @@ else
 
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
 
 
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_datetime"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_datetime"
           if test "x$cache" = xyes; then


@@ -7226,8 +6567,8 @@ fi
             result=$wxUSE_DATETIME
           fi
 
             result=$wxUSE_DATETIME
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7240,11 +6581,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; }
-          # Check whether --enable-debugreport was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6
+          # Check whether --enable-debugreport or --disable-debugreport was given.

 if test "${enable_debugreport+set}" = set; then
 if test "${enable_debugreport+set}" = set; then

-  enableval=$enable_debugreport;
+  enableval="$enable_debugreport"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
                           else


@@ -7264,8 +6606,7 @@ else
 
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
 
 
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_debugreport"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_debugreport"
           if test "x$cache" = xyes; then


@@ -7282,8 +6623,8 @@ fi
             result=$wxUSE_DEBUGREPORT
           fi
 
             result=$wxUSE_DEBUGREPORT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7296,11 +6637,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6; }
-          # Check whether --enable-dialupman was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6
+          # Check whether --enable-dialupman or --disable-dialupman was given.

 if test "${enable_dialupman+set}" = set; then
 if test "${enable_dialupman+set}" = set; then

-  enableval=$enable_dialupman;
+  enableval="$enable_dialupman"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                           else


@@ -7320,8 +6662,7 @@ else
 
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
 
 
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dialupman"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dialupman"
           if test "x$cache" = xyes; then


@@ -7338,8 +6679,8 @@ fi
             result=$wxUSE_DIALUP_MANAGER
           fi
 
             result=$wxUSE_DIALUP_MANAGER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7352,11 +6693,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; }
-          # Check whether --enable-dynlib was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6
+          # Check whether --enable-dynlib or --disable-dynlib was given.

 if test "${enable_dynlib+set}" = set; then
 if test "${enable_dynlib+set}" = set; then

-  enableval=$enable_dynlib;
+  enableval="$enable_dynlib"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                           else


@@ -7376,8 +6718,7 @@ else
 
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
 
 
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dynlib"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dynlib"
           if test "x$cache" = xyes; then


@@ -7394,8 +6735,8 @@ fi
             result=$wxUSE_DYNLIB_CLASS
           fi
 
             result=$wxUSE_DYNLIB_CLASS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7408,11 +6749,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6; }
-          # Check whether --enable-dynamicloader was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6
+          # Check whether --enable-dynamicloader or --disable-dynamicloader was given.

 if test "${enable_dynamicloader+set}" = set; then
 if test "${enable_dynamicloader+set}" = set; then

-  enableval=$enable_dynamicloader;
+  enableval="$enable_dynamicloader"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
                           else


@@ -7432,8 +6774,7 @@ else
 
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
 
 
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dynamicloader"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dynamicloader"
           if test "x$cache" = xyes; then


@@ -7450,8 +6791,8 @@ fi
             result=$wxUSE_DYNAMIC_LOADER
           fi
 
             result=$wxUSE_DYNAMIC_LOADER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7464,11 +6805,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6; }
-          # Check whether --enable-exceptions was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6
+          # Check whether --enable-exceptions or --disable-exceptions was given.

 if test "${enable_exceptions+set}" = set; then
 if test "${enable_exceptions+set}" = set; then

-  enableval=$enable_exceptions;
+  enableval="$enable_exceptions"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
                           else


@@ -7488,8 +6830,7 @@ else
 
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
 
 
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_exceptions"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_exceptions"
           if test "x$cache" = xyes; then


@@ -7506,8 +6847,8 @@ fi
             result=$wxUSE_EXCEPTIONS
           fi
 
             result=$wxUSE_EXCEPTIONS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7520,11 +6861,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; }
-          # Check whether --enable-ffile was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6
+          # Check whether --enable-ffile or --disable-ffile was given.

 if test "${enable_ffile+set}" = set; then
 if test "${enable_ffile+set}" = set; then

-  enableval=$enable_ffile;
+  enableval="$enable_ffile"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_ffile='wxUSE_FFILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_ffile='wxUSE_FFILE=yes'
                           else


@@ -7544,8 +6886,7 @@ else
 
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
 
 
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_ffile"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_ffile"
           if test "x$cache" = xyes; then


@@ -7562,8 +6903,8 @@ fi
             result=$wxUSE_FFILE
           fi
 
             result=$wxUSE_FFILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7576,11 +6917,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; }
-          # Check whether --enable-file was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6
+          # Check whether --enable-file or --disable-file was given.

 if test "${enable_file+set}" = set; then
 if test "${enable_file+set}" = set; then

-  enableval=$enable_file;
+  enableval="$enable_file"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_file='wxUSE_FILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_file='wxUSE_FILE=yes'
                           else


@@ -7600,8 +6942,7 @@ else
 
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
 
 
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_file"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_file"
           if test "x$cache" = xyes; then


@@ -7618,8 +6959,8 @@ fi
             result=$wxUSE_FILE
           fi
 
             result=$wxUSE_FILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7632,11 +6973,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6; }
-          # Check whether --enable-filesystem was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6
+          # Check whether --enable-filesystem or --disable-filesystem was given.

 if test "${enable_filesystem+set}" = set; then
 if test "${enable_filesystem+set}" = set; then

-  enableval=$enable_filesystem;
+  enableval="$enable_filesystem"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
                           else


@@ -7656,8 +6998,7 @@ else
 
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
 
 
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_filesystem"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_filesystem"
           if test "x$cache" = xyes; then


@@ -7674,8 +7015,8 @@ fi
             result=$wxUSE_FILESYSTEM
           fi
 
             result=$wxUSE_FILESYSTEM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7688,11 +7029,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontenum" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fontenum... $ECHO_C" >&6; }
-          # Check whether --enable-fontenum was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontenum" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontenum... $ECHO_C" >&6
+          # Check whether --enable-fontenum or --disable-fontenum was given.

 if test "${enable_fontenum+set}" = set; then
 if test "${enable_fontenum+set}" = set; then

-  enableval=$enable_fontenum;
+  enableval="$enable_fontenum"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fontenum='wxUSE_FONTENUM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fontenum='wxUSE_FONTENUM=yes'
                           else


@@ -7712,8 +7054,7 @@ else
 
                           wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
 
 
                           wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fontenum"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fontenum"
           if test "x$cache" = xyes; then


@@ -7730,8 +7071,8 @@ fi
             result=$wxUSE_FONTENUM
           fi
 
             result=$wxUSE_FONTENUM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7744,11 +7085,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; }
-          # Check whether --enable-fontmap was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6
+          # Check whether --enable-fontmap or --disable-fontmap was given.

 if test "${enable_fontmap+set}" = set; then
 if test "${enable_fontmap+set}" = set; then

-  enableval=$enable_fontmap;
+  enableval="$enable_fontmap"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fontmap='wxUSE_FONTMAP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fontmap='wxUSE_FONTMAP=yes'
                           else


@@ -7768,8 +7110,7 @@ else
 
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
 
 
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fontmap"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fontmap"
           if test "x$cache" = xyes; then


@@ -7786,8 +7127,8 @@ fi
             result=$wxUSE_FONTMAP
           fi
 
             result=$wxUSE_FONTMAP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7800,11 +7141,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6; }
-          # Check whether --enable-fs_archive was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6
+          # Check whether --enable-fs_archive or --disable-fs_archive was given.

 if test "${enable_fs_archive+set}" = set; then
 if test "${enable_fs_archive+set}" = set; then

-  enableval=$enable_fs_archive;
+  enableval="$enable_fs_archive"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
                           else


@@ -7824,8 +7166,7 @@ else
 
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
 
 
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fs_archive"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fs_archive"
           if test "x$cache" = xyes; then


@@ -7842,8 +7183,8 @@ fi
             result=$wxUSE_FS_ARCHIVE
           fi
 
             result=$wxUSE_FS_ARCHIVE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7856,11 +7197,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; }
-          # Check whether --enable-fs_inet was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6
+          # Check whether --enable-fs_inet or --disable-fs_inet was given.

 if test "${enable_fs_inet+set}" = set; then
 if test "${enable_fs_inet+set}" = set; then

-  enableval=$enable_fs_inet;
+  enableval="$enable_fs_inet"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fs_inet='wxUSE_FS_INET=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_inet='wxUSE_FS_INET=yes'
                           else


@@ -7880,8 +7222,7 @@ else
 
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
 
 
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fs_inet"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fs_inet"
           if test "x$cache" = xyes; then


@@ -7898,8 +7239,8 @@ fi
             result=$wxUSE_FS_INET
           fi
 
             result=$wxUSE_FS_INET
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7912,11 +7253,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; }
-          # Check whether --enable-fs_zip was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6
+          # Check whether --enable-fs_zip or --disable-fs_zip was given.

 if test "${enable_fs_zip+set}" = set; then
 if test "${enable_fs_zip+set}" = set; then

-  enableval=$enable_fs_zip;
+  enableval="$enable_fs_zip"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
                           else


@@ -7936,8 +7278,7 @@ else
 
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
 
 
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fs_zip"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fs_zip"
           if test "x$cache" = xyes; then


@@ -7954,8 +7295,8 @@ fi
             result=$wxUSE_FS_ZIP
           fi
 
             result=$wxUSE_FS_ZIP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -7968,11 +7309,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; }
-          # Check whether --enable-geometry was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6
+          # Check whether --enable-geometry or --disable-geometry was given.

 if test "${enable_geometry+set}" = set; then
 if test "${enable_geometry+set}" = set; then

-  enableval=$enable_geometry;
+  enableval="$enable_geometry"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_geometry='wxUSE_GEOMETRY=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_geometry='wxUSE_GEOMETRY=yes'
                           else


@@ -7992,8 +7334,7 @@ else
 
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
 
 
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_geometry"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_geometry"
           if test "x$cache" = xyes; then


@@ -8010,8 +7351,8 @@ fi
             result=$wxUSE_GEOMETRY
           fi
 
             result=$wxUSE_GEOMETRY
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8024,11 +7365,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; }
-          # Check whether --enable-log was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6
+          # Check whether --enable-log or --disable-log was given.

 if test "${enable_log+set}" = set; then
 if test "${enable_log+set}" = set; then

-  enableval=$enable_log;
+  enableval="$enable_log"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_log='wxUSE_LOG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_log='wxUSE_LOG=yes'
                           else


@@ -8048,8 +7390,7 @@ else
 
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
 
 
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_log"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_log"
           if test "x$cache" = xyes; then


@@ -8066,8 +7407,8 @@ fi
             result=$wxUSE_LOG
           fi
 
             result=$wxUSE_LOG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8080,11 +7421,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; }
-          # Check whether --enable-longlong was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6
+          # Check whether --enable-longlong or --disable-longlong was given.

 if test "${enable_longlong+set}" = set; then
 if test "${enable_longlong+set}" = set; then

-  enableval=$enable_longlong;
+  enableval="$enable_longlong"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_longlong='wxUSE_LONGLONG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_longlong='wxUSE_LONGLONG=yes'
                           else


@@ -8104,8 +7446,7 @@ else
 
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
 
 
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_longlong"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_longlong"
           if test "x$cache" = xyes; then


@@ -8122,8 +7463,8 @@ fi
             result=$wxUSE_LONGLONG
           fi
 
             result=$wxUSE_LONGLONG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8136,11 +7477,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; }
-          # Check whether --enable-mimetype was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6
+          # Check whether --enable-mimetype or --disable-mimetype was given.

 if test "${enable_mimetype+set}" = set; then
 if test "${enable_mimetype+set}" = set; then

-  enableval=$enable_mimetype;
+  enableval="$enable_mimetype"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                           else


@@ -8160,8 +7502,7 @@ else
 
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
 
 
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mimetype"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mimetype"
           if test "x$cache" = xyes; then


@@ -8178,8 +7519,8 @@ fi
             result=$wxUSE_MIMETYPE
           fi
 
             result=$wxUSE_MIMETYPE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8192,11 +7533,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; }
-          # Check whether --enable-snglinst was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6
+          # Check whether --enable-snglinst or --disable-snglinst was given.

 if test "${enable_snglinst+set}" = set; then
 if test "${enable_snglinst+set}" = set; then

-  enableval=$enable_snglinst;
+  enableval="$enable_snglinst"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                           else


@@ -8216,8 +7558,7 @@ else
 
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
 
 
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_snglinst"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_snglinst"
           if test "x$cache" = xyes; then


@@ -8234,8 +7575,8 @@ fi
             result=$wxUSE_SNGLINST_CHECKER
           fi
 
             result=$wxUSE_SNGLINST_CHECKER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8248,11 +7589,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; }
-          # Check whether --enable-stdpaths was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6
+          # Check whether --enable-stdpaths or --disable-stdpaths was given.

 if test "${enable_stdpaths+set}" = set; then
 if test "${enable_stdpaths+set}" = set; then

-  enableval=$enable_stdpaths;
+  enableval="$enable_stdpaths"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=yes'
                           else


@@ -8272,8 +7614,7 @@ else
 
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
 
 
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_stdpaths"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_stdpaths"
           if test "x$cache" = xyes; then


@@ -8290,8 +7631,8 @@ fi
             result=$wxUSE_STDPATHS
           fi
 
             result=$wxUSE_STDPATHS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8304,11 +7645,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6; }
-          # Check whether --enable-stopwatch was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6
+          # Check whether --enable-stopwatch or --disable-stopwatch was given.

 if test "${enable_stopwatch+set}" = set; then
 if test "${enable_stopwatch+set}" = set; then

-  enableval=$enable_stopwatch;
+  enableval="$enable_stopwatch"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                           else


@@ -8328,8 +7670,7 @@ else
 
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
 
 
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_stopwatch"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_stopwatch"
           if test "x$cache" = xyes; then


@@ -8346,8 +7687,8 @@ fi
             result=$wxUSE_STOPWATCH
           fi
 
             result=$wxUSE_STOPWATCH
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8360,11 +7701,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; }
-          # Check whether --enable-streams was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6
+          # Check whether --enable-streams or --disable-streams was given.

 if test "${enable_streams+set}" = set; then
 if test "${enable_streams+set}" = set; then

-  enableval=$enable_streams;
+  enableval="$enable_streams"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_streams='wxUSE_STREAMS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_streams='wxUSE_STREAMS=yes'
                           else


@@ -8384,8 +7726,7 @@ else
 
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
 
 
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_streams"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_streams"
           if test "x$cache" = xyes; then


@@ -8402,8 +7743,8 @@ fi
             result=$wxUSE_STREAMS
           fi
 
             result=$wxUSE_STREAMS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8416,11 +7757,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; }
-          # Check whether --enable-system_options was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6
+          # Check whether --enable-system_options or --disable-system_options was given.

 if test "${enable_system_options+set}" = set; then
 if test "${enable_system_options+set}" = set; then

-  enableval=$enable_system_options;
+  enableval="$enable_system_options"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                           else


@@ -8440,8 +7782,7 @@ else
 
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
 
 
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_system_options"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_system_options"
           if test "x$cache" = xyes; then


@@ -8458,8 +7799,8 @@ fi
             result=$wxUSE_SYSTEM_OPTIONS
           fi
 
             result=$wxUSE_SYSTEM_OPTIONS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8472,11 +7813,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6; }
-          # Check whether --enable-tarstream was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6
+          # Check whether --enable-tarstream or --disable-tarstream was given.

 if test "${enable_tarstream+set}" = set; then
 if test "${enable_tarstream+set}" = set; then

-  enableval=$enable_tarstream;
+  enableval="$enable_tarstream"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=yes'
                           else


@@ -8496,8 +7838,7 @@ else
 
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
 
 
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_tarstream"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_tarstream"
           if test "x$cache" = xyes; then


@@ -8514,8 +7855,8 @@ fi
             result=$wxUSE_TARSTREAM
           fi
 
             result=$wxUSE_TARSTREAM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8528,11 +7869,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; }
-          # Check whether --enable-textbuf was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6
+          # Check whether --enable-textbuf or --disable-textbuf was given.

 if test "${enable_textbuf+set}" = set; then
 if test "${enable_textbuf+set}" = set; then

-  enableval=$enable_textbuf;
+  enableval="$enable_textbuf"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
                           else


@@ -8552,8 +7894,7 @@ else
 
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
 
 
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_textbuf"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_textbuf"
           if test "x$cache" = xyes; then


@@ -8570,8 +7911,8 @@ fi
             result=$wxUSE_TEXTBUFFER
           fi
 
             result=$wxUSE_TEXTBUFFER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8584,11 +7925,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; }
-          # Check whether --enable-textfile was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6
+          # Check whether --enable-textfile or --disable-textfile was given.

 if test "${enable_textfile+set}" = set; then
 if test "${enable_textfile+set}" = set; then

-  enableval=$enable_textfile;
+  enableval="$enable_textfile"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_textfile='wxUSE_TEXTFILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_textfile='wxUSE_TEXTFILE=yes'
                           else


@@ -8608,8 +7950,7 @@ else
 
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
 
 
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_textfile"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_textfile"
           if test "x$cache" = xyes; then


@@ -8626,8 +7967,8 @@ fi
             result=$wxUSE_TEXTFILE
           fi
 
             result=$wxUSE_TEXTFILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8640,11 +7981,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; }
-          # Check whether --enable-timer was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6
+          # Check whether --enable-timer or --disable-timer was given.

 if test "${enable_timer+set}" = set; then
 if test "${enable_timer+set}" = set; then

-  enableval=$enable_timer;
+  enableval="$enable_timer"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_timer='wxUSE_TIMER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_timer='wxUSE_TIMER=yes'
                           else


@@ -8664,8 +8006,7 @@ else
 
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
 
 
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_timer"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_timer"
           if test "x$cache" = xyes; then


@@ -8682,8 +8023,8 @@ fi
             result=$wxUSE_TIMER
           fi
 
             result=$wxUSE_TIMER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8696,11 +8037,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
-          # Check whether --enable-sound was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6
+          # Check whether --enable-sound or --disable-sound was given.

 if test "${enable_sound+set}" = set; then
 if test "${enable_sound+set}" = set; then

-  enableval=$enable_sound;
+  enableval="$enable_sound"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_sound='wxUSE_SOUND=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_sound='wxUSE_SOUND=yes'
                           else


@@ -8720,8 +8062,7 @@ else
 
                           wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
 
 
                           wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_sound"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_sound"
           if test "x$cache" = xyes; then


@@ -8738,8 +8079,8 @@ fi
             result=$wxUSE_SOUND
           fi
 
             result=$wxUSE_SOUND
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8752,11 +8093,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
-          # Check whether --enable-mediactrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6
+          # Check whether --enable-mediactrl or --disable-mediactrl was given.

 if test "${enable_mediactrl+set}" = set; then
 if test "${enable_mediactrl+set}" = set; then

-  enableval=$enable_mediactrl;
+  enableval="$enable_mediactrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
                           else


@@ -8776,8 +8118,7 @@ else
 
                           wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
 
 
                           wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mediactrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mediactrl"
           if test "x$cache" = xyes; then


@@ -8794,8 +8135,8 @@ fi
             result=$wxUSE_MEDIACTRL
           fi
 
             result=$wxUSE_MEDIACTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8808,11 +8149,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
-          # Check whether --enable-gstreamer8 was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6
+          # Check whether --enable-gstreamer8 or --disable-gstreamer8 was given.

 if test "${enable_gstreamer8+set}" = set; then
 if test "${enable_gstreamer8+set}" = set; then

-  enableval=$enable_gstreamer8;
+  enableval="$enable_gstreamer8"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
                           else


@@ -8832,8 +8174,7 @@ else
 
                           wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
 
 
                           wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_gstreamer8"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_gstreamer8"
           if test "x$cache" = xyes; then


@@ -8850,8 +8191,8 @@ fi
             result=$wxUSE_GSTREAMER8
           fi
 
             result=$wxUSE_GSTREAMER8
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8864,11 +8205,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; }
-          # Check whether --enable-printfposparam was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6
+          # Check whether --enable-printfposparam or --disable-printfposparam was given.

 if test "${enable_printfposparam+set}" = set; then
 if test "${enable_printfposparam+set}" = set; then

-  enableval=$enable_printfposparam;
+  enableval="$enable_printfposparam"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
                           else


@@ -8888,8 +8230,7 @@ else
 
                           wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
 
 
                           wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_printfposparam"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_printfposparam"
           if test "x$cache" = xyes; then


@@ -8906,8 +8247,8 @@ fi
             result=$wxUSE_PRINTF_POS_PARAMS
           fi
 
             result=$wxUSE_PRINTF_POS_PARAMS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -8920,11 +8261,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6; }
-          # Check whether --enable-zipstream was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6
+          # Check whether --enable-zipstream or --disable-zipstream was given.

 if test "${enable_zipstream+set}" = set; then
 if test "${enable_zipstream+set}" = set; then

-  enableval=$enable_zipstream;
+  enableval="$enable_zipstream"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                           else


@@ -8944,8 +8286,7 @@ else
 
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
 
 
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_zipstream"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_zipstream"
           if test "x$cache" = xyes; then


@@ -8962,8 +8303,8 @@ fi
             result=$wxUSE_ZIPSTREAM
           fi
 
             result=$wxUSE_ZIPSTREAM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -8977,11 +8318,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; }
-          # Check whether --enable-url was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6
+          # Check whether --enable-url or --disable-url was given.

 if test "${enable_url+set}" = set; then
 if test "${enable_url+set}" = set; then

-  enableval=$enable_url;
+  enableval="$enable_url"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_url='wxUSE_URL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_url='wxUSE_URL=yes'
                           else


@@ -9001,8 +8343,7 @@ else
 
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
 
 
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_url"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_url"
           if test "x$cache" = xyes; then


@@ -9019,8 +8360,8 @@ fi
             result=$wxUSE_URL
           fi
 
             result=$wxUSE_URL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9033,11 +8374,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
-          # Check whether --enable-variant was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6
+          # Check whether --enable-variant or --disable-variant was given.

 if test "${enable_variant+set}" = set; then
 if test "${enable_variant+set}" = set; then

-  enableval=$enable_variant;
+  enableval="$enable_variant"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_variant='wxUSE_VARIANT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_variant='wxUSE_VARIANT=yes'
                           else


@@ -9057,8 +8399,7 @@ else
 
                           wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
 
 
                           wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_variant"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_variant"
           if test "x$cache" = xyes; then


@@ -9075,8 +8416,8 @@ fi
             result=$wxUSE_VARIANT
           fi
 
             result=$wxUSE_VARIANT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9089,11 +8430,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; }
-          # Check whether --enable-protocol was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6
+          # Check whether --enable-protocol or --disable-protocol was given.

 if test "${enable_protocol+set}" = set; then
 if test "${enable_protocol+set}" = set; then

-  enableval=$enable_protocol;
+  enableval="$enable_protocol"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_protocol='wxUSE_PROTOCOL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_protocol='wxUSE_PROTOCOL=yes'
                           else


@@ -9113,8 +8455,7 @@ else
 
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_protocol"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_protocol"
           if test "x$cache" = xyes; then


@@ -9131,8 +8472,8 @@ fi
             result=$wxUSE_PROTOCOL
           fi
 
             result=$wxUSE_PROTOCOL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9145,11 +8486,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_http" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6; }
-          # Check whether --enable-protocol_http was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_http" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6
+          # Check whether --enable-protocol_http or --disable-protocol_http was given.

 if test "${enable_protocol_http+set}" = set; then
 if test "${enable_protocol_http+set}" = set; then

-  enableval=$enable_protocol_http;
+  enableval="$enable_protocol_http"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
                           else


@@ -9169,8 +8511,7 @@ else
 
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_protocol_http"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_protocol_http"
           if test "x$cache" = xyes; then


@@ -9187,8 +8528,8 @@ fi
             result=$wxUSE_PROTOCOL_HTTP
           fi
 
             result=$wxUSE_PROTOCOL_HTTP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9201,11 +8542,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_ftp" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6; }
-          # Check whether --enable-protocol_ftp was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_ftp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6
+          # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given.

 if test "${enable_protocol_ftp+set}" = set; then
 if test "${enable_protocol_ftp+set}" = set; then

-  enableval=$enable_protocol_ftp;
+  enableval="$enable_protocol_ftp"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else


@@ -9225,8 +8567,7 @@ else
 
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_protocol_ftp"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_protocol_ftp"
           if test "x$cache" = xyes; then


@@ -9243,8 +8584,8 @@ fi
             result=$wxUSE_PROTOCOL_FTP
           fi
 
             result=$wxUSE_PROTOCOL_FTP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9257,11 +8598,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_file" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6; }
-          # Check whether --enable-protocol_file was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_file" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6
+          # Check whether --enable-protocol_file or --disable-protocol_file was given.

 if test "${enable_protocol_file+set}" = set; then
 if test "${enable_protocol_file+set}" = set; then

-  enableval=$enable_protocol_file;
+  enableval="$enable_protocol_file"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
                           else


@@ -9281,8 +8623,7 @@ else
 
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_protocol_file"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_protocol_file"
           if test "x$cache" = xyes; then


@@ -9299,8 +8640,8 @@ fi
             result=$wxUSE_PROTOCOL_FILE
           fi
 
             result=$wxUSE_PROTOCOL_FILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -9314,11 +8655,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; }
-          # Check whether --enable-threads was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6
+          # Check whether --enable-threads or --disable-threads was given.

 if test "${enable_threads+set}" = set; then
 if test "${enable_threads+set}" = set; then

-  enableval=$enable_threads;
+  enableval="$enable_threads"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_threads='wxUSE_THREADS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_threads='wxUSE_THREADS=yes'
                           else


@@ -9338,8 +8680,7 @@ else
 
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
 
 
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_threads"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_threads"
           if test "x$cache" = xyes; then


@@ -9356,8 +8697,121 @@ fi
             result=$wxUSE_THREADS
           fi
 
             result=$wxUSE_THREADS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6
+
+
+
+          enablestring=
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iniconf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6
+          # Check whether --enable-iniconf or --disable-iniconf was given.
+if test "${enable_iniconf+set}" = set; then
+  enableval="$enable_iniconf"
+
+                          if test "$enableval" = yes; then
+                            wx_cv_use_iniconf='wxUSE_INICONF=yes'
+                          else
+                            wx_cv_use_iniconf='wxUSE_INICONF=no'
+                          fi
+                          cache=yes
+
+else
+
+                          LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          fi
+
+                          wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
+
+fi;
+
+          eval "$wx_cv_use_iniconf"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_INICONF = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_INICONF
+          fi
+
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-regkey" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6
+          # Check whether --enable-regkey or --disable-regkey was given.
+if test "${enable_regkey+set}" = set; then
+  enableval="$enable_regkey"
+
+                          if test "$enableval" = yes; then
+                            wx_cv_use_regkey='wxUSE_REGKEY=yes'
+                          else
+                            wx_cv_use_regkey='wxUSE_REGKEY=no'
+                          fi
+                          cache=yes
+
+else
+
+                          LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          fi
+
+                          wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
+
+fi;
+
+          eval "$wx_cv_use_regkey"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_REGKEY = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_REGKEY
+          fi
+
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then


@@ -9374,11 +8828,12 @@ if test "$wxUSE_GUI" = "yes"; then
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; }
-          # Check whether --enable-docview was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6
+          # Check whether --enable-docview or --disable-docview was given.

 if test "${enable_docview+set}" = set; then
 if test "${enable_docview+set}" = set; then

-  enableval=$enable_docview;
+  enableval="$enable_docview"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                           else


@@ -9398,8 +8853,7 @@ else
 
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
 
 
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_docview"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_docview"
           if test "x$cache" = xyes; then


@@ -9416,8 +8870,8 @@ fi
             result=$wxUSE_DOC_VIEW_ARCHITECTURE
           fi
 
             result=$wxUSE_DOC_VIEW_ARCHITECTURE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9430,11 +8884,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; }
-          # Check whether --enable-help was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6
+          # Check whether --enable-help or --disable-help was given.

 if test "${enable_help+set}" = set; then
 if test "${enable_help+set}" = set; then

-  enableval=$enable_help;
+  enableval="$enable_help"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_help='wxUSE_HELP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_help='wxUSE_HELP=yes'
                           else


@@ -9454,8 +8909,7 @@ else
 
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
 
 
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_help"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_help"
           if test "x$cache" = xyes; then


@@ -9472,8 +8926,8 @@ fi
             result=$wxUSE_HELP
           fi
 
             result=$wxUSE_HELP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9486,11 +8940,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6; }
-          # Check whether --enable-mshtmlhelp was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6
+          # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.

 if test "${enable_mshtmlhelp+set}" = set; then
 if test "${enable_mshtmlhelp+set}" = set; then

-  enableval=$enable_mshtmlhelp;
+  enableval="$enable_mshtmlhelp"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                           else


@@ -9510,8 +8965,7 @@ else
 
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
 
 
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mshtmlhelp"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mshtmlhelp"
           if test "x$cache" = xyes; then


@@ -9528,8 +8982,8 @@ fi
             result=$wxUSE_MS_HTML_HELP
           fi
 
             result=$wxUSE_MS_HTML_HELP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9542,11 +8996,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; }
-          # Check whether --enable-html was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6
+          # Check whether --enable-html or --disable-html was given.

 if test "${enable_html+set}" = set; then
 if test "${enable_html+set}" = set; then

-  enableval=$enable_html;
+  enableval="$enable_html"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_html='wxUSE_HTML=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_html='wxUSE_HTML=yes'
                           else


@@ -9566,8 +9021,7 @@ else
 
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
 
 
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_html"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_html"
           if test "x$cache" = xyes; then


@@ -9584,8 +9038,8 @@ fi
             result=$wxUSE_HTML
           fi
 
             result=$wxUSE_HTML
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9598,11 +9052,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; }
-          # Check whether --enable-htmlhelp was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6
+          # Check whether --enable-htmlhelp or --disable-htmlhelp was given.

 if test "${enable_htmlhelp+set}" = set; then
 if test "${enable_htmlhelp+set}" = set; then

-  enableval=$enable_htmlhelp;
+  enableval="$enable_htmlhelp"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                           else


@@ -9622,8 +9077,7 @@ else
 
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
 
 
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_htmlhelp"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_htmlhelp"
           if test "x$cache" = xyes; then


@@ -9640,8 +9094,8 @@ fi
             result=$wxUSE_WXHTML_HELP
           fi
 
             result=$wxUSE_WXHTML_HELP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9654,11 +9108,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; }
-          # Check whether --enable-xrc was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6
+          # Check whether --enable-xrc or --disable-xrc was given.

 if test "${enable_xrc+set}" = set; then
 if test "${enable_xrc+set}" = set; then

-  enableval=$enable_xrc;
+  enableval="$enable_xrc"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_xrc='wxUSE_XRC=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_xrc='wxUSE_XRC=yes'
                           else


@@ -9678,8 +9133,7 @@ else
 
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
 
 
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_xrc"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_xrc"
           if test "x$cache" = xyes; then


@@ -9696,8 +9150,8 @@ fi
             result=$wxUSE_XRC
           fi
 
             result=$wxUSE_XRC
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9710,11 +9164,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; }
-          # Check whether --enable-aui was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6
+          # Check whether --enable-aui or --disable-aui was given.

 if test "${enable_aui+set}" = set; then
 if test "${enable_aui+set}" = set; then

-  enableval=$enable_aui;
+  enableval="$enable_aui"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_aui='wxUSE_AUI=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_aui='wxUSE_AUI=yes'
                           else


@@ -9734,8 +9189,7 @@ else
 
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
 
 
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_aui"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_aui"
           if test "x$cache" = xyes; then


@@ -9752,8 +9206,8 @@ fi
             result=$wxUSE_AUI
           fi
 
             result=$wxUSE_AUI
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9766,11 +9220,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
-          # Check whether --enable-stc was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6
+          # Check whether --enable-stc or --disable-stc was given.

 if test "${enable_stc+set}" = set; then
 if test "${enable_stc+set}" = set; then

-  enableval=$enable_stc;
+  enableval="$enable_stc"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_stc='wxUSE_STC=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_stc='wxUSE_STC=yes'
                           else


@@ -9790,8 +9245,7 @@ else
 
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
 
 
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_stc"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_stc"
           if test "x$cache" = xyes; then


@@ -9808,8 +9262,8 @@ fi
             result=$wxUSE_STC
           fi
 
             result=$wxUSE_STC
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9822,11 +9276,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; }
-          # Check whether --enable-constraints was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6
+          # Check whether --enable-constraints or --disable-constraints was given.

 if test "${enable_constraints+set}" = set; then
 if test "${enable_constraints+set}" = set; then

-  enableval=$enable_constraints;
+  enableval="$enable_constraints"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else


@@ -9846,8 +9301,7 @@ else
 
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
 
 
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_constraints"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_constraints"
           if test "x$cache" = xyes; then


@@ -9864,8 +9318,8 @@ fi
             result=$wxUSE_CONSTRAINTS
           fi
 
             result=$wxUSE_CONSTRAINTS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9878,11 +9332,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; }
-          # Check whether --enable-printarch was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6
+          # Check whether --enable-printarch or --disable-printarch was given.

 if test "${enable_printarch+set}" = set; then
 if test "${enable_printarch+set}" = set; then

-  enableval=$enable_printarch;
+  enableval="$enable_printarch"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                           else


@@ -9902,8 +9357,7 @@ else
 
                           wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
 
 
                           wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_printarch"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_printarch"
           if test "x$cache" = xyes; then


@@ -9920,8 +9374,8 @@ fi
             result=$wxUSE_PRINTING_ARCHITECTURE
           fi
 
             result=$wxUSE_PRINTING_ARCHITECTURE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9934,11 +9388,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
-          # Check whether --enable-mdi was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6
+          # Check whether --enable-mdi or --disable-mdi was given.

 if test "${enable_mdi+set}" = set; then
 if test "${enable_mdi+set}" = set; then

-  enableval=$enable_mdi;
+  enableval="$enable_mdi"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mdi='wxUSE_MDI=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mdi='wxUSE_MDI=yes'
                           else


@@ -9958,8 +9413,7 @@ else
 
                           wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
 
 
                           wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mdi"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mdi"
           if test "x$cache" = xyes; then


@@ -9976,8 +9430,8 @@ fi
             result=$wxUSE_MDI
           fi
 
             result=$wxUSE_MDI
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -9990,11 +9444,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
-          # Check whether --enable-mdidoc was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6
+          # Check whether --enable-mdidoc or --disable-mdidoc was given.

 if test "${enable_mdidoc+set}" = set; then
 if test "${enable_mdidoc+set}" = set; then

-  enableval=$enable_mdidoc;
+  enableval="$enable_mdidoc"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
                           else


@@ -10014,8 +9469,7 @@ else
 
                           wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
 
 
                           wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mdidoc"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mdidoc"
           if test "x$cache" = xyes; then


@@ -10032,8 +9486,8 @@ fi
             result=$wxUSE_MDI_ARCHITECTURE
           fi
 
             result=$wxUSE_MDI_ARCHITECTURE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10046,11 +9500,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
-          # Check whether --enable-loggui was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6
+          # Check whether --enable-loggui or --disable-loggui was given.

 if test "${enable_loggui+set}" = set; then
 if test "${enable_loggui+set}" = set; then

-  enableval=$enable_loggui;
+  enableval="$enable_loggui"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else


@@ -10070,8 +9525,7 @@ else
 
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
 
 
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_loggui"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_loggui"
           if test "x$cache" = xyes; then


@@ -10088,8 +9542,8 @@ fi
             result=$wxUSE_LOGGUI
           fi
 
             result=$wxUSE_LOGGUI
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10102,11 +9556,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
-          # Check whether --enable-logwin was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6
+          # Check whether --enable-logwin or --disable-logwin was given.

 if test "${enable_logwin+set}" = set; then
 if test "${enable_logwin+set}" = set; then

-  enableval=$enable_logwin;
+  enableval="$enable_logwin"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else


@@ -10126,8 +9581,7 @@ else
 
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
 
 
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_logwin"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_logwin"
           if test "x$cache" = xyes; then


@@ -10144,8 +9598,8 @@ fi
             result=$wxUSE_LOGWINDOW
           fi
 
             result=$wxUSE_LOGWINDOW
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10158,11 +9612,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; }
-          # Check whether --enable-logdialog was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6
+          # Check whether --enable-logdialog or --disable-logdialog was given.

 if test "${enable_logdialog+set}" = set; then
 if test "${enable_logdialog+set}" = set; then

-  enableval=$enable_logdialog;
+  enableval="$enable_logdialog"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
                           else


@@ -10182,8 +9637,7 @@ else
 
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
 
 
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_logdialog"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_logdialog"
           if test "x$cache" = xyes; then


@@ -10200,8 +9654,8 @@ fi
             result=$wxUSE_LOGDIALOG
           fi
 
             result=$wxUSE_LOGDIALOG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10214,11 +9668,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
-          # Check whether --enable-webkit was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6
+          # Check whether --enable-webkit or --disable-webkit was given.

 if test "${enable_webkit+set}" = set; then
 if test "${enable_webkit+set}" = set; then

-  enableval=$enable_webkit;
+  enableval="$enable_webkit"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_webkit='wxUSE_WEBKIT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_webkit='wxUSE_WEBKIT=yes'
                           else


@@ -10238,8 +9693,7 @@ else
 
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
 
 
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_webkit"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_webkit"
           if test "x$cache" = xyes; then


@@ -10256,8 +9710,8 @@ fi
             result=$wxUSE_WEBKIT
           fi
 
             result=$wxUSE_WEBKIT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10270,11 +9724,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; }
-          # Check whether --enable-richtext was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6
+          # Check whether --enable-richtext or --disable-richtext was given.

 if test "${enable_richtext+set}" = set; then
 if test "${enable_richtext+set}" = set; then

-  enableval=$enable_richtext;
+  enableval="$enable_richtext"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_richtext='wxUSE_RICHTEXT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_richtext='wxUSE_RICHTEXT=yes'
                           else


@@ -10294,8 +9749,7 @@ else
 
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
 
 
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_richtext"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_richtext"
           if test "x$cache" = xyes; then


@@ -10312,8 +9766,8 @@ fi
             result=$wxUSE_RICHTEXT
           fi
 
             result=$wxUSE_RICHTEXT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10326,11 +9780,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
-          # Check whether --enable-graphics_ctx was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6
+          # Check whether --enable-graphics_ctx or --disable-graphics_ctx was given.

 if test "${enable_graphics_ctx+set}" = set; then
 if test "${enable_graphics_ctx+set}" = set; then

-  enableval=$enable_graphics_ctx;
+  enableval="$enable_graphics_ctx"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
                           else


@@ -10350,8 +9805,7 @@ else
 
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
 
 
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_graphics_ctx"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_graphics_ctx"
           if test "x$cache" = xyes; then


@@ -10368,8 +9822,8 @@ fi
             result=$wxUSE_GRAPHICS_CONTEXT
           fi
 
             result=$wxUSE_GRAPHICS_CONTEXT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10382,11 +9836,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; }
-          # Check whether --enable-postscript was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6
+          # Check whether --enable-postscript or --disable-postscript was given.

 if test "${enable_postscript+set}" = set; then
 if test "${enable_postscript+set}" = set; then

-  enableval=$enable_postscript;
+  enableval="$enable_postscript"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else


@@ -10406,8 +9861,7 @@ else
 
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
 
 
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_postscript"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_postscript"
           if test "x$cache" = xyes; then


@@ -10424,8 +9878,8 @@ fi
             result=$wxUSE_POSTSCRIPT
           fi
 
             result=$wxUSE_POSTSCRIPT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10438,11 +9892,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; }
-          # Check whether --enable-svg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6
+          # Check whether --enable-svg or --disable-svg was given.

 if test "${enable_svg+set}" = set; then
 if test "${enable_svg+set}" = set; then

-  enableval=$enable_svg;
+  enableval="$enable_svg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_svg='wxUSE_SVG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_svg='wxUSE_SVG=yes'
                           else


@@ -10462,8 +9917,7 @@ else
 
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
 
 
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_svg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_svg"
           if test "x$cache" = xyes; then


@@ -10480,8 +9934,8 @@ fi
             result=$wxUSE_SVG
           fi
 
             result=$wxUSE_SVG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -10496,11 +9950,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-clipboard" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6; }
-          # Check whether --enable-clipboard was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-clipboard" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6
+          # Check whether --enable-clipboard or --disable-clipboard was given.

 if test "${enable_clipboard+set}" = set; then
 if test "${enable_clipboard+set}" = set; then

-  enableval=$enable_clipboard;
+  enableval="$enable_clipboard"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                           else


@@ -10520,8 +9975,7 @@ else
 
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
 
 
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_clipboard"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_clipboard"
           if test "x$cache" = xyes; then


@@ -10538,8 +9992,8 @@ fi
             result=$wxUSE_CLIPBOARD
           fi
 
             result=$wxUSE_CLIPBOARD
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10552,11 +10006,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; }
-          # Check whether --enable-dnd was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6
+          # Check whether --enable-dnd or --disable-dnd was given.

 if test "${enable_dnd+set}" = set; then
 if test "${enable_dnd+set}" = set; then

-  enableval=$enable_dnd;
+  enableval="$enable_dnd"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                           else


@@ -10576,8 +10031,7 @@ else
 
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
 
 
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dnd"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dnd"
           if test "x$cache" = xyes; then


@@ -10594,8 +10048,8 @@ fi
             result=$wxUSE_DRAG_AND_DROP
           fi
 
             result=$wxUSE_DRAG_AND_DROP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10608,11 +10062,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
-          # Check whether --enable-metafile was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6
+          # Check whether --enable-metafile or --disable-metafile was given.

 if test "${enable_metafile+set}" = set; then
 if test "${enable_metafile+set}" = set; then

-  enableval=$enable_metafile;
+  enableval="$enable_metafile"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_metafile='wxUSE_METAFILE=yes'
                           else


@@ -10632,8 +10087,7 @@ else
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_metafile"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_metafile"
           if test "x$cache" = xyes; then


@@ -10650,8 +10104,8 @@ fi
             result=$wxUSE_METAFILE
           fi
 
             result=$wxUSE_METAFILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -10667,11 +10121,12 @@ DEFAULT_wxUSE_CONTROLS=none
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; }
-          # Check whether --enable-controls was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6
+          # Check whether --enable-controls or --disable-controls was given.

 if test "${enable_controls+set}" = set; then
 if test "${enable_controls+set}" = set; then

-  enableval=$enable_controls;
+  enableval="$enable_controls"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_controls='wxUSE_CONTROLS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_controls='wxUSE_CONTROLS=yes'
                           else


@@ -10691,8 +10146,7 @@ else
 
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
 
 
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_controls"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_controls"
           if test "x$cache" = xyes; then


@@ -10709,8 +10163,8 @@ fi
             result=$wxUSE_CONTROLS
           fi
 
             result=$wxUSE_CONTROLS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 if test "$wxUSE_CONTROLS" = "yes"; then
 
 
 if test "$wxUSE_CONTROLS" = "yes"; then


@@ -10832,11 +10286,12 @@ fi
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; }
-          # Check whether --enable-accel was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6
+          # Check whether --enable-accel or --disable-accel was given.

 if test "${enable_accel+set}" = set; then
 if test "${enable_accel+set}" = set; then

-  enableval=$enable_accel;
+  enableval="$enable_accel"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_accel='wxUSE_ACCEL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_accel='wxUSE_ACCEL=yes'
                           else


@@ -10856,8 +10311,7 @@ else
 
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
 
 
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_accel"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_accel"
           if test "x$cache" = xyes; then


@@ -10874,8 +10328,8 @@ fi
             result=$wxUSE_ACCEL
           fi
 
             result=$wxUSE_ACCEL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10888,11 +10342,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6; }
-          # Check whether --enable-animatectrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6
+          # Check whether --enable-animatectrl or --disable-animatectrl was given.

 if test "${enable_animatectrl+set}" = set; then
 if test "${enable_animatectrl+set}" = set; then

-  enableval=$enable_animatectrl;
+  enableval="$enable_animatectrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
                           else


@@ -10912,8 +10367,7 @@ else
 
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
 
 
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_animatectrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_animatectrl"
           if test "x$cache" = xyes; then


@@ -10930,8 +10384,8 @@ fi
             result=$wxUSE_ANIMATIONCTRL
           fi
 
             result=$wxUSE_ANIMATIONCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -10944,11 +10398,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
-          # Check whether --enable-button was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6
+          # Check whether --enable-button or --disable-button was given.

 if test "${enable_button+set}" = set; then
 if test "${enable_button+set}" = set; then

-  enableval=$enable_button;
+  enableval="$enable_button"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_button='wxUSE_BUTTON=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_button='wxUSE_BUTTON=yes'
                           else


@@ -10968,8 +10423,7 @@ else
 
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
 
 
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_button"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_button"
           if test "x$cache" = xyes; then


@@ -10986,8 +10440,8 @@ fi
             result=$wxUSE_BUTTON
           fi
 
             result=$wxUSE_BUTTON
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11000,11 +10454,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
-          # Check whether --enable-bmpbutton was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6
+          # Check whether --enable-bmpbutton or --disable-bmpbutton was given.

 if test "${enable_bmpbutton+set}" = set; then
 if test "${enable_bmpbutton+set}" = set; then

-  enableval=$enable_bmpbutton;
+  enableval="$enable_bmpbutton"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                           else


@@ -11024,8 +10479,7 @@ else
 
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
 
 
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_bmpbutton"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_bmpbutton"
           if test "x$cache" = xyes; then


@@ -11042,8 +10496,8 @@ fi
             result=$wxUSE_BMPBUTTON
           fi
 
             result=$wxUSE_BMPBUTTON
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11056,11 +10510,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
-          # Check whether --enable-bmpcombobox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6
+          # Check whether --enable-bmpcombobox or --disable-bmpcombobox was given.

 if test "${enable_bmpcombobox+set}" = set; then
 if test "${enable_bmpcombobox+set}" = set; then

-  enableval=$enable_bmpcombobox;
+  enableval="$enable_bmpcombobox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
                           else


@@ -11080,8 +10535,7 @@ else
 
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
 
 
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_bmpcombobox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_bmpcombobox"
           if test "x$cache" = xyes; then


@@ -11098,8 +10552,8 @@ fi
             result=$wxUSE_BITMAPCOMBOBOX
           fi
 
             result=$wxUSE_BITMAPCOMBOBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11112,11 +10566,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; }
-          # Check whether --enable-calendar was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6
+          # Check whether --enable-calendar or --disable-calendar was given.

 if test "${enable_calendar+set}" = set; then
 if test "${enable_calendar+set}" = set; then

-  enableval=$enable_calendar;
+  enableval="$enable_calendar"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_calendar='wxUSE_CALCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_calendar='wxUSE_CALCTRL=yes'
                           else


@@ -11136,8 +10591,7 @@ else
 
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
 
 
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_calendar"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_calendar"
           if test "x$cache" = xyes; then


@@ -11154,8 +10608,8 @@ fi
             result=$wxUSE_CALCTRL
           fi
 
             result=$wxUSE_CALCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11168,11 +10622,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; }
-          # Check whether --enable-caret was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6
+          # Check whether --enable-caret or --disable-caret was given.

 if test "${enable_caret+set}" = set; then
 if test "${enable_caret+set}" = set; then

-  enableval=$enable_caret;
+  enableval="$enable_caret"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_caret='wxUSE_CARET=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_caret='wxUSE_CARET=yes'
                           else


@@ -11192,8 +10647,7 @@ else
 
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
 
 
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_caret"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_caret"
           if test "x$cache" = xyes; then


@@ -11210,8 +10664,8 @@ fi
             result=$wxUSE_CARET
           fi
 
             result=$wxUSE_CARET
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11224,11 +10678,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; }
-          # Check whether --enable-checkbox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6
+          # Check whether --enable-checkbox or --disable-checkbox was given.

 if test "${enable_checkbox+set}" = set; then
 if test "${enable_checkbox+set}" = set; then

-  enableval=$enable_checkbox;
+  enableval="$enable_checkbox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=yes'
                           else


@@ -11248,8 +10703,7 @@ else
 
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
 
 
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_checkbox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_checkbox"
           if test "x$cache" = xyes; then


@@ -11266,8 +10720,8 @@ fi
             result=$wxUSE_CHECKBOX
           fi
 
             result=$wxUSE_CHECKBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11280,11 +10734,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; }
-          # Check whether --enable-checklst was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6
+          # Check whether --enable-checklst or --disable-checklst was given.

 if test "${enable_checklst+set}" = set; then
 if test "${enable_checklst+set}" = set; then

-  enableval=$enable_checklst;
+  enableval="$enable_checklst"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_checklst='wxUSE_CHECKLST=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_checklst='wxUSE_CHECKLST=yes'
                           else


@@ -11304,8 +10759,7 @@ else
 
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
 
 
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_checklst"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_checklst"
           if test "x$cache" = xyes; then


@@ -11322,8 +10776,8 @@ fi
             result=$wxUSE_CHECKLST
           fi
 
             result=$wxUSE_CHECKLST
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11336,11 +10790,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; }
-          # Check whether --enable-choice was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6
+          # Check whether --enable-choice or --disable-choice was given.

 if test "${enable_choice+set}" = set; then
 if test "${enable_choice+set}" = set; then

-  enableval=$enable_choice;
+  enableval="$enable_choice"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_choice='wxUSE_CHOICE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_choice='wxUSE_CHOICE=yes'
                           else


@@ -11360,8 +10815,7 @@ else
 
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
 
 
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_choice"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_choice"
           if test "x$cache" = xyes; then


@@ -11378,8 +10832,8 @@ fi
             result=$wxUSE_CHOICE
           fi
 
             result=$wxUSE_CHOICE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11392,11 +10846,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6; }
-          # Check whether --enable-choicebook was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6
+          # Check whether --enable-choicebook or --disable-choicebook was given.

 if test "${enable_choicebook+set}" = set; then
 if test "${enable_choicebook+set}" = set; then

-  enableval=$enable_choicebook;
+  enableval="$enable_choicebook"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
                           else


@@ -11416,8 +10871,7 @@ else
 
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
 
 
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_choicebook"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_choicebook"
           if test "x$cache" = xyes; then


@@ -11434,8 +10888,8 @@ fi
             result=$wxUSE_CHOICEBOOK
           fi
 
             result=$wxUSE_CHOICEBOOK
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11448,11 +10902,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-collpane" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; }
-          # Check whether --enable-collpane was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-collpane" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6
+          # Check whether --enable-collpane or --disable-collpane was given.

 if test "${enable_collpane+set}" = set; then
 if test "${enable_collpane+set}" = set; then

-  enableval=$enable_collpane;
+  enableval="$enable_collpane"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_collpane='wxUSE_COLLPANE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_collpane='wxUSE_COLLPANE=yes'
                           else


@@ -11472,8 +10927,7 @@ else
 
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
 
 
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_collpane"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_collpane"
           if test "x$cache" = xyes; then


@@ -11490,8 +10944,8 @@ fi
             result=$wxUSE_COLLPANE
           fi
 
             result=$wxUSE_COLLPANE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11504,11 +10958,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-colourpicker" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6; }
-          # Check whether --enable-colourpicker was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-colourpicker" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6
+          # Check whether --enable-colourpicker or --disable-colourpicker was given.

 if test "${enable_colourpicker+set}" = set; then
 if test "${enable_colourpicker+set}" = set; then

-  enableval=$enable_colourpicker;
+  enableval="$enable_colourpicker"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
                           else


@@ -11528,8 +10983,7 @@ else
 
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
 
 
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_colourpicker"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_colourpicker"
           if test "x$cache" = xyes; then


@@ -11546,8 +11000,8 @@ fi
             result=$wxUSE_COLOURPICKERCTRL
           fi
 
             result=$wxUSE_COLOURPICKERCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11560,11 +11014,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; }
-          # Check whether --enable-combobox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6
+          # Check whether --enable-combobox or --disable-combobox was given.

 if test "${enable_combobox+set}" = set; then
 if test "${enable_combobox+set}" = set; then

-  enableval=$enable_combobox;
+  enableval="$enable_combobox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_combobox='wxUSE_COMBOBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_combobox='wxUSE_COMBOBOX=yes'
                           else


@@ -11584,8 +11039,7 @@ else
 
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
 
 
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_combobox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_combobox"
           if test "x$cache" = xyes; then


@@ -11602,8 +11056,8 @@ fi
             result=$wxUSE_COMBOBOX
           fi
 
             result=$wxUSE_COMBOBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11616,11 +11070,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6; }
-          # Check whether --enable-comboctrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6
+          # Check whether --enable-comboctrl or --disable-comboctrl was given.

 if test "${enable_comboctrl+set}" = set; then
 if test "${enable_comboctrl+set}" = set; then

-  enableval=$enable_comboctrl;
+  enableval="$enable_comboctrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
                           else


@@ -11640,8 +11095,7 @@ else
 
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
 
 
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_comboctrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_comboctrl"
           if test "x$cache" = xyes; then


@@ -11658,8 +11112,8 @@ fi
             result=$wxUSE_COMBOCTRL
           fi
 
             result=$wxUSE_COMBOCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11672,11 +11126,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; }
-          # Check whether --enable-datepick was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6
+          # Check whether --enable-datepick or --disable-datepick was given.

 if test "${enable_datepick+set}" = set; then
 if test "${enable_datepick+set}" = set; then

-  enableval=$enable_datepick;
+  enableval="$enable_datepick"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
                           else


@@ -11696,8 +11151,7 @@ else
 
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
 
 
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_datepick"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_datepick"
           if test "x$cache" = xyes; then


@@ -11714,8 +11168,8 @@ fi
             result=$wxUSE_DATEPICKCTRL
           fi
 
             result=$wxUSE_DATEPICKCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11728,11 +11182,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; }
-          # Check whether --enable-dirpicker was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6
+          # Check whether --enable-dirpicker or --disable-dirpicker was given.

 if test "${enable_dirpicker+set}" = set; then
 if test "${enable_dirpicker+set}" = set; then

-  enableval=$enable_dirpicker;
+  enableval="$enable_dirpicker"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
                           else


@@ -11752,8 +11207,7 @@ else
 
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
 
 
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dirpicker"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dirpicker"
           if test "x$cache" = xyes; then


@@ -11770,8 +11224,8 @@ fi
             result=$wxUSE_DIRPICKERCTRL
           fi
 
             result=$wxUSE_DIRPICKERCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11784,11 +11238,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
-          # Check whether --enable-display was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6
+          # Check whether --enable-display or --disable-display was given.

 if test "${enable_display+set}" = set; then
 if test "${enable_display+set}" = set; then

-  enableval=$enable_display;
+  enableval="$enable_display"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_display='wxUSE_DISPLAY=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_display='wxUSE_DISPLAY=yes'
                           else


@@ -11808,8 +11263,7 @@ else
 
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
 
 
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_display"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_display"
           if test "x$cache" = xyes; then


@@ -11826,8 +11280,8 @@ fi
             result=$wxUSE_DISPLAY
           fi
 
             result=$wxUSE_DISPLAY
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11840,11 +11294,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
-          # Check whether --enable-detect_sm was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6
+          # Check whether --enable-detect_sm or --disable-detect_sm was given.

 if test "${enable_detect_sm+set}" = set; then
 if test "${enable_detect_sm+set}" = set; then

-  enableval=$enable_detect_sm;
+  enableval="$enable_detect_sm"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
                           else


@@ -11864,8 +11319,7 @@ else
 
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
 
 
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_detect_sm"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_detect_sm"
           if test "x$cache" = xyes; then


@@ -11882,8 +11336,8 @@ fi
             result=$wxUSE_DETECT_SM
           fi
 
             result=$wxUSE_DETECT_SM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11896,11 +11350,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; }
-          # Check whether --enable-editablebox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6
+          # Check whether --enable-editablebox or --disable-editablebox was given.

 if test "${enable_editablebox+set}" = set; then
 if test "${enable_editablebox+set}" = set; then

-  enableval=$enable_editablebox;
+  enableval="$enable_editablebox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
                           else


@@ -11920,8 +11375,7 @@ else
 
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
 
 
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_editablebox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_editablebox"
           if test "x$cache" = xyes; then


@@ -11938,8 +11392,8 @@ fi
             result=$wxUSE_EDITABLELISTBOX
           fi
 
             result=$wxUSE_EDITABLELISTBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -11952,11 +11406,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
-          # Check whether --enable-filepicker was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6
+          # Check whether --enable-filepicker or --disable-filepicker was given.

 if test "${enable_filepicker+set}" = set; then
 if test "${enable_filepicker+set}" = set; then

-  enableval=$enable_filepicker;
+  enableval="$enable_filepicker"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
                           else


@@ -11976,8 +11431,7 @@ else
 
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 
 
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_filepicker"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_filepicker"
           if test "x$cache" = xyes; then


@@ -11994,8 +11448,8 @@ fi
             result=$wxUSE_FILEPICKERCTRL
           fi
 
             result=$wxUSE_FILEPICKERCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12008,11 +11462,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6; }
-          # Check whether --enable-fontpicker was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6
+          # Check whether --enable-fontpicker or --disable-fontpicker was given.

 if test "${enable_fontpicker+set}" = set; then
 if test "${enable_fontpicker+set}" = set; then

-  enableval=$enable_fontpicker;
+  enableval="$enable_fontpicker"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
                           else


@@ -12032,8 +11487,7 @@ else
 
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
 
 
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fontpicker"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fontpicker"
           if test "x$cache" = xyes; then


@@ -12050,8 +11504,8 @@ fi
             result=$wxUSE_FONTPICKERCTRL
           fi
 
             result=$wxUSE_FONTPICKERCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12064,11 +11518,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; }
-          # Check whether --enable-gauge was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6
+          # Check whether --enable-gauge or --disable-gauge was given.

 if test "${enable_gauge+set}" = set; then
 if test "${enable_gauge+set}" = set; then

-  enableval=$enable_gauge;
+  enableval="$enable_gauge"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_gauge='wxUSE_GAUGE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_gauge='wxUSE_GAUGE=yes'
                           else


@@ -12088,8 +11543,7 @@ else
 
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
 
 
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_gauge"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_gauge"
           if test "x$cache" = xyes; then


@@ -12106,8 +11560,8 @@ fi
             result=$wxUSE_GAUGE
           fi
 
             result=$wxUSE_GAUGE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12120,11 +11574,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; }
-          # Check whether --enable-grid was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6
+          # Check whether --enable-grid or --disable-grid was given.

 if test "${enable_grid+set}" = set; then
 if test "${enable_grid+set}" = set; then

-  enableval=$enable_grid;
+  enableval="$enable_grid"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_grid='wxUSE_GRID=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_grid='wxUSE_GRID=yes'
                           else


@@ -12144,8 +11599,7 @@ else
 
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
 
 
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_grid"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_grid"
           if test "x$cache" = xyes; then


@@ -12162,8 +11616,8 @@ fi
             result=$wxUSE_GRID
           fi
 
             result=$wxUSE_GRID
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12176,11 +11630,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
-          # Check whether --enable-dataviewctrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6
+          # Check whether --enable-dataviewctrl or --disable-dataviewctrl was given.

 if test "${enable_dataviewctrl+set}" = set; then
 if test "${enable_dataviewctrl+set}" = set; then

-  enableval=$enable_dataviewctrl;
+  enableval="$enable_dataviewctrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
                           else


@@ -12200,8 +11655,7 @@ else
 
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
 
 
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dataviewctrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dataviewctrl"
           if test "x$cache" = xyes; then


@@ -12218,8 +11672,8 @@ fi
             result=$wxUSE_DATAVIEWCTRL
           fi
 
             result=$wxUSE_DATAVIEWCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12232,11 +11686,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6; }
-          # Check whether --enable-hyperlink was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6
+          # Check whether --enable-hyperlink or --disable-hyperlink was given.

 if test "${enable_hyperlink+set}" = set; then
 if test "${enable_hyperlink+set}" = set; then

-  enableval=$enable_hyperlink;
+  enableval="$enable_hyperlink"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
                           else


@@ -12256,8 +11711,7 @@ else
 
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
 
 
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_hyperlink"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_hyperlink"
           if test "x$cache" = xyes; then


@@ -12274,8 +11728,8 @@ fi
             result=$wxUSE_HYPERLINKCTRL
           fi
 
             result=$wxUSE_HYPERLINKCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12288,11 +11742,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; }
-          # Check whether --enable-imaglist was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6
+          # Check whether --enable-imaglist or --disable-imaglist was given.

 if test "${enable_imaglist+set}" = set; then
 if test "${enable_imaglist+set}" = set; then

-  enableval=$enable_imaglist;
+  enableval="$enable_imaglist"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=yes'
                           else


@@ -12312,8 +11767,7 @@ else
 
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
 
 
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_imaglist"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_imaglist"
           if test "x$cache" = xyes; then


@@ -12330,8 +11784,8 @@ fi
             result=$wxUSE_IMAGLIST
           fi
 
             result=$wxUSE_IMAGLIST
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12344,11 +11798,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; }
-          # Check whether --enable-listbook was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6
+          # Check whether --enable-listbook or --disable-listbook was given.

 if test "${enable_listbook+set}" = set; then
 if test "${enable_listbook+set}" = set; then

-  enableval=$enable_listbook;
+  enableval="$enable_listbook"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_listbook='wxUSE_LISTBOOK=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_listbook='wxUSE_LISTBOOK=yes'
                           else


@@ -12368,8 +11823,7 @@ else
 
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
 
 
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_listbook"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_listbook"
           if test "x$cache" = xyes; then


@@ -12386,8 +11840,8 @@ fi
             result=$wxUSE_LISTBOOK
           fi
 
             result=$wxUSE_LISTBOOK
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12400,11 +11854,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; }
-          # Check whether --enable-listbox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6
+          # Check whether --enable-listbox or --disable-listbox was given.

 if test "${enable_listbox+set}" = set; then
 if test "${enable_listbox+set}" = set; then

-  enableval=$enable_listbox;
+  enableval="$enable_listbox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_listbox='wxUSE_LISTBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_listbox='wxUSE_LISTBOX=yes'
                           else


@@ -12424,8 +11879,7 @@ else
 
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
 
 
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_listbox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_listbox"
           if test "x$cache" = xyes; then


@@ -12442,8 +11896,8 @@ fi
             result=$wxUSE_LISTBOX
           fi
 
             result=$wxUSE_LISTBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12456,11 +11910,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; }
-          # Check whether --enable-listctrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6
+          # Check whether --enable-listctrl or --disable-listctrl was given.

 if test "${enable_listctrl+set}" = set; then
 if test "${enable_listctrl+set}" = set; then

-  enableval=$enable_listctrl;
+  enableval="$enable_listctrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                           else


@@ -12480,8 +11935,7 @@ else
 
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
 
 
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_listctrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_listctrl"
           if test "x$cache" = xyes; then


@@ -12498,8 +11952,8 @@ fi
             result=$wxUSE_LISTCTRL
           fi
 
             result=$wxUSE_LISTCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12512,11 +11966,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; }
-          # Check whether --enable-notebook was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6
+          # Check whether --enable-notebook or --disable-notebook was given.

 if test "${enable_notebook+set}" = set; then
 if test "${enable_notebook+set}" = set; then

-  enableval=$enable_notebook;
+  enableval="$enable_notebook"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                           else


@@ -12536,8 +11991,7 @@ else
 
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
 
 
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_notebook"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_notebook"
           if test "x$cache" = xyes; then


@@ -12554,8 +12008,8 @@ fi
             result=$wxUSE_NOTEBOOK
           fi
 
             result=$wxUSE_NOTEBOOK
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12568,11 +12022,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6; }
-          # Check whether --enable-odcombobox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6
+          # Check whether --enable-odcombobox or --disable-odcombobox was given.

 if test "${enable_odcombobox+set}" = set; then
 if test "${enable_odcombobox+set}" = set; then

-  enableval=$enable_odcombobox;
+  enableval="$enable_odcombobox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
                           else


@@ -12592,8 +12047,7 @@ else
 
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
 
 
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_odcombobox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_odcombobox"
           if test "x$cache" = xyes; then


@@ -12610,8 +12064,8 @@ fi
             result=$wxUSE_ODCOMBOBOX
           fi
 
             result=$wxUSE_ODCOMBOBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12624,11 +12078,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; }
-          # Check whether --enable-radiobox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6
+          # Check whether --enable-radiobox or --disable-radiobox was given.

 if test "${enable_radiobox+set}" = set; then
 if test "${enable_radiobox+set}" = set; then

-  enableval=$enable_radiobox;
+  enableval="$enable_radiobox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                           else


@@ -12648,8 +12103,7 @@ else
 
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
 
 
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_radiobox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_radiobox"
           if test "x$cache" = xyes; then


@@ -12666,8 +12120,8 @@ fi
             result=$wxUSE_RADIOBOX
           fi
 
             result=$wxUSE_RADIOBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12680,11 +12134,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; }
-          # Check whether --enable-radiobtn was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6
+          # Check whether --enable-radiobtn or --disable-radiobtn was given.

 if test "${enable_radiobtn+set}" = set; then
 if test "${enable_radiobtn+set}" = set; then

-  enableval=$enable_radiobtn;
+  enableval="$enable_radiobtn"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                           else


@@ -12704,8 +12159,7 @@ else
 
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
 
 
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_radiobtn"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_radiobtn"
           if test "x$cache" = xyes; then


@@ -12722,8 +12176,8 @@ fi
             result=$wxUSE_RADIOBTN
           fi
 
             result=$wxUSE_RADIOBTN
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12736,11 +12190,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; }
-          # Check whether --enable-sash was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6
+          # Check whether --enable-sash or --disable-sash was given.

 if test "${enable_sash+set}" = set; then
 if test "${enable_sash+set}" = set; then

-  enableval=$enable_sash;
+  enableval="$enable_sash"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_sash='wxUSE_SASH=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_sash='wxUSE_SASH=yes'
                           else


@@ -12760,8 +12215,7 @@ else
 
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
 
 
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_sash"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_sash"
           if test "x$cache" = xyes; then


@@ -12778,8 +12232,8 @@ fi
             result=$wxUSE_SASH
           fi
 
             result=$wxUSE_SASH
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12792,11 +12246,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6; }
-          # Check whether --enable-scrollbar was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6
+          # Check whether --enable-scrollbar or --disable-scrollbar was given.

 if test "${enable_scrollbar+set}" = set; then
 if test "${enable_scrollbar+set}" = set; then

-  enableval=$enable_scrollbar;
+  enableval="$enable_scrollbar"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                           else


@@ -12816,8 +12271,7 @@ else
 
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
 
 
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_scrollbar"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_scrollbar"
           if test "x$cache" = xyes; then


@@ -12834,8 +12288,8 @@ fi
             result=$wxUSE_SCROLLBAR
           fi
 
             result=$wxUSE_SCROLLBAR
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12848,11 +12302,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6; }
-          # Check whether --enable-searchctrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6
+          # Check whether --enable-searchctrl or --disable-searchctrl was given.

 if test "${enable_searchctrl+set}" = set; then
 if test "${enable_searchctrl+set}" = set; then

-  enableval=$enable_searchctrl;
+  enableval="$enable_searchctrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
                           else


@@ -12872,8 +12327,7 @@ else
 
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
 
 
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_searchctrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_searchctrl"
           if test "x$cache" = xyes; then


@@ -12890,8 +12344,8 @@ fi
             result=$wxUSE_SEARCHCTRL
           fi
 
             result=$wxUSE_SEARCHCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12904,11 +12358,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; }
-          # Check whether --enable-slider was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6
+          # Check whether --enable-slider or --disable-slider was given.

 if test "${enable_slider+set}" = set; then
 if test "${enable_slider+set}" = set; then

-  enableval=$enable_slider;
+  enableval="$enable_slider"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_slider='wxUSE_SLIDER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_slider='wxUSE_SLIDER=yes'
                           else


@@ -12928,8 +12383,7 @@ else
 
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
 
 
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_slider"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_slider"
           if test "x$cache" = xyes; then


@@ -12946,8 +12400,8 @@ fi
             result=$wxUSE_SLIDER
           fi
 
             result=$wxUSE_SLIDER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -12960,11 +12414,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; }
-          # Check whether --enable-spinbtn was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6
+          # Check whether --enable-spinbtn or --disable-spinbtn was given.

 if test "${enable_spinbtn+set}" = set; then
 if test "${enable_spinbtn+set}" = set; then

-  enableval=$enable_spinbtn;
+  enableval="$enable_spinbtn"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                           else


@@ -12984,8 +12439,7 @@ else
 
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
 
 
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_spinbtn"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_spinbtn"
           if test "x$cache" = xyes; then


@@ -13002,8 +12456,8 @@ fi
             result=$wxUSE_SPINBTN
           fi
 
             result=$wxUSE_SPINBTN
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13016,11 +12470,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; }
-          # Check whether --enable-spinctrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6
+          # Check whether --enable-spinctrl or --disable-spinctrl was given.

 if test "${enable_spinctrl+set}" = set; then
 if test "${enable_spinctrl+set}" = set; then

-  enableval=$enable_spinctrl;
+  enableval="$enable_spinctrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                           else


@@ -13040,8 +12495,7 @@ else
 
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
 
 
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_spinctrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_spinctrl"
           if test "x$cache" = xyes; then


@@ -13058,8 +12512,8 @@ fi
             result=$wxUSE_SPINCTRL
           fi
 
             result=$wxUSE_SPINCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13072,11 +12526,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; }
-          # Check whether --enable-splitter was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6
+          # Check whether --enable-splitter or --disable-splitter was given.

 if test "${enable_splitter+set}" = set; then
 if test "${enable_splitter+set}" = set; then

-  enableval=$enable_splitter;
+  enableval="$enable_splitter"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_splitter='wxUSE_SPLITTER=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_splitter='wxUSE_SPLITTER=yes'
                           else


@@ -13096,8 +12551,7 @@ else
 
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
 
 
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_splitter"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_splitter"
           if test "x$cache" = xyes; then


@@ -13114,8 +12568,8 @@ fi
             result=$wxUSE_SPLITTER
           fi
 
             result=$wxUSE_SPLITTER
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13128,11 +12582,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; }
-          # Check whether --enable-statbmp was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6
+          # Check whether --enable-statbmp or --disable-statbmp was given.

 if test "${enable_statbmp+set}" = set; then
 if test "${enable_statbmp+set}" = set; then

-  enableval=$enable_statbmp;
+  enableval="$enable_statbmp"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_statbmp='wxUSE_STATBMP=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_statbmp='wxUSE_STATBMP=yes'
                           else


@@ -13152,8 +12607,7 @@ else
 
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
 
 
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_statbmp"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_statbmp"
           if test "x$cache" = xyes; then


@@ -13170,8 +12624,8 @@ fi
             result=$wxUSE_STATBMP
           fi
 
             result=$wxUSE_STATBMP
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13184,11 +12638,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; }
-          # Check whether --enable-statbox was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6
+          # Check whether --enable-statbox or --disable-statbox was given.

 if test "${enable_statbox+set}" = set; then
 if test "${enable_statbox+set}" = set; then

-  enableval=$enable_statbox;
+  enableval="$enable_statbox"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_statbox='wxUSE_STATBOX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_statbox='wxUSE_STATBOX=yes'
                           else


@@ -13208,8 +12663,7 @@ else
 
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
 
 
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_statbox"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_statbox"
           if test "x$cache" = xyes; then


@@ -13226,8 +12680,8 @@ fi
             result=$wxUSE_STATBOX
           fi
 
             result=$wxUSE_STATBOX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13240,11 +12694,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; }
-          # Check whether --enable-statline was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6
+          # Check whether --enable-statline or --disable-statline was given.

 if test "${enable_statline+set}" = set; then
 if test "${enable_statline+set}" = set; then

-  enableval=$enable_statline;
+  enableval="$enable_statline"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_statline='wxUSE_STATLINE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_statline='wxUSE_STATLINE=yes'
                           else


@@ -13264,8 +12719,7 @@ else
 
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
 
 
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_statline"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_statline"
           if test "x$cache" = xyes; then


@@ -13282,8 +12736,8 @@ fi
             result=$wxUSE_STATLINE
           fi
 
             result=$wxUSE_STATLINE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13296,11 +12750,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; }
-          # Check whether --enable-stattext was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6
+          # Check whether --enable-stattext or --disable-stattext was given.

 if test "${enable_stattext+set}" = set; then
 if test "${enable_stattext+set}" = set; then

-  enableval=$enable_stattext;
+  enableval="$enable_stattext"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_stattext='wxUSE_STATTEXT=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_stattext='wxUSE_STATTEXT=yes'
                           else


@@ -13320,8 +12775,7 @@ else
 
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
 
 
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_stattext"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_stattext"
           if test "x$cache" = xyes; then


@@ -13338,8 +12792,8 @@ fi
             result=$wxUSE_STATTEXT
           fi
 
             result=$wxUSE_STATTEXT
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13352,11 +12806,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6; }
-          # Check whether --enable-statusbar was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6
+          # Check whether --enable-statusbar or --disable-statusbar was given.

 if test "${enable_statusbar+set}" = set; then
 if test "${enable_statusbar+set}" = set; then

-  enableval=$enable_statusbar;
+  enableval="$enable_statusbar"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=yes'
                           else


@@ -13376,8 +12831,7 @@ else
 
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
 
 
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_statusbar"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_statusbar"
           if test "x$cache" = xyes; then


@@ -13394,8 +12848,8 @@ fi
             result=$wxUSE_STATUSBAR
           fi
 
             result=$wxUSE_STATUSBAR
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13408,11 +12862,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; }
-          # Check whether --enable-tabdialog was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6
+          # Check whether --enable-tabdialog or --disable-tabdialog was given.

 if test "${enable_tabdialog+set}" = set; then
 if test "${enable_tabdialog+set}" = set; then

-  enableval=$enable_tabdialog;
+  enableval="$enable_tabdialog"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
                           else


@@ -13432,8 +12887,7 @@ else
 
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
 
 
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_tabdialog"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_tabdialog"
           if test "x$cache" = xyes; then


@@ -13450,8 +12904,8 @@ fi
             result=$wxUSE_TAB_DIALOG
           fi
 
             result=$wxUSE_TAB_DIALOG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13464,11 +12918,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-taskbaricon" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; }
-          # Check whether --enable-taskbaricon was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-taskbaricon" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6
+          # Check whether --enable-taskbaricon or --disable-taskbaricon was given.

 if test "${enable_taskbaricon+set}" = set; then
 if test "${enable_taskbaricon+set}" = set; then

-  enableval=$enable_taskbaricon;
+  enableval="$enable_taskbaricon"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes'
                           else


@@ -13488,8 +12943,7 @@ else
 
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
 
 
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_taskbaricon"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_taskbaricon"
           if test "x$cache" = xyes; then


@@ -13506,8 +12960,8 @@ fi
             result=$wxUSE_TASKBARICON
           fi
 
             result=$wxUSE_TASKBARICON
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13520,11 +12974,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
-          # Check whether --enable-textctrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6
+          # Check whether --enable-textctrl or --disable-textctrl was given.

 if test "${enable_textctrl+set}" = set; then
 if test "${enable_textctrl+set}" = set; then

-  enableval=$enable_textctrl;
+  enableval="$enable_textctrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                           else


@@ -13544,8 +12999,7 @@ else
 
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
 
 
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_textctrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_textctrl"
           if test "x$cache" = xyes; then


@@ -13562,8 +13016,8 @@ fi
             result=$wxUSE_TEXTCTRL
           fi
 
             result=$wxUSE_TEXTCTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13576,11 +13030,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
-          # Check whether --enable-togglebtn was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6
+          # Check whether --enable-togglebtn or --disable-togglebtn was given.

 if test "${enable_togglebtn+set}" = set; then
 if test "${enable_togglebtn+set}" = set; then

-  enableval=$enable_togglebtn;
+  enableval="$enable_togglebtn"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                           else


@@ -13600,8 +13055,7 @@ else
 
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
 
 
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_togglebtn"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_togglebtn"
           if test "x$cache" = xyes; then


@@ -13618,8 +13072,8 @@ fi
             result=$wxUSE_TOGGLEBTN
           fi
 
             result=$wxUSE_TOGGLEBTN
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13632,11 +13086,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
-          # Check whether --enable-toolbar was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6
+          # Check whether --enable-toolbar or --disable-toolbar was given.

 if test "${enable_toolbar+set}" = set; then
 if test "${enable_toolbar+set}" = set; then

-  enableval=$enable_toolbar;
+  enableval="$enable_toolbar"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                           else


@@ -13656,8 +13111,7 @@ else
 
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
 
 
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_toolbar"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_toolbar"
           if test "x$cache" = xyes; then


@@ -13674,8 +13128,8 @@ fi
             result=$wxUSE_TOOLBAR
           fi
 
             result=$wxUSE_TOOLBAR
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13688,11 +13142,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
-          # Check whether --enable-tbarnative was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6
+          # Check whether --enable-tbarnative or --disable-tbarnative was given.

 if test "${enable_tbarnative+set}" = set; then
 if test "${enable_tbarnative+set}" = set; then

-  enableval=$enable_tbarnative;
+  enableval="$enable_tbarnative"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                           else


@@ -13712,8 +13167,7 @@ else
 
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
 
 
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_tbarnative"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_tbarnative"
           if test "x$cache" = xyes; then


@@ -13730,8 +13184,8 @@ fi
             result=$wxUSE_TOOLBAR_NATIVE
           fi
 
             result=$wxUSE_TOOLBAR_NATIVE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13744,11 +13198,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
-          # Check whether --enable-treebook was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6
+          # Check whether --enable-treebook or --disable-treebook was given.

 if test "${enable_treebook+set}" = set; then
 if test "${enable_treebook+set}" = set; then

-  enableval=$enable_treebook;
+  enableval="$enable_treebook"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
                           else


@@ -13768,8 +13223,7 @@ else
 
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
 
 
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_treebook"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_treebook"
           if test "x$cache" = xyes; then


@@ -13786,8 +13240,8 @@ fi
             result=$wxUSE_TREEBOOK
           fi
 
             result=$wxUSE_TREEBOOK
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13800,11 +13254,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; }
-          # Check whether --enable-toolbook was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6
+          # Check whether --enable-toolbook or --disable-toolbook was given.

 if test "${enable_toolbook+set}" = set; then
 if test "${enable_toolbook+set}" = set; then

-  enableval=$enable_toolbook;
+  enableval="$enable_toolbook"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
                           else


@@ -13824,8 +13279,7 @@ else
 
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
 
 
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_toolbook"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_toolbook"
           if test "x$cache" = xyes; then


@@ -13842,8 +13296,8 @@ fi
             result=$wxUSE_TOOLBOOK
           fi
 
             result=$wxUSE_TOOLBOOK
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13856,11 +13310,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
-          # Check whether --enable-treectrl was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6
+          # Check whether --enable-treectrl or --disable-treectrl was given.

 if test "${enable_treectrl+set}" = set; then
 if test "${enable_treectrl+set}" = set; then

-  enableval=$enable_treectrl;
+  enableval="$enable_treectrl"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
                           else


@@ -13880,8 +13335,7 @@ else
 
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
 
 
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_treectrl"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_treectrl"
           if test "x$cache" = xyes; then


@@ -13898,8 +13352,8 @@ fi
             result=$wxUSE_TREECTRL
           fi
 
             result=$wxUSE_TREECTRL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13912,11 +13366,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
-          # Check whether --enable-tipwindow was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6
+          # Check whether --enable-tipwindow or --disable-tipwindow was given.

 if test "${enable_tipwindow+set}" = set; then
 if test "${enable_tipwindow+set}" = set; then

-  enableval=$enable_tipwindow;
+  enableval="$enable_tipwindow"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                           else


@@ -13936,8 +13391,7 @@ else
 
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
 
 
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_tipwindow"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_tipwindow"
           if test "x$cache" = xyes; then


@@ -13954,8 +13408,8 @@ fi
             result=$wxUSE_TIPWINDOW
           fi
 
             result=$wxUSE_TIPWINDOW
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -13968,11 +13422,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
-          # Check whether --enable-popupwin was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6
+          # Check whether --enable-popupwin or --disable-popupwin was given.

 if test "${enable_popupwin+set}" = set; then
 if test "${enable_popupwin+set}" = set; then

-  enableval=$enable_popupwin;
+  enableval="$enable_popupwin"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
                           else


@@ -13992,8 +13447,7 @@ else
 
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
 
 
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_popupwin"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_popupwin"
           if test "x$cache" = xyes; then


@@ -14010,8 +13464,8 @@ fi
             result=$wxUSE_POPUPWIN
           fi
 
             result=$wxUSE_POPUPWIN
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -14026,11 +13480,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6; }
-          # Check whether --enable-commondlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6
+          # Check whether --enable-commondlg or --disable-commondlg was given.

 if test "${enable_commondlg+set}" = set; then
 if test "${enable_commondlg+set}" = set; then

-  enableval=$enable_commondlg;
+  enableval="$enable_commondlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
                           else


@@ -14050,8 +13505,7 @@ else
 
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
 
 
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_commondlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_commondlg"
           if test "x$cache" = xyes; then


@@ -14068,8 +13522,8 @@ fi
             result=$wxUSE_COMMONDLGS
           fi
 
             result=$wxUSE_COMMONDLGS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14082,11 +13536,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; }
-          # Check whether --enable-aboutdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6
+          # Check whether --enable-aboutdlg or --disable-aboutdlg was given.

 if test "${enable_aboutdlg+set}" = set; then
 if test "${enable_aboutdlg+set}" = set; then

-  enableval=$enable_aboutdlg;
+  enableval="$enable_aboutdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
                           else


@@ -14106,8 +13561,7 @@ else
 
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
 
 
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_aboutdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_aboutdlg"
           if test "x$cache" = xyes; then


@@ -14124,8 +13578,8 @@ fi
             result=$wxUSE_ABOUTDLG
           fi
 
             result=$wxUSE_ABOUTDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14138,11 +13592,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6; }
-          # Check whether --enable-choicedlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6
+          # Check whether --enable-choicedlg or --disable-choicedlg was given.

 if test "${enable_choicedlg+set}" = set; then
 if test "${enable_choicedlg+set}" = set; then

-  enableval=$enable_choicedlg;
+  enableval="$enable_choicedlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
                           else


@@ -14162,8 +13617,7 @@ else
 
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
 
 
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_choicedlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_choicedlg"
           if test "x$cache" = xyes; then


@@ -14180,8 +13634,8 @@ fi
             result=$wxUSE_CHOICEDLG
           fi
 
             result=$wxUSE_CHOICEDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14194,11 +13648,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; }
-          # Check whether --enable-coldlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6
+          # Check whether --enable-coldlg or --disable-coldlg was given.

 if test "${enable_coldlg+set}" = set; then
 if test "${enable_coldlg+set}" = set; then

-  enableval=$enable_coldlg;
+  enableval="$enable_coldlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=yes'
                           else


@@ -14218,8 +13673,7 @@ else
 
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
 
 
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_coldlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_coldlg"
           if test "x$cache" = xyes; then


@@ -14236,8 +13690,8 @@ fi
             result=$wxUSE_COLOURDLG
           fi
 
             result=$wxUSE_COLOURDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14250,11 +13704,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; }
-          # Check whether --enable-filedlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6
+          # Check whether --enable-filedlg or --disable-filedlg was given.

 if test "${enable_filedlg+set}" = set; then
 if test "${enable_filedlg+set}" = set; then

-  enableval=$enable_filedlg;
+  enableval="$enable_filedlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_filedlg='wxUSE_FILEDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_filedlg='wxUSE_FILEDLG=yes'
                           else


@@ -14274,8 +13729,7 @@ else
 
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
 
 
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_filedlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_filedlg"
           if test "x$cache" = xyes; then


@@ -14292,8 +13746,8 @@ fi
             result=$wxUSE_FILEDLG
           fi
 
             result=$wxUSE_FILEDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14306,11 +13760,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; }
-          # Check whether --enable-finddlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6
+          # Check whether --enable-finddlg or --disable-finddlg was given.

 if test "${enable_finddlg+set}" = set; then
 if test "${enable_finddlg+set}" = set; then

-  enableval=$enable_finddlg;
+  enableval="$enable_finddlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
                           else


@@ -14330,8 +13785,7 @@ else
 
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
 
 
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_finddlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_finddlg"
           if test "x$cache" = xyes; then


@@ -14348,8 +13802,8 @@ fi
             result=$wxUSE_FINDREPLDLG
           fi
 
             result=$wxUSE_FINDREPLDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14362,11 +13816,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; }
-          # Check whether --enable-fontdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6
+          # Check whether --enable-fontdlg or --disable-fontdlg was given.

 if test "${enable_fontdlg+set}" = set; then
 if test "${enable_fontdlg+set}" = set; then

-  enableval=$enable_fontdlg;
+  enableval="$enable_fontdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=yes'
                           else


@@ -14386,8 +13841,7 @@ else
 
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
 
 
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_fontdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_fontdlg"
           if test "x$cache" = xyes; then


@@ -14404,8 +13858,8 @@ fi
             result=$wxUSE_FONTDLG
           fi
 
             result=$wxUSE_FONTDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14418,11 +13872,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; }
-          # Check whether --enable-dirdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6
+          # Check whether --enable-dirdlg or --disable-dirdlg was given.

 if test "${enable_dirdlg+set}" = set; then
 if test "${enable_dirdlg+set}" = set; then

-  enableval=$enable_dirdlg;
+  enableval="$enable_dirdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=yes'
                           else


@@ -14442,8 +13897,7 @@ else
 
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
 
 
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dirdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dirdlg"
           if test "x$cache" = xyes; then


@@ -14460,8 +13914,8 @@ fi
             result=$wxUSE_DIRDLG
           fi
 
             result=$wxUSE_DIRDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14474,11 +13928,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; }
-          # Check whether --enable-msgdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6
+          # Check whether --enable-msgdlg or --disable-msgdlg was given.

 if test "${enable_msgdlg+set}" = set; then
 if test "${enable_msgdlg+set}" = set; then

-  enableval=$enable_msgdlg;
+  enableval="$enable_msgdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=yes'
                           else


@@ -14498,8 +13953,7 @@ else
 
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
 
 
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_msgdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_msgdlg"
           if test "x$cache" = xyes; then


@@ -14516,8 +13970,8 @@ fi
             result=$wxUSE_MSGDLG
           fi
 
             result=$wxUSE_MSGDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14530,11 +13984,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6; }
-          # Check whether --enable-numberdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6
+          # Check whether --enable-numberdlg or --disable-numberdlg was given.

 if test "${enable_numberdlg+set}" = set; then
 if test "${enable_numberdlg+set}" = set; then

-  enableval=$enable_numberdlg;
+  enableval="$enable_numberdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
                           else


@@ -14554,8 +14009,7 @@ else
 
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
 
 
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_numberdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_numberdlg"
           if test "x$cache" = xyes; then


@@ -14572,8 +14026,8 @@ fi
             result=$wxUSE_NUMBERDLG
           fi
 
             result=$wxUSE_NUMBERDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14586,11 +14040,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; }
-          # Check whether --enable-splash was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6
+          # Check whether --enable-splash or --disable-splash was given.

 if test "${enable_splash+set}" = set; then
 if test "${enable_splash+set}" = set; then

-  enableval=$enable_splash;
+  enableval="$enable_splash"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_splash='wxUSE_SPLASH=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_splash='wxUSE_SPLASH=yes'
                           else


@@ -14610,8 +14065,7 @@ else
 
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
 
 
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_splash"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_splash"
           if test "x$cache" = xyes; then


@@ -14628,8 +14082,8 @@ fi
             result=$wxUSE_SPLASH
           fi
 
             result=$wxUSE_SPLASH
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14642,11 +14096,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; }
-          # Check whether --enable-textdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6
+          # Check whether --enable-textdlg or --disable-textdlg was given.

 if test "${enable_textdlg+set}" = set; then
 if test "${enable_textdlg+set}" = set; then

-  enableval=$enable_textdlg;
+  enableval="$enable_textdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=yes'
                           else


@@ -14666,8 +14121,7 @@ else
 
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
 
 
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_textdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_textdlg"
           if test "x$cache" = xyes; then


@@ -14684,8 +14138,8 @@ fi
             result=$wxUSE_TEXTDLG
           fi
 
             result=$wxUSE_TEXTDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14698,11 +14152,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; }
-          # Check whether --enable-tipdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6
+          # Check whether --enable-tipdlg or --disable-tipdlg was given.

 if test "${enable_tipdlg+set}" = set; then
 if test "${enable_tipdlg+set}" = set; then

-  enableval=$enable_tipdlg;
+  enableval="$enable_tipdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
                           else


@@ -14722,8 +14177,7 @@ else
 
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
 
 
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_tipdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_tipdlg"
           if test "x$cache" = xyes; then


@@ -14740,8 +14194,8 @@ fi
             result=$wxUSE_STARTUP_TIPS
           fi
 
             result=$wxUSE_STARTUP_TIPS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14754,11 +14208,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6; }
-          # Check whether --enable-progressdlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6
+          # Check whether --enable-progressdlg or --disable-progressdlg was given.

 if test "${enable_progressdlg+set}" = set; then
 if test "${enable_progressdlg+set}" = set; then

-  enableval=$enable_progressdlg;
+  enableval="$enable_progressdlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
                           else


@@ -14778,8 +14233,7 @@ else
 
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
 
 
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_progressdlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_progressdlg"
           if test "x$cache" = xyes; then


@@ -14796,8 +14250,8 @@ fi
             result=$wxUSE_PROGRESSDLG
           fi
 
             result=$wxUSE_PROGRESSDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14810,11 +14264,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6; }
-          # Check whether --enable-wizarddlg was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6
+          # Check whether --enable-wizarddlg or --disable-wizarddlg was given.

 if test "${enable_wizarddlg+set}" = set; then
 if test "${enable_wizarddlg+set}" = set; then

-  enableval=$enable_wizarddlg;
+  enableval="$enable_wizarddlg"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
                           else


@@ -14834,8 +14289,7 @@ else
 
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
 
 
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_wizarddlg"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_wizarddlg"
           if test "x$cache" = xyes; then


@@ -14852,8 +14306,8 @@ fi
             result=$wxUSE_WIZARDDLG
           fi
 
             result=$wxUSE_WIZARDDLG
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -14868,11 +14322,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; }
-          # Check whether --enable-menus was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6
+          # Check whether --enable-menus or --disable-menus was given.

 if test "${enable_menus+set}" = set; then
 if test "${enable_menus+set}" = set; then

-  enableval=$enable_menus;
+  enableval="$enable_menus"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_menus='wxUSE_MENUS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_menus='wxUSE_MENUS=yes'
                           else


@@ -14892,8 +14347,7 @@ else
 
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
 
 
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_menus"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_menus"
           if test "x$cache" = xyes; then


@@ -14910,8 +14364,8 @@ fi
             result=$wxUSE_MENUS
           fi
 
             result=$wxUSE_MENUS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14924,11 +14378,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6; }
-          # Check whether --enable-miniframe was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6
+          # Check whether --enable-miniframe or --disable-miniframe was given.

 if test "${enable_miniframe+set}" = set; then
 if test "${enable_miniframe+set}" = set; then

-  enableval=$enable_miniframe;
+  enableval="$enable_miniframe"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=yes'
                           else


@@ -14948,8 +14403,7 @@ else
 
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
 
 
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_miniframe"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_miniframe"
           if test "x$cache" = xyes; then


@@ -14966,8 +14420,8 @@ fi
             result=$wxUSE_MINIFRAME
           fi
 
             result=$wxUSE_MINIFRAME
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -14980,11 +14434,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; }
-          # Check whether --enable-tooltips was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6
+          # Check whether --enable-tooltips or --disable-tooltips was given.

 if test "${enable_tooltips+set}" = set; then
 if test "${enable_tooltips+set}" = set; then

-  enableval=$enable_tooltips;
+  enableval="$enable_tooltips"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
                           else


@@ -15004,8 +14459,7 @@ else
 
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
 
 
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_tooltips"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_tooltips"
           if test "x$cache" = xyes; then


@@ -15022,8 +14476,8 @@ fi
             result=$wxUSE_TOOLTIPS
           fi
 
             result=$wxUSE_TOOLTIPS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15036,11 +14490,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; }
-          # Check whether --enable-splines was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6
+          # Check whether --enable-splines or --disable-splines was given.

 if test "${enable_splines+set}" = set; then
 if test "${enable_splines+set}" = set; then

-  enableval=$enable_splines;
+  enableval="$enable_splines"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_splines='wxUSE_SPLINES=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_splines='wxUSE_SPLINES=yes'
                           else


@@ -15060,8 +14515,7 @@ else
 
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
 
 
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_splines"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_splines"
           if test "x$cache" = xyes; then


@@ -15078,8 +14532,8 @@ fi
             result=$wxUSE_SPLINES
           fi
 
             result=$wxUSE_SPLINES
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15092,11 +14546,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; }
-          # Check whether --enable-mousewheel was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6
+          # Check whether --enable-mousewheel or --disable-mousewheel was given.

 if test "${enable_mousewheel+set}" = set; then
 if test "${enable_mousewheel+set}" = set; then

-  enableval=$enable_mousewheel;
+  enableval="$enable_mousewheel"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
                           else


@@ -15116,8 +14571,7 @@ else
 
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
 
 
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_mousewheel"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_mousewheel"
           if test "x$cache" = xyes; then


@@ -15134,8 +14588,8 @@ fi
             result=$wxUSE_MOUSEWHEEL
           fi
 
             result=$wxUSE_MOUSEWHEEL
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15148,11 +14602,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6; }
-          # Check whether --enable-validators was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6
+          # Check whether --enable-validators or --disable-validators was given.

 if test "${enable_validators+set}" = set; then
 if test "${enable_validators+set}" = set; then

-  enableval=$enable_validators;
+  enableval="$enable_validators"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_validators='wxUSE_VALIDATORS=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_validators='wxUSE_VALIDATORS=yes'
                           else


@@ -15172,8 +14627,7 @@ else
 
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
 
 
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_validators"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_validators"
           if test "x$cache" = xyes; then


@@ -15190,8 +14644,8 @@ fi
             result=$wxUSE_VALIDATORS
           fi
 
             result=$wxUSE_VALIDATORS
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15204,11 +14658,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; }
-          # Check whether --enable-busyinfo was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6
+          # Check whether --enable-busyinfo or --disable-busyinfo was given.

 if test "${enable_busyinfo+set}" = set; then
 if test "${enable_busyinfo+set}" = set; then

-  enableval=$enable_busyinfo;
+  enableval="$enable_busyinfo"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
                           else


@@ -15228,8 +14683,7 @@ else
 
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
 
 
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_busyinfo"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_busyinfo"
           if test "x$cache" = xyes; then


@@ -15246,8 +14700,8 @@ fi
             result=$wxUSE_BUSYINFO
           fi
 
             result=$wxUSE_BUSYINFO
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15260,11 +14714,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; }
-          # Check whether --enable-joystick was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6
+          # Check whether --enable-joystick or --disable-joystick was given.

 if test "${enable_joystick+set}" = set; then
 if test "${enable_joystick+set}" = set; then

-  enableval=$enable_joystick;
+  enableval="$enable_joystick"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_joystick='wxUSE_JOYSTICK=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_joystick='wxUSE_JOYSTICK=yes'
                           else


@@ -15284,8 +14739,7 @@ else
 
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
 
 
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_joystick"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_joystick"
           if test "x$cache" = xyes; then


@@ -15302,8 +14756,8 @@ fi
             result=$wxUSE_JOYSTICK
           fi
 
             result=$wxUSE_JOYSTICK
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15316,11 +14770,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
-          # Check whether --enable-metafile was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6
+          # Check whether --enable-metafile or --disable-metafile was given.

 if test "${enable_metafile+set}" = set; then
 if test "${enable_metafile+set}" = set; then

-  enableval=$enable_metafile;
+  enableval="$enable_metafile"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_metafile='wxUSE_METAFILE=yes'
                           else


@@ -15340,8 +14795,7 @@ else
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_metafile"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_metafile"
           if test "x$cache" = xyes; then


@@ -15358,8 +14812,8 @@ fi
             result=$wxUSE_METAFILE
           fi
 
             result=$wxUSE_METAFILE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15372,11 +14826,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6; }
-          # Check whether --enable-dragimage was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6
+          # Check whether --enable-dragimage or --disable-dragimage was given.

 if test "${enable_dragimage+set}" = set; then
 if test "${enable_dragimage+set}" = set; then

-  enableval=$enable_dragimage;
+  enableval="$enable_dragimage"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
                           else


@@ -15396,8 +14851,7 @@ else
 
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
 
 
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dragimage"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dragimage"
           if test "x$cache" = xyes; then


@@ -15414,8 +14868,8 @@ fi
             result=$wxUSE_DRAGIMAGE
           fi
 
             result=$wxUSE_DRAGIMAGE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15428,11 +14882,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6; }
-          # Check whether --enable-accessibility was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6
+          # Check whether --enable-accessibility or --disable-accessibility was given.

 if test "${enable_accessibility+set}" = set; then
 if test "${enable_accessibility+set}" = set; then

-  enableval=$enable_accessibility;
+  enableval="$enable_accessibility"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
                           else


@@ -15452,8 +14907,7 @@ else
 
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
 
 
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_accessibility"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_accessibility"
           if test "x$cache" = xyes; then


@@ -15470,8 +14924,8 @@ fi
             result=$wxUSE_ACCESSIBILITY
           fi
 
             result=$wxUSE_ACCESSIBILITY
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -15486,11 +14940,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; }
-          # Check whether --enable-palette was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6
+          # Check whether --enable-palette or --disable-palette was given.

 if test "${enable_palette+set}" = set; then
 if test "${enable_palette+set}" = set; then

-  enableval=$enable_palette;
+  enableval="$enable_palette"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_palette='wxUSE_PALETTE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_palette='wxUSE_PALETTE=yes'
                           else


@@ -15510,8 +14965,7 @@ else
 
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
 
 
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_palette"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_palette"
           if test "x$cache" = xyes; then


@@ -15528,8 +14982,8 @@ fi
             result=$wxUSE_PALETTE
           fi
 
             result=$wxUSE_PALETTE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15542,11 +14996,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; }
-          # Check whether --enable-image was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6
+          # Check whether --enable-image or --disable-image was given.

 if test "${enable_image+set}" = set; then
 if test "${enable_image+set}" = set; then

-  enableval=$enable_image;
+  enableval="$enable_image"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_image='wxUSE_IMAGE=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_image='wxUSE_IMAGE=yes'
                           else


@@ -15566,8 +15021,7 @@ else
 
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
 
 
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_image"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_image"
           if test "x$cache" = xyes; then


@@ -15584,8 +15038,8 @@ fi
             result=$wxUSE_IMAGE
           fi
 
             result=$wxUSE_IMAGE
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15598,11 +15052,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; }
-          # Check whether --enable-gif was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6
+          # Check whether --enable-gif or --disable-gif was given.

 if test "${enable_gif+set}" = set; then
 if test "${enable_gif+set}" = set; then

-  enableval=$enable_gif;
+  enableval="$enable_gif"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_gif='wxUSE_GIF=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_gif='wxUSE_GIF=yes'
                           else


@@ -15622,8 +15077,7 @@ else
 
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
 
 
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_gif"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_gif"
           if test "x$cache" = xyes; then


@@ -15640,8 +15094,8 @@ fi
             result=$wxUSE_GIF
           fi
 
             result=$wxUSE_GIF
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15654,11 +15108,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; }
-          # Check whether --enable-pcx was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6
+          # Check whether --enable-pcx or --disable-pcx was given.

 if test "${enable_pcx+set}" = set; then
 if test "${enable_pcx+set}" = set; then

-  enableval=$enable_pcx;
+  enableval="$enable_pcx"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_pcx='wxUSE_PCX=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_pcx='wxUSE_PCX=yes'
                           else


@@ -15678,8 +15133,7 @@ else
 
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
 
 
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_pcx"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_pcx"
           if test "x$cache" = xyes; then


@@ -15696,8 +15150,8 @@ fi
             result=$wxUSE_PCX
           fi
 
             result=$wxUSE_PCX
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15710,11 +15164,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tga" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; }
-          # Check whether --enable-tga was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tga" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6
+          # Check whether --enable-tga or --disable-tga was given.

 if test "${enable_tga+set}" = set; then
 if test "${enable_tga+set}" = set; then

-  enableval=$enable_tga;
+  enableval="$enable_tga"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_tga='wxUSE_TGA=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_tga='wxUSE_TGA=yes'
                           else


@@ -15734,8 +15189,7 @@ else
 
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
 
 
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_tga"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_tga"
           if test "x$cache" = xyes; then


@@ -15752,8 +15206,8 @@ fi
             result=$wxUSE_TGA
           fi
 
             result=$wxUSE_TGA
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15766,11 +15220,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; }
-          # Check whether --enable-iff was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6
+          # Check whether --enable-iff or --disable-iff was given.

 if test "${enable_iff+set}" = set; then
 if test "${enable_iff+set}" = set; then

-  enableval=$enable_iff;
+  enableval="$enable_iff"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_iff='wxUSE_IFF=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_iff='wxUSE_IFF=yes'
                           else


@@ -15790,8 +15245,7 @@ else
 
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
 
 
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_iff"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_iff"
           if test "x$cache" = xyes; then


@@ -15808,8 +15262,8 @@ fi
             result=$wxUSE_IFF
           fi
 
             result=$wxUSE_IFF
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15822,11 +15276,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; }
-          # Check whether --enable-pnm was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6
+          # Check whether --enable-pnm or --disable-pnm was given.

 if test "${enable_pnm+set}" = set; then
 if test "${enable_pnm+set}" = set; then

-  enableval=$enable_pnm;
+  enableval="$enable_pnm"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_pnm='wxUSE_PNM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_pnm='wxUSE_PNM=yes'
                           else


@@ -15846,8 +15301,7 @@ else
 
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
 
 
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_pnm"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_pnm"
           if test "x$cache" = xyes; then


@@ -15864,8 +15318,8 @@ fi
             result=$wxUSE_PNM
           fi
 
             result=$wxUSE_PNM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15878,11 +15332,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; }
-          # Check whether --enable-xpm was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6
+          # Check whether --enable-xpm or --disable-xpm was given.

 if test "${enable_xpm+set}" = set; then
 if test "${enable_xpm+set}" = set; then

-  enableval=$enable_xpm;
+  enableval="$enable_xpm"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_xpm='wxUSE_XPM=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_xpm='wxUSE_XPM=yes'
                           else


@@ -15902,8 +15357,7 @@ else
 
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
 
 
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_xpm"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_xpm"
           if test "x$cache" = xyes; then


@@ -15920,8 +15374,8 @@ fi
             result=$wxUSE_XPM
           fi
 
             result=$wxUSE_XPM
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -15934,11 +15388,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; }
-          # Check whether --enable-ico_cur was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6
+          # Check whether --enable-ico_cur or --disable-ico_cur was given.

 if test "${enable_ico_cur+set}" = set; then
 if test "${enable_ico_cur+set}" = set; then

-  enableval=$enable_ico_cur;
+  enableval="$enable_ico_cur"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
                           else


@@ -15958,8 +15413,7 @@ else
 
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
 
 
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_ico_cur"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_ico_cur"
           if test "x$cache" = xyes; then


@@ -15976,8 +15430,8 @@ fi
             result=$wxUSE_ICO_CUR
           fi
 
             result=$wxUSE_ICO_CUR
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 
 
 
 


@@ -15992,11 +15446,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
-          # Check whether --enable-dccache was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6
+          # Check whether --enable-dccache or --disable-dccache was given.

 if test "${enable_dccache+set}" = set; then
 if test "${enable_dccache+set}" = set; then

-  enableval=$enable_dccache;
+  enableval="$enable_dccache"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
                           else


@@ -16016,8 +15471,7 @@ else
 
                           wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
 
 
                           wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_dccache"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_dccache"
           if test "x$cache" = xyes; then


@@ -16034,64 +15488,8 @@ fi
             result=$wxUSE_DC_CACHEING
           fi
 
             result=$wxUSE_DC_CACHEING
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iniconf" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6; }
-          # Check whether --enable-iniconf was given.
-if test "${enable_iniconf+set}" = set; then
-  enableval=$enable_iniconf;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_iniconf='wxUSE_INICONF=yes'
-                          else
-                            wx_cv_use_iniconf='wxUSE_INICONF=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_iniconf"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_INICONF = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_INICONF
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -16104,11 +15502,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ps-in-msw" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6; }
-          # Check whether --enable-ps-in-msw was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ps-in-msw" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6
+          # Check whether --enable-ps-in-msw or --disable-ps-in-msw was given.

 if test "${enable_ps_in_msw+set}" = set; then
 if test "${enable_ps_in_msw+set}" = set; then

-  enableval=$enable_ps_in_msw;
+  enableval="$enable_ps_in_msw"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes'
                           else


@@ -16128,8 +15527,7 @@ else
 
                           wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
 
 
                           wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_ps_in_msw"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_ps_in_msw"
           if test "x$cache" = xyes; then


@@ -16146,8 +15544,8 @@ fi
             result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
           fi
 
             result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -16160,11 +15558,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ownerdrawn" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; }
-          # Check whether --enable-ownerdrawn was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ownerdrawn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6
+          # Check whether --enable-ownerdrawn or --disable-ownerdrawn was given.

 if test "${enable_ownerdrawn+set}" = set; then
 if test "${enable_ownerdrawn+set}" = set; then

-  enableval=$enable_ownerdrawn;
+  enableval="$enable_ownerdrawn"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes'
                           else


@@ -16184,8 +15583,7 @@ else
 
                           wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
 
 
                           wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_ownerdrawn"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_ownerdrawn"
           if test "x$cache" = xyes; then


@@ -16202,64 +15600,8 @@ fi
             result=$wxUSE_OWNER_DRAWN
           fi
 
             result=$wxUSE_OWNER_DRAWN
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-regkey" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; }
-          # Check whether --enable-regkey was given.
-if test "${enable_regkey+set}" = set; then
-  enableval=$enable_regkey;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_regkey='wxUSE_REGKEY=yes'
-                          else
-                            wx_cv_use_regkey='wxUSE_REGKEY=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_regkey"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_REGKEY = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_REGKEY
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -16272,11 +15614,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uxtheme" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6; }
-          # Check whether --enable-uxtheme was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uxtheme" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6
+          # Check whether --enable-uxtheme or --disable-uxtheme was given.

 if test "${enable_uxtheme+set}" = set; then
 if test "${enable_uxtheme+set}" = set; then

-  enableval=$enable_uxtheme;
+  enableval="$enable_uxtheme"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_uxtheme='wxUSE_UXTHEME=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_uxtheme='wxUSE_UXTHEME=yes'
                           else


@@ -16296,8 +15639,7 @@ else
 
                           wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
 
 
                           wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_uxtheme"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_uxtheme"
           if test "x$cache" = xyes; then


@@ -16314,8 +15656,8 @@ fi
             result=$wxUSE_UXTHEME
           fi
 
             result=$wxUSE_UXTHEME
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
           enablestring=
 
 
           enablestring=


@@ -16328,11 +15670,12 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 

-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxdib" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wxdib... $ECHO_C" >&6; }
-          # Check whether --enable-wxdib was given.
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxdib" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wxdib... $ECHO_C" >&6
+          # Check whether --enable-wxdib or --disable-wxdib was given.

 if test "${enable_wxdib+set}" = set; then
 if test "${enable_wxdib+set}" = set; then

-  enableval=$enable_wxdib;
+  enableval="$enable_wxdib"
+

                           if test "$enableval" = yes; then
                             wx_cv_use_wxdib='wxUSE_DIB=yes'
                           else
                           if test "$enableval" = yes; then
                             wx_cv_use_wxdib='wxUSE_DIB=yes'
                           else


@@ -16352,8 +15695,7 @@ else
 
                           wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
 
 
                           wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
 

-fi
-
+fi;

 
           eval "$wx_cv_use_wxdib"
           if test "x$cache" = xyes; then
 
           eval "$wx_cv_use_wxdib"
           if test "x$cache" = xyes; then


@@ -16370,8 +15712,8 @@ fi
             result=$wxUSE_DIB
           fi
 
             result=$wxUSE_DIB
           fi
 

-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6

 
 
 fi
 
 
 fi


@@ -16382,8 +15724,8 @@ fi
 
 
 
 
 
 

-{ echo "$as_me:$LINENO: checking for toolkit" >&5
-echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for toolkit" >&5
+echo $ECHO_N "checking for toolkit... $ECHO_C" >&6

 
 # In Wine, we need to default to MSW, not GTK or MOTIF
 if test "$wxUSE_WINE" = "yes"; then
 
 # In Wine, we need to default to MSW, not GTK or MOTIF
 if test "$wxUSE_WINE" = "yes"; then


@@ -16479,18 +15821,18 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`

-          { echo "$as_me:$LINENO: result: $toolkit_echo" >&5
-echo "${ECHO_T}$toolkit_echo" >&6; }
+          echo "$as_me:$LINENO: result: $toolkit_echo" >&5
+echo "${ECHO_T}$toolkit_echo" >&6

         fi
       fi
     done
 else
     if test "x$host_alias" != "x"; then
         fi
       fi
     done
 else
     if test "x$host_alias" != "x"; then

-        { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
-echo "${ECHO_T}base ($host_alias hosted) only" >&6; }
+        echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
+echo "${ECHO_T}base ($host_alias hosted) only" >&6

     else
     else

-        { echo "$as_me:$LINENO: result: base only" >&5
-echo "${ECHO_T}base only" >&6; }
+        echo "$as_me:$LINENO: result: base only" >&5
+echo "${ECHO_T}base only" >&6

     fi
 fi
 
     fi
 fi
 


@@ -16513,58 +15855,39 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.

-# So, we kill variables containing newlines.
+# So, don't put newlines in cache variables' values.

 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.

-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
+{

   (set) 2>&1 |
   (set) 2>&1 |

-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)

       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"

-      ;; #(
+      ;;

     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.

-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+       "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
       ;;

-    esac |
-    sort
-) |
+    esac;
+} |

   sed '
   sed '

-     /^ac_cv_env_/b end

      t clear
      t clear

-     :clear
+     : clear

      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end

-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"

     cat confcache >$cache_file
   else
     cat confcache >$cache_file
   else

-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    echo "not updating unwritable cache $cache_file"

   fi
 fi
 rm -f confcache
   fi
 fi
 rm -f confcache


@@ -16581,8 +15904,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -16595,34 +15918,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -16635,51 +15956,36 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
+  CC=$ac_ct_CC

 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then

-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

 set dummy ${ac_tool_prefix}cc; ac_word=$2
 set dummy ${ac_tool_prefix}cc; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -16692,34 +15998,74 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2

   fi
   fi

+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+

 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -16733,7 +16079,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue


@@ -16744,7 +16090,6 @@ do
   fi
 done
 done
   fi
 done
 done

-IFS=$as_save_IFS

 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.


@@ -16762,23 +16107,22 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then

-  for ac_prog in cl.exe
+  for ac_prog in cl

   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -16791,38 +16135,36 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then

-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC

-  for ac_prog in cl.exe
+  for ac_prog in cl

 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -16835,45 +16177,29 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

   test -n "$ac_ct_CC" && break
 done
 
   test -n "$ac_ct_CC" && break
 done
 

-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
+  CC=$ac_ct_CC

 fi
 
 fi
 fi
 
 fi


@@ -16886,35 +16212,21 @@ See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.

-echo "$as_me:$LINENO: checking for C compiler version" >&5
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5

 ac_compiler=`set X $ac_compile; echo $2`
 ac_compiler=`set X $ac_compile; echo $2`

-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }

-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }

-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }


@@ -16939,77 +16251,47 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.

-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6

 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then

-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out

 do
   test -f "$ac_file" || continue
   case $ac_file in
 do
   test -f "$ac_file" || continue
   case $ac_file in

-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+       ;;
+    conftest.$ac_ext )
+       # This is the source file.

        ;;
     [ab].out )
        # We found the default executable, but exeext='' is most
        # certainly right.
        break;;
     *.* )
        ;;
     [ab].out )
        # We found the default executable, but exeext='' is most
        # certainly right.
        break;;
     *.* )

-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-       then :; else
-          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-       fi
-       # We set ac_cv_exeext here because the later test for it is not
-       # safe: cross compilers may not add the suffix if given an `-o'
-       # argument, so we may need to know it at that point already.
-       # Even if this section looks crufty: it has the advantage of
-       # actually working.
+       ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+       # FIXME: I believe we export ac_cv_exeext for Libtool,
+       # but it would be cool to find out if it's true.  Does anybody
+       # maintain Libtool? --akim.
+       export ac_cv_exeext

        break;;
     * )
        break;;
   esac
 done
        break;;
     * )
        break;;
   esac
 done

-test "$ac_cv_exeext" = no && ac_cv_exeext=
-

 else
 else

-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then

   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 


@@ -17021,21 +16303,19 @@ See \`config.log' for more details." >&2;}
 fi
 
 ac_exeext=$ac_cv_exeext
 fi
 
 ac_exeext=$ac_cv_exeext

+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6

 
 

-# Check that the compiler produces executables we can run.  If not, either
+# Check the compiler produces executables we can run.  If not, either

 # the compiler is broken, or we cross compile.
 # the compiler is broken, or we cross compile.

-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6

 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -17054,27 +16334,22 @@ See \`config.log' for more details." >&2;}
     fi
   fi
 fi
     fi
   fi
 fi

-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save

-# Check that the compiler produces executables we can run.  If not, either
+# Check the compiler produces executables we can run.  If not, either

 # the compiler is broken, or we cross compile.
 # the compiler is broken, or we cross compile.

-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then


@@ -17085,8 +16360,9 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in

-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;

     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`

+         export ac_cv_exeext

          break;;
     * ) break;;
   esac
          break;;
     * ) break;;
   esac


@@ -17100,14 +16376,14 @@ See \`config.log' for more details." >&2;}
 fi
 
 rm -f conftest$ac_cv_exeext
 fi
 
 rm -f conftest$ac_cv_exeext

-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6

 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT

-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6

 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -17127,20 +16403,14 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then

-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do

   case $ac_file in
   case $ac_file in

-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;

     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac


@@ -17158,12 +16428,12 @@ fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6

 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6

 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -17186,49 +16456,50 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_compiler_gnu=no
+ac_compiler_gnu=no

 fi
 fi

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

 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6

 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS

-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -17244,118 +16515,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); }; }; then

   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-
+ac_cv_prog_cc_g=no

 fi
 fi

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

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then


@@ -17371,12 +16562,12 @@ else
     CFLAGS=
   fi
 fi
     CFLAGS=
   fi
 fi

-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_cv_prog_cc_c89=no
+  ac_cv_prog_cc_stdc=no

 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -17410,17 +16601,12 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated

-   as 'x'.  The following induces an error, until -std is added to get
+   as 'x'.  The following induces an error, until -std1 is added to get

    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something

-   that's true only with -std.  */
+   that's true only with -std1.  */

 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 

-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-

 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};


@@ -17435,57 +16621,205 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
   return 0;
 }
 _ACEOF

-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX                  -qlanglvl=ansi
+# Ultrix and OSF/1     -std1
+# HP-UX 10.20 and later        -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE
+# SVR4                 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
+rm -f conftest.err conftest.$ac_objext

 done
 done

-rm -f conftest.$ac_ext
+rm -f conftest.$ac_ext conftest.$ac_objext

 CC=$ac_save_CC
 
 fi
 CC=$ac_save_CC
 
 fi

-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;

   *)
   *)

-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;

 esac
 
 esac
 

+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -17501,8 +16835,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Intel C compiler" >&5
-echo $ECHO_N "checking whether we are using the Intel C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Intel C compiler" >&5
+echo $ECHO_N "checking whether we are using the Intel C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___INTEL_COMPILER+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___INTEL_COMPILER+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -17526,37 +16860,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___INTEL_COMPILER=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___INTEL_COMPILER=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___INTEL_COMPILER=no
+bakefile_cv_c_compiler___INTEL_COMPILER=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6

     if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
         :; INTELCC=yes
     else
     if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
         :; INTELCC=yes
     else


@@ -17573,8 +16911,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
         if test "x$GCC" != "xyes"; then
         if test "xCC" = "xC"; then
 
         if test "x$GCC" != "xyes"; then
         if test "xCC" = "xC"; then

-            { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
-echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
+echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6

 if test "${bakefile_cv_c_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -17620,8 +16958,8 @@ fi
 rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_exto" >&5
-echo "${ECHO_T}$bakefile_cv_c_exto" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_exto" >&5
+echo "${ECHO_T}$bakefile_cv_c_exto" >&6

 if test "x$bakefile_cv_c_exto" '!=' "x"; then
     if test "c" = "c"; then
         CFLAGS="$bakefile_cv_c_exto $CFLAGS"
 if test "x$bakefile_cv_c_exto" '!=' "x"; then
     if test "c" = "c"; then
         CFLAGS="$bakefile_cv_c_exto $CFLAGS"


@@ -17635,16 +16973,13 @@ fi
                 unset ac_cv_prog_cc_g
                 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
                 unset ac_cv_prog_cc_g
                 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS

-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -17660,118 +16995,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); }; }; then

   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-
+ac_cv_prog_cc_g=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then


@@ -17800,8 +17055,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
-echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
+echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -17825,37 +17080,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___xlC__=no
+bakefile_cv_c_compiler___xlC__=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6

     if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then
         :; XLCC=yes
     else
     if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then
         :; XLCC=yes
     else


@@ -17880,8 +17139,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5
-echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5
+echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -17905,37 +17164,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___MWERKS__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___MWERKS__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___MWERKS__=no
+bakefile_cv_c_compiler___MWERKS__=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___MWERKS__" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___MWERKS__" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___MWERKS__" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___MWERKS__" >&6

     if test "x$bakefile_cv_c_compiler___MWERKS__" = "xyes"; then
         :; MWCC=yes
     else
     if test "x$bakefile_cv_c_compiler___MWERKS__" = "xyes"; then
         :; MWCC=yes
     else


@@ -17957,8 +17220,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
-echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
+echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -17982,37 +17245,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___xlC__=no
+bakefile_cv_c_compiler___xlC__=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6

     if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then
         :; XLCC=yes
     else
     if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then
         :; XLCC=yes
     else


@@ -18037,8 +17304,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the SGI C compiler" >&5
-echo $ECHO_N "checking whether we are using the SGI C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the SGI C compiler" >&5
+echo $ECHO_N "checking whether we are using the SGI C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18062,37 +17329,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no
+bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6

     if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
         :; SGICC=yes
     else
     if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
         :; SGICC=yes
     else


@@ -18117,8 +17388,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Sun C compiler" >&5
-echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Sun C compiler" >&5
+echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18142,37 +17413,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___SUNPRO_C=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___SUNPRO_C=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___SUNPRO_C=no
+bakefile_cv_c_compiler___SUNPRO_C=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6

     if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
         :; SUNCC=yes
     else
     if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
         :; SUNCC=yes
     else


@@ -18197,8 +17472,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the HP C compiler" >&5
-echo $ECHO_N "checking whether we are using the HP C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the HP C compiler" >&5
+echo $ECHO_N "checking whether we are using the HP C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18222,37 +17497,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___HP_cc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___HP_cc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___HP_cc=no
+bakefile_cv_c_compiler___HP_cc=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6

     if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
         :; HPCC=yes
     else
     if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
         :; HPCC=yes
     else


@@ -18277,8 +17556,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Compaq C compiler" >&5
-echo $ECHO_N "checking whether we are using the Compaq C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Compaq C compiler" >&5
+echo $ECHO_N "checking whether we are using the Compaq C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___DECC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___DECC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18302,37 +17581,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___DECC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___DECC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___DECC=no
+bakefile_cv_c_compiler___DECC=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6

     if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
         :; COMPAQCC=yes
     else
     if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
         :; COMPAQCC=yes
     else


@@ -18357,8 +17640,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Sun C compiler" >&5
-echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Sun C compiler" >&5
+echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6

 if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18382,37 +17665,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_c_compiler___SUNPRO_C=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_c_compiler___SUNPRO_C=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_c_compiler___SUNPRO_C=no
+bakefile_cv_c_compiler___SUNPRO_C=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6

     if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
         :; SUNCC=yes
     else
     if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
         :; SUNCC=yes
     else


@@ -18437,8 +17724,8 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6

 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=


@@ -18472,22 +17759,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
                     Syntax error
 _ACEOF
 #endif
                     Syntax error
 _ACEOF

-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5


@@ -18496,10 +17785,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-

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

-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers

   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -18509,22 +17797,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF

-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   # Broken: success on invalid input.
 continue
 else
   # Broken: success on invalid input.
 continue
 else


@@ -18535,7 +17825,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
 ac_preproc_ok=:
 break
 fi

-

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


@@ -18553,8 +17842,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
 else
   ac_cv_prog_CPP=$CPP
 fi

-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6

 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do


@@ -18577,22 +17866,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
                     Syntax error
 _ACEOF
 #endif
                     Syntax error
 _ACEOF

-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   :
 else
   echo "$as_me: failed program was:" >&5
   :
 else
   echo "$as_me: failed program was:" >&5


@@ -18601,10 +17892,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
   # Broken: fails on valid input.
 continue
 fi
   # Broken: fails on valid input.
 continue
 fi

-

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

-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers

   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -18614,22 +17904,24 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF

-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   # Broken: success on invalid input.
 continue
 else
   # Broken: success on invalid input.
 continue
 else


@@ -18640,7 +17932,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ac_preproc_ok=:
 break
 fi
 ac_preproc_ok=:
 break
 fi

-

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


@@ -18663,171 +17954,24 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 

-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep

 
 
 if test $ac_cv_c_compiler_gnu = yes; then
 
 
 if test $ac_cv_c_compiler_gnu = yes; then

-    { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
+echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6

 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18868,8 +18012,8 @@ rm -f conftest*
 
   fi
 fi
 
   fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6

   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi


@@ -18880,22 +18024,18 @@ CXXFLAGS=${CXXFLAGS:=}
 
 
 
 
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18908,38 +18048,36 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then

-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX

-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -18952,85 +18090,55 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_CXX="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

   test -n "$ac_ct_CXX" && break
 done
   test -n "$ac_ct_CXX" && break
 done

+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"

 
 

-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
+  CXX=$ac_ct_CXX

 fi
 
 fi
 

-  fi
-fi
+

 # Provide some information about the compiler.
 # Provide some information about the compiler.

-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+echo "$as_me:$LINENO:" \
+     "checking for C++ compiler version" >&5

 ac_compiler=`set X $ac_compile; echo $2`
 ac_compiler=`set X $ac_compile; echo $2`

-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }

-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }

-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6

 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19053,49 +18161,50 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_compiler_gnu=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_compiler_gnu=no
+ac_compiler_gnu=no

 fi
 fi

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

 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6

 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS

-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6

 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -19111,133 +18220,159 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_prog_cxx_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
+ac_cv_prog_cxx_g=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-
+$ac_declaration
+#include <stdlib.h>

 int
 main ()
 {
 int
 main ()
 {

-
+exit (42);

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   :
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-        CXXFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-
+$ac_declaration

 int
 main ()
 {
 int
 main ()
 {

-
+exit (42);

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

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

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h

 fi
 
 fi
 

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi

 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -19247,14 +18382,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Intel C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Intel C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Intel C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Intel C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19278,37 +18413,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___INTEL_COMPILER=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___INTEL_COMPILER=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___INTEL_COMPILER=no
+bakefile_cv_cxx_compiler___INTEL_COMPILER=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6

     if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
         :; INTELCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
         :; INTELCXX=yes
     else


@@ -19325,8 +18464,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
         if test "x$GCXX" != "xyes"; then
         if test "xCXX" = "xC"; then
 
         if test "x$GCXX" != "xyes"; then
         if test "xCXX" = "xC"; then

-            { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
-echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
+echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6

 if test "${bakefile_cv_c_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_c_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19372,8 +18511,8 @@ fi
 rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_exto" >&5
-echo "${ECHO_T}$bakefile_cv_c_exto" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_c_exto" >&5
+echo "${ECHO_T}$bakefile_cv_c_exto" >&6

 if test "x$bakefile_cv_c_exto" '!=' "x"; then
     if test "c" = "c"; then
         CFLAGS="$bakefile_cv_c_exto $CFLAGS"
 if test "x$bakefile_cv_c_exto" '!=' "x"; then
     if test "c" = "c"; then
         CFLAGS="$bakefile_cv_c_exto $CFLAGS"


@@ -19387,16 +18526,13 @@ fi
                 unset ac_cv_prog_cc_g
                 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
                 unset ac_cv_prog_cc_g
                 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS

-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -19412,118 +18548,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5

   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); }; }; then

   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-
+ac_cv_prog_cc_g=no

 fi
 fi

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

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then


@@ -19546,14 +18602,14 @@ fi
             AIX*)
 
 
             AIX*)
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19577,37 +18633,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___xlC__=no
+bakefile_cv_cxx_compiler___xlC__=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6

     if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then
         :; XLCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then
         :; XLCXX=yes
     else


@@ -19626,14 +18686,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             Darwin)
 
 
             Darwin)
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19657,37 +18717,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___MWERKS__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___MWERKS__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___MWERKS__=no
+bakefile_cv_cxx_compiler___MWERKS__=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___MWERKS__" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___MWERKS__" >&6

     if test "x$bakefile_cv_cxx_compiler___MWERKS__" = "xyes"; then
         :; MWCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___MWERKS__" = "xyes"; then
         :; MWCXX=yes
     else


@@ -19703,14 +18767,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19734,37 +18798,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___xlC__=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___xlC__=no
+bakefile_cv_cxx_compiler___xlC__=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6

     if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then
         :; XLCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then
         :; XLCXX=yes
     else


@@ -19783,14 +18851,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             IRIX*)
 
 
             IRIX*)
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the SGI C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the SGI C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the SGI C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the SGI C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19814,37 +18882,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=no
+bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6

     if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then
         :; SGICXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then
         :; SGICXX=yes
     else


@@ -19863,14 +18935,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             Linux*)
 
 
             Linux*)
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19894,37 +18966,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___SUNPRO_CC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___SUNPRO_CC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___SUNPRO_CC=no
+bakefile_cv_cxx_compiler___SUNPRO_CC=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6

     if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
         :; SUNCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
         :; SUNCXX=yes
     else


@@ -19943,14 +19019,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             HP-UX*)
 
 
             HP-UX*)
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the HP C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the HP C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the HP C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the HP C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -19974,37 +19050,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___HP_aCC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___HP_aCC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___HP_aCC=no
+bakefile_cv_cxx_compiler___HP_aCC=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6

     if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then
         :; HPCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then
         :; HPCXX=yes
     else


@@ -20023,14 +19103,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             OSF1)
 
 
             OSF1)
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Compaq C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Compaq C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Compaq C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Compaq C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -20054,37 +19134,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___DECCXX=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___DECCXX=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___DECCXX=no
+bakefile_cv_cxx_compiler___DECCXX=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6

     if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then
         :; COMPAQCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then
         :; COMPAQCXX=yes
     else


@@ -20103,14 +19187,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
             SunOS)
 
 
             SunOS)
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6

 if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -20134,37 +19218,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_cxx_compiler___SUNPRO_CC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   bakefile_cv_cxx_compiler___SUNPRO_CC=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       bakefile_cv_cxx_compiler___SUNPRO_CC=no
+bakefile_cv_cxx_compiler___SUNPRO_CC=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6

     if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
         :; SUNCXX=yes
     else
     if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
         :; SUNCXX=yes
     else


@@ -20194,8 +19282,8 @@ if test "x$SUNCXX" != xyes; then
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -20208,34 +19296,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_AR="${ac_tool_prefix}ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then

-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -20248,41 +19334,26 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_AR="ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_AR="ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_ct_AR" = x; then
-    AR=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
+  AR=$ac_ct_AR

 else
   AR="$ac_cv_prog_AR"
 fi
 else
   AR="$ac_cv_prog_AR"
 fi


@@ -20349,8 +19420,8 @@ fi
 
 
 if test "x$wxUSE_MACOSX_SDK" != "x"; then
 
 
 if test "x$wxUSE_MACOSX_SDK" != "x"; then

-    { echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5
-echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5
+echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6

     if ! test -d "$wxUSE_MACOSX_SDK"; then
         { { echo "$as_me:$LINENO: error: not found
 See \`config.log' for more details." >&5
     if ! test -d "$wxUSE_MACOSX_SDK"; then
         { { echo "$as_me:$LINENO: error: not found
 See \`config.log' for more details." >&5


@@ -20358,8 +19429,8 @@ echo "$as_me: error: not found
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     else
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     else

-        { echo "$as_me:$LINENO: result: exists" >&5
-echo "${ECHO_T}exists" >&6; }
+        echo "$as_me:$LINENO: result: exists" >&5
+echo "${ECHO_T}exists" >&6

     fi
     MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
     eval "CC=\"$CC $MACOSX_SDK_OPTS\""
     fi
     MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
     eval "CC=\"$CC $MACOSX_SDK_OPTS\""


@@ -20372,15 +19443,22 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then
     wxUSE_MACOSX_VERSION_MIN=
 elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
     if test "x$wxUSE_MACOSX_SDK" != "x"; then
     wxUSE_MACOSX_VERSION_MIN=
 elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
     if test "x$wxUSE_MACOSX_SDK" != "x"; then

-        { echo "$as_me:$LINENO: checking SDK deployment version" >&5
-echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking SDK deployment version" >&5
+echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6

 
         MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 
 
         MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 

+        # If that failed, try again with the new key
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
+
+            MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
+
+        fi
+

         if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then
             wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN
         if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then
             wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN

-            { echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
-echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
+            echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6

         else
             { echo "$as_me:$LINENO: WARNING: Could not determine deployment target from SDKSettings.plist" >&5
 echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;}
         else
             { echo "$as_me:$LINENO: WARNING: Could not determine deployment target from SDKSettings.plist" >&5
 echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;}


@@ -20406,8 +19484,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking if C compiler works with SDK/version options" >&5
-echo $ECHO_N "checking if C compiler works with SDK/version options... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if C compiler works with SDK/version options" >&5
+echo $ECHO_N "checking if C compiler works with SDK/version options... $ECHO_C" >&6

     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -20424,37 +19502,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { { echo "$as_me:$LINENO: error: no.  Try a different SDK
+{ { echo "$as_me:$LINENO: error: no.  Try a different SDK

 See \`config.log' for more details." >&5
 echo "$as_me: error: no.  Try a different SDK
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }; exit 1
 fi
 See \`config.log' for more details." >&5
 echo "$as_me: error: no.  Try a different SDK
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }; exit 1
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
       conftest$ac_exeext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'


@@ -20463,14 +19544,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 

-    ac_ext=cpp
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking if C++ compiler works with SDK/version options" >&5
-echo $ECHO_N "checking if C++ compiler works with SDK/version options... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if C++ compiler works with SDK/version options" >&5
+echo $ECHO_N "checking if C++ compiler works with SDK/version options... $ECHO_C" >&6

     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -20487,37 +19568,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { { echo "$as_me:$LINENO: error: no.  Try a different SDK
+{ { echo "$as_me:$LINENO: error: no.  Try a different SDK

 See \`config.log' for more details." >&5
 echo "$as_me: error: no.  Try a different SDK
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }; exit 1
 fi
 See \`config.log' for more details." >&5
 echo "$as_me: error: no.  Try a different SDK
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }; exit 1
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
       conftest$ac_exeext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'


@@ -20545,8 +19629,8 @@ fi
 
 case "${host}" in
   powerpc-*-darwin* )
 
 case "${host}" in
   powerpc-*-darwin* )

-    { echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5
-echo $ECHO_N "checking if __POWERPC__ is already defined... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5
+echo $ECHO_N "checking if __POWERPC__ is already defined... $ECHO_C" >&6

     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -20566,45 +19650,49 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

         cat >>confdefs.h <<\_ACEOF
 #define __POWERPC__ 1
 _ACEOF
 
 
 fi
         cat >>confdefs.h <<\_ACEOF
 #define __POWERPC__ 1
 _ACEOF
 
 
 fi

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

   ;;
 esac
 
 case "${host}" in
   *-*-darwin* )
   ;;
 esac
 
 case "${host}" in
   *-*-darwin* )

-    { echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5
-echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5
+echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $ECHO_C" >&6

     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -20622,32 +19710,37 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-        { echo "$as_me:$LINENO: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5
-echo $ECHO_N "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+        echo "$as_me:$LINENO: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5
+echo $ECHO_N "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... $ECHO_C" >&6

         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -20666,43 +19759,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                         CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
                         CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { { echo "$as_me:$LINENO: error: no.  CoreFoundation not available.
+{ { echo "$as_me:$LINENO: error: no.  CoreFoundation not available.

 See \`config.log' for more details." >&5
 echo "$as_me: error: no.  CoreFoundation not available.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 See \`config.log' for more details." >&5
 echo "$as_me: error: no.  CoreFoundation not available.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 fi

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

 
 
 fi
 
 
 fi

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

   ;;
 esac
 
   ;;
 esac
 


@@ -20713,8 +19809,8 @@ case "${host}" in
       if test "$wxUSE_MSW" = 1 ; then
         wants_win32=1
       else
       if test "$wxUSE_MSW" = 1 ; then
         wants_win32=1
       else

-                        { echo "$as_me:$LINENO: checking if -mno-cygwin is in effect" >&5
-echo $ECHO_N "checking if -mno-cygwin is in effect... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking if -mno-cygwin is in effect" >&5
+echo $ECHO_N "checking if -mno-cygwin is in effect... $ECHO_C" >&6

 if test "${wx_cv_nocygwin+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_nocygwin+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -20739,37 +19835,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_nocygwin=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_nocygwin=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_nocygwin=yes
+wx_cv_nocygwin=yes

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_nocygwin" >&5
-echo "${ECHO_T}$wx_cv_nocygwin" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_nocygwin" >&5
+echo "${ECHO_T}$wx_cv_nocygwin" >&6

 
         if test "$wx_cv_nocygwin" = "yes"; then
             wants_win32=1
 
         if test "$wx_cv_nocygwin" = "yes"; then
             wants_win32=1


@@ -20831,8 +19931,8 @@ fi
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
                                                       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
                                                       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then

-                              { echo "$as_me:$LINENO: checking for drand48 in -lcExt" >&5
-echo $ECHO_N "checking for drand48 in -lcExt... $ECHO_C" >&6; }
+                              echo "$as_me:$LINENO: checking for drand48 in -lcExt" >&5
+echo $ECHO_N "checking for drand48 in -lcExt... $ECHO_C" >&6

 if test "${ac_cv_lib_cExt_drand48+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_cExt_drand48+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -20845,53 +19945,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char drand48 ();
 int
 main ()
 {
 char drand48 ();
 int
 main ()
 {

-return drand48 ();
+drand48 ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_cExt_drand48=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_cExt_drand48=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_cExt_drand48=no
+ac_cv_lib_cExt_drand48=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cExt_drand48" >&5
-echo "${ECHO_T}$ac_cv_lib_cExt_drand48" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_cExt_drand48" >&5
+echo "${ECHO_T}$ac_cv_lib_cExt_drand48" >&6

 if test $ac_cv_lib_cExt_drand48 = yes; then
   LIBS="$LIBS -lcExt"
 fi
 if test $ac_cv_lib_cExt_drand48 = yes; then
   LIBS="$LIBS -lcExt"
 fi


@@ -20899,8 +20002,8 @@ fi
       else
                     RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
       fi
       else
                     RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
       fi

-                                    { echo "$as_me:$LINENO: checking for gcc/libc version" >&5
-echo $ECHO_N "checking for gcc/libc version... $ECHO_C" >&6; }
+                                    echo "$as_me:$LINENO: checking for gcc/libc version" >&5
+echo $ECHO_N "checking for gcc/libc version... $ECHO_C" >&6

 if test "${wx_cv_gccversion+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_gccversion+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -20938,22 +20041,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -20966,14 +20060,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 wx_cv_gccversion="EMX2"
 fi
 ( exit $ac_status )
 wx_cv_gccversion="EMX2"
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

-
-

 fi
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_gccversion" >&5
-echo "${ECHO_T}$wx_cv_gccversion" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_gccversion" >&5
+echo "${ECHO_T}$wx_cv_gccversion" >&6

       if test "$wx_cv_gccversion" = "EMX2"; then
           LIBS="$LIBS -lstdcpp"
           LDFLAGS="$LDFLAGS -Zsysv-signals"
       if test "$wx_cv_gccversion" = "EMX2"; then
           LIBS="$LIBS -lstdcpp"
           LDFLAGS="$LDFLAGS -Zsysv-signals"


@@ -20994,8 +20086,8 @@ echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
         ;;
   *)
 
         ;;
   *)
 

-      { echo "$as_me:$LINENO: checking for strcasecmp() in string.h" >&5
-echo $ECHO_N "checking for strcasecmp() in string.h... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for strcasecmp() in string.h" >&5
+echo $ECHO_N "checking for strcasecmp() in string.h... $ECHO_C" >&6

 if test "${ac_cv_string_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_string_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -21020,38 +20112,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_string_strcasecmp=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_string_strcasecmp=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_string_strcasecmp=no
+ac_cv_string_strcasecmp=no

 
 fi
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_string_strcasecmp" >&5
-echo "${ECHO_T}$ac_cv_string_strcasecmp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_string_strcasecmp" >&5
+echo "${ECHO_T}$ac_cv_string_strcasecmp" >&6

 
       if test x"$ac_cv_string_strcasecmp" = "xyes"; then
           cat >>confdefs.h <<\_ACEOF
 
       if test x"$ac_cv_string_strcasecmp" = "xyes"; then
           cat >>confdefs.h <<\_ACEOF


@@ -21059,8 +20154,8 @@ echo "${ECHO_T}$ac_cv_string_strcasecmp" >&6; }
 _ACEOF
 
       else
 _ACEOF
 
       else

-          { echo "$as_me:$LINENO: checking for strcasecmp() in strings.h" >&5
-echo $ECHO_N "checking for strcasecmp() in strings.h... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for strcasecmp() in strings.h" >&5
+echo $ECHO_N "checking for strcasecmp() in strings.h... $ECHO_C" >&6

 if test "${ac_cv_strings_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_strings_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -21085,38 +20180,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_strings_strcasecmp=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_strings_strcasecmp=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_strings_strcasecmp=no
+ac_cv_strings_strcasecmp=no

 
 fi
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_strings_strcasecmp" >&5
-echo "${ECHO_T}$ac_cv_strings_strcasecmp" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_strings_strcasecmp" >&5
+echo "${ECHO_T}$ac_cv_strings_strcasecmp" >&6

 
           if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
               cat >>confdefs.h <<\_ACEOF
 
           if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
               cat >>confdefs.h <<\_ACEOF


@@ -21134,8 +20232,8 @@ echo "$as_me: error: No case-insensitive string comparison function found." >&2;
 esac
 
 
 esac
 
 

-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6

 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -21159,31 +20257,35 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_stdc=no
+ac_cv_header_stdc=no

 fi
 fi

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

 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.


@@ -21239,7 +20341,6 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>

-#include <stdlib.h>

 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))


@@ -21259,27 +20360,18 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
        || toupper (i) != TOUPPER (i))
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
        || toupper (i) != TOUPPER (i))

-      return 2;
-  return 0;
+      exit(2);
+  exit (0);

 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -21292,14 +20384,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-
-

 fi
 fi
 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6

 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF


@@ -21322,9 +20412,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
                  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -21338,35 +20428,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -21386,9 +20479,9 @@ done
 for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -21402,35 +20495,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -21446,9 +20542,9 @@ if test "$ac_cv_header_wchar_h" != "yes"; then
 for ac_header in wcstr.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in wcstr.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -21462,35 +20558,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -21518,9 +20617,9 @@ if test "$USE_UNIX" = 1 ; then
 for ac_header in sys/select.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in sys/select.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -21534,35 +20633,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -21575,8 +20677,8 @@ done
 fi
 
 
 fi
 
 

-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6

 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -21594,10 +20696,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];

-  const charset cs;
+  const charset x;

   /* SunOS 4.1.1 cc rejects this.  */
   /* SunOS 4.1.1 cc rejects this.  */

-  char const *const *pcpcc;
-  char **ppc;
+  char const *const *ccp;
+  char **p;

   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};


@@ -21606,17 +20708,16 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";

-  pcpcc = &g + (g ? g-g : 0);
+  ccp = &g + (g ? g-g : 0);

   /* HPUX 7.0 cc rejects these. */
   /* HPUX 7.0 cc rejects these. */

-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
+  ++ccp;
+  p = (char**) ccp;
+  ccp = (char const *const *) p;

   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;

-    if (s) return 0;

   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};


@@ -21635,9 +20736,7 @@ main ()
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;

-    if (!foo) return 0;

   }
   }

-  return !cs[0] && !zero.x;

 #endif
 
   ;
 #endif
 
   ;


@@ -21645,34 +20744,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_c_const=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_c_const=no
+ac_cv_c_const=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6

 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF


@@ -21681,8 +20784,8 @@ _ACEOF
 
 fi
 
 
 fi
 

-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6

 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -21702,37 +20805,39 @@ $ac_kw foo_t foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
 
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_inline=$ac_kw
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_inline=$ac_kw; break

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

 done
 
 fi
 done
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6

 
 
 case $ac_cv_c_inline in
 
 
 case $ac_cv_c_inline in


@@ -21751,8 +20856,8 @@ _ACEOF
 esac
 
 
 esac
 
 

-{ echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for short" >&5
+echo $ECHO_N "checking for short... $ECHO_C" >&6

 if test "${ac_cv_type_short+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_short+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -21763,57 +20868,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef short ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((short *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (short))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_short=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_short=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_short=no
+ac_cv_type_short=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+echo "${ECHO_T}$ac_cv_type_short" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6

 if test "${ac_cv_sizeof_short+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_short+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_short" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -21823,11 +20932,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef short ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -21835,22 +20943,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -21860,11 +20973,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef short ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -21872,53 +20984,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef short ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -21926,22 +21041,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -21951,11 +21071,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef short ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -21963,48 +21082,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -22015,11 +21136,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef short ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22027,44 +21147,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;

-'') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (short)
+echo "$as_me: error: cannot compute sizeof (short), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -22073,9 +21200,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (short)); }
+unsigned long ulongval () { return (long) (sizeof (short)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -22084,44 +21210,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (short))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (short))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (short))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -22132,32 +21249,29 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (short)
+echo "$as_me: error: cannot compute sizeof (short), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_short=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_SHORT $ac_cv_sizeof_short
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_SHORT $ac_cv_sizeof_short
 _ACEOF
 
 

-{ echo "$as_me:$LINENO: checking for void *" >&5
-echo $ECHO_N "checking for void *... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6

 if test "${ac_cv_type_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -22168,57 +21282,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef void * ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((void * *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (void *))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_void_p=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_void_p=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_void_p=no
+ac_cv_type_void_p=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
-echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of void *" >&5
-echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of void *" >&5
+echo $ECHO_N "checking size of void *... $ECHO_C" >&6

 if test "${ac_cv_sizeof_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_void_p+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_void_p" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -22228,11 +21346,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef void * ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22240,22 +21357,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -22265,11 +21387,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef void * ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22277,53 +21398,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef void * ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22331,22 +21455,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -22356,11 +21485,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef void * ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22368,48 +21496,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -22420,11 +21550,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef void * ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22432,44 +21561,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_void_p=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_void_p=$ac_lo;;

-'') if test "$ac_cv_type_void_p" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (void *)
+echo "$as_me: error: cannot compute sizeof (void *), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_void_p=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -22478,9 +21614,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef void * ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (void *)); }
+unsigned long ulongval () { return (long) (sizeof (void *)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -22489,44 +21624,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (void *))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (void *))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (void *))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -22537,32 +21663,29 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_void_p" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (void *)
+echo "$as_me: error: cannot compute sizeof (void *), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_void_p=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_void_p=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
 _ACEOF
 
 

-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6

 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -22573,57 +21696,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef int ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((int *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (int))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_int=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_int=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_int=no
+ac_cv_type_int=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+echo "${ECHO_T}$ac_cv_type_int" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6

 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_int" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -22633,11 +21760,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef int ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22645,22 +21771,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -22670,11 +21801,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef int ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22682,53 +21812,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef int ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22736,22 +21869,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -22761,11 +21899,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef int ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22773,48 +21910,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -22825,11 +21964,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef int ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -22837,44 +21975,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;

-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -22883,9 +22028,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (int)); }
+unsigned long ulongval () { return (long) (sizeof (int)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -22894,44 +22038,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (int))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (int))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (int))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -22942,32 +22077,29 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_int=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 _ACEOF
 
 

-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6

 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -22978,57 +22110,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef long ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((long *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (long))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_long=no
+ac_cv_type_long=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6

 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -23038,11 +22174,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23050,22 +22185,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -23075,11 +22215,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23087,53 +22226,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23141,22 +22283,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -23166,11 +22313,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23178,48 +22324,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -23230,11 +22378,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23242,44 +22389,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;

-'') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -23288,9 +22442,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (long)); }
+unsigned long ulongval () { return (long) (sizeof (long)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -23299,44 +22452,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (long))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (long))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -23347,32 +22491,29 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_long=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
 

-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6

 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -23383,57 +22524,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef size_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((size_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (size_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_size_t=no
+ac_cv_type_size_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of size_t" >&5
+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6

 if test "${ac_cv_sizeof_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_size_t" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -23443,11 +22588,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef size_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23455,22 +22599,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -23480,11 +22629,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef size_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23492,53 +22640,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef size_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23546,22 +22697,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -23571,11 +22727,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef size_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23583,48 +22738,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -23635,11 +22792,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef size_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23647,44 +22803,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_size_t=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_size_t=$ac_lo;;

-'') if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (size_t)
+echo "$as_me: error: cannot compute sizeof (size_t), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -23693,9 +22856,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef size_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (size_t)); }
+unsigned long ulongval () { return (long) (sizeof (size_t)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -23704,44 +22866,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (size_t))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (size_t))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (size_t))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -23752,25 +22905,22 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (size_t)
+echo "$as_me: error: cannot compute sizeof (size_t), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_size_t=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
 _ACEOF
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
 _ACEOF


@@ -23779,8 +22929,8 @@ _ACEOF
 
 case "${host}" in
     arm-*-linux* )
 
 case "${host}" in
     arm-*-linux* )

-        { echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6

 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -23791,57 +22941,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef long long ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((long long *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (long long))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_long_long=no
+ac_cv_type_long_long=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6

 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_long_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -23851,11 +23005,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23863,22 +23016,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -23888,11 +23046,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23900,53 +23057,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23954,22 +23114,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -23979,11 +23144,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -23991,48 +23155,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -24043,11 +23209,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24055,44 +23220,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;

-'') if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long long)
+echo "$as_me: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -24101,9 +23273,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -24112,44 +23283,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (long long))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -24160,25 +23322,22 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long long)
+echo "$as_me: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_long_long=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF


@@ -24186,8 +23345,8 @@ _ACEOF
 
     ;;
     *-hp-hpux* )
 
     ;;
     *-hp-hpux* )

-        { echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6

 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -24198,57 +23357,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef long long ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((long long *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (long long))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_long_long=no
+ac_cv_type_long_long=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6

 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_long_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -24258,11 +23421,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24270,22 +23432,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -24295,11 +23462,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24307,53 +23473,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24361,22 +23530,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -24386,11 +23560,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24398,48 +23571,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -24450,11 +23625,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24462,44 +23636,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;

-'') if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long long)
+echo "$as_me: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -24508,9 +23689,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -24519,44 +23699,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (long long))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -24567,25 +23738,22 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long long)
+echo "$as_me: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_long_long=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF


@@ -24596,8 +23764,8 @@ _ACEOF
         fi
     ;;
     * )
         fi
     ;;
     * )

-        { echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6

 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -24608,57 +23776,61 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef long long ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((long long *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (long long))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_long_long=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_long_long=no
+ac_cv_type_long_long=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6

 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_long_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -24668,11 +23840,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24680,22 +23851,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -24705,11 +23881,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24717,53 +23892,56 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24771,22 +23949,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -24796,11 +23979,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24808,48 +23990,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -24860,11 +24044,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -24872,44 +24055,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;

-'') if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long long)
+echo "$as_me: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -24918,9 +24108,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -24929,44 +24118,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (long long))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -24977,25 +24157,22 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (long long)
+echo "$as_me: error: cannot compute sizeof (long long), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_long_long=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF


@@ -25003,8 +24180,8 @@ _ACEOF
 
 esac
 
 
 esac
 

-{ echo "$as_me:$LINENO: checking for wchar_t" >&5
-echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for wchar_t" >&5
+echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6

 if test "${ac_cv_type_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -25032,57 +24209,61 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
 
 
 

-typedef wchar_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((wchar_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (wchar_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_wchar_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_wchar_t=no
+ac_cv_type_wchar_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
-echo "${ECHO_T}$ac_cv_type_wchar_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
+echo "${ECHO_T}$ac_cv_type_wchar_t" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of wchar_t" >&5
-echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of wchar_t" >&5
+echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6

 if test "${ac_cv_sizeof_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_wchar_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_wchar_t" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -25109,11 +24290,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
 
 
 

-   typedef wchar_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -25121,22 +24301,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -25163,11 +24348,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
 
 
 

-   typedef wchar_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -25175,42 +24359,46 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -25234,11 +24422,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
 
 
 

-   typedef wchar_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -25246,22 +24433,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -25288,11 +24480,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
 
 
 

-   typedef wchar_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -25300,48 +24491,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -25369,11 +24562,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
 
 
 

-   typedef wchar_t ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -25381,44 +24573,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_wchar_t=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_wchar_t=$ac_lo;;

-'') if test "$ac_cv_type_wchar_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (wchar_t)
+echo "$as_me: error: cannot compute sizeof (wchar_t), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_wchar_t=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -25444,9 +24643,8 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
 
 
 

-   typedef wchar_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (wchar_t)); }
+unsigned long ulongval () { return (long) (sizeof (wchar_t)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -25455,44 +24653,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (wchar_t))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (wchar_t))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (wchar_t))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -25503,25 +24692,22 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_wchar_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (wchar_t)
+echo "$as_me: error: cannot compute sizeof (wchar_t), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_wchar_t=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_wchar_t=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_wchar_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_wchar_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
 _ACEOF
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
 _ACEOF


@@ -25533,13 +24719,13 @@ else
     wxUSE_WCHAR_T=no
 fi
 
     wxUSE_WCHAR_T=no
 fi
 

-{ echo "$as_me:$LINENO: checking for va_copy" >&5
-echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for va_copy" >&5
+echo $ECHO_N "checking for va_copy... $ECHO_C" >&6

 if test "${wx_cv_func_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_func_va_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-        ac_ext=cpp
+        ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -25563,33 +24749,36 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
             }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
             }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_va_copy=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_va_copy=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_va_copy=no
+wx_cv_func_va_copy=no

 
 fi
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
       conftest$ac_exeext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'


@@ -25600,8 +24789,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_va_copy" >&5
-echo "${ECHO_T}$wx_cv_func_va_copy" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_va_copy" >&5
+echo "${ECHO_T}$wx_cv_func_va_copy" >&6

 
 if test $wx_cv_func_va_copy = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
 if test $wx_cv_func_va_copy = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -25609,8 +24798,8 @@ if test $wx_cv_func_va_copy = "yes"; then
 _ACEOF
 
 else
 _ACEOF
 
 else

-        { echo "$as_me:$LINENO: checking if va_list can be copied by value" >&5
-echo $ECHO_N "checking if va_list can be copied by value... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking if va_list can be copied by value" >&5
+echo $ECHO_N "checking if va_list can be copied by value... $ECHO_C" >&6

 if test "${wx_cv_type_va_list_lvalue+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_type_va_list_lvalue+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -25639,22 +24828,13 @@ else
                 }
 _ACEOF
 rm -f conftest$ac_exeext
                 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -25667,15 +24847,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 wx_cv_type_va_list_lvalue=no
 fi
 ( exit $ac_status )
 wx_cv_type_va_list_lvalue=no
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 
 fi
 
 

-
-

 fi
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_type_va_list_lvalue" >&5
-echo "${ECHO_T}$wx_cv_type_va_list_lvalue" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_type_va_list_lvalue" >&5
+echo "${ECHO_T}$wx_cv_type_va_list_lvalue" >&6

 
     if test $wx_cv_type_va_list_lvalue != "yes"; then
                         cat >>confdefs.h <<\_ACEOF
 
     if test $wx_cv_type_va_list_lvalue != "yes"; then
                         cat >>confdefs.h <<\_ACEOF


@@ -25687,13 +24865,13 @@ fi
 
 if test "$wxUSE_VARARG_MACROS" = "yes"; then
 
 
 if test "$wxUSE_VARARG_MACROS" = "yes"; then
 

-{ echo "$as_me:$LINENO: checking whether the compiler supports variadic macros" >&5
-echo $ECHO_N "checking whether the compiler supports variadic macros... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether the compiler supports variadic macros" >&5
+echo $ECHO_N "checking whether the compiler supports variadic macros... $ECHO_C" >&6

 if test "${wx_cv_have_variadic_macros+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_have_variadic_macros+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                        ac_ext=cpp
+                        ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -25721,32 +24899,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_have_variadic_macros=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_have_variadic_macros=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_have_variadic_macros=no
+wx_cv_have_variadic_macros=no

 
 fi
 
 fi

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

         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -25756,8 +24938,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_have_variadic_macros" >&5
-echo "${ECHO_T}$wx_cv_have_variadic_macros" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_have_variadic_macros" >&5
+echo "${ECHO_T}$wx_cv_have_variadic_macros" >&6

 
 if test $wx_cv_have_variadic_macros = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
 if test $wx_cv_have_variadic_macros = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -25767,16 +24949,16 @@ _ACEOF
 fi
 
 fi
 fi
 
 fi

-# Check whether --enable-largefile was given.
+# Check whether --enable-largefile or --disable-largefile was given.

 if test "${enable_largefile+set}" = set; then
 if test "${enable_largefile+set}" = set; then

-  enableval=$enable_largefile;
-fi
+  enableval="$enable_largefile"

 
 

+fi;

 if test "$enable_largefile" != no; then
             wx_largefile=no
 
 if test "$enable_largefile" != no; then
             wx_largefile=no
 

-    { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6

 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -25801,36 +24983,40 @@ typedef struct {
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_sys_file_offset_bits=64
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_sys_file_offset_bits=64
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_sys_file_offset_bits=no
+ac_cv_sys_file_offset_bits=no

 fi
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6

 
     if test "$ac_cv_sys_file_offset_bits" != no; then
         wx_largefile=yes
 
     if test "$ac_cv_sys_file_offset_bits" != no; then
         wx_largefile=yes


@@ -25842,8 +25028,8 @@ _ACEOF
 
     if test "x$wx_largefile" != "xyes"; then
 
 
     if test "x$wx_largefile" != "xyes"; then
 

-    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6

 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -25868,36 +25054,40 @@ typedef struct {
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_sys_large_files=1
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_sys_large_files=1
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_sys_large_files=no
+ac_cv_sys_large_files=no

 fi
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6

 
     if test "$ac_cv_sys_large_files" != no; then
         wx_largefile=yes
 
     if test "$ac_cv_sys_large_files" != no; then
         wx_largefile=yes


@@ -25909,16 +25099,16 @@ _ACEOF
 
     fi
 
 
     fi
 

-    { echo "$as_me:$LINENO: checking if large file support is available" >&5
-echo $ECHO_N "checking if large file support is available... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if large file support is available" >&5
+echo $ECHO_N "checking if large file support is available... $ECHO_C" >&6

     if test "x$wx_largefile" = "xyes"; then
         cat >>confdefs.h <<\_ACEOF
 #define HAVE_LARGEFILE_SUPPORT 1
 _ACEOF
 
     fi
     if test "x$wx_largefile" = "xyes"; then
         cat >>confdefs.h <<\_ACEOF
 #define HAVE_LARGEFILE_SUPPORT 1
 _ACEOF
 
     fi

-    { echo "$as_me:$LINENO: result: $wx_largefile" >&5
-echo "${ECHO_T}$wx_largefile" >&6; }
+    echo "$as_me:$LINENO: result: $wx_largefile" >&5
+echo "${ECHO_T}$wx_largefile" >&6

 fi
 
 
 fi
 
 


@@ -25927,13 +25117,13 @@ if test "x$wx_largefile" = "xyes"; then
         WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
 
                                                         if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
         WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
 
                                                         if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then

-            { echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5
-echo $ECHO_N "checking if -D__STDC_EXT__ is required... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5
+echo $ECHO_N "checking if -D__STDC_EXT__ is required... $ECHO_C" >&6

 if test "${wx_cv_STDC_EXT_required+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_STDC_EXT_required+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                    ac_ext=cpp
+                    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -25959,32 +25149,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_STDC_EXT_required=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_STDC_EXT_required=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_STDC_EXT_required=yes
+wx_cv_STDC_EXT_required=yes

 
 fi
 
 fi

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

                     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
                     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -25994,8 +25188,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_STDC_EXT_required" >&5
-echo "${ECHO_T}$wx_cv_STDC_EXT_required" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_STDC_EXT_required" >&5
+echo "${ECHO_T}$wx_cv_STDC_EXT_required" >&6

             if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
                 WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
             fi
             if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
                 WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
             fi


@@ -26003,57 +25197,57 @@ echo "${ECHO_T}$wx_cv_STDC_EXT_required" >&6; }
     else
         WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES"
     fi
     else
         WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES"
     fi

-        { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6

 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   while :; do

+  ac_cv_sys_largefile_source=no

   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>

 int
 main ()
 {
 int
 main ()
 {

-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return !fseeko;

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_sys_largefile_source=no; break
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -26061,65 +25255,116 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1

-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>

 int
 main ()
 {
 int
 main ()
 {

-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return !fseeko;

   ;
   return 0;
 }
 _ACEOF
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_sys_largefile_source=1; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_sys_largefile_source=1; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  ac_cv_sys_largefile_source=unknown
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

   break
 done
 fi
   break
 done
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
-case $ac_cv_sys_largefile_source in #(
-  no | unknown) ;;
-  *)
+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+if test "$ac_cv_sys_largefile_source" != no; then
+

 cat >>confdefs.h <<_ACEOF
 #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
 _ACEOF
 cat >>confdefs.h <<_ACEOF
 #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
 _ACEOF

-;;
-esac
+
+fi

 rm -f conftest*
 
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 rm -f conftest*
 
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.

-if test $ac_cv_sys_largefile_source != unknown; then
+echo "$as_me:$LINENO: checking for fseeko" >&5
+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+if test "${ac_cv_func_fseeko+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+return fseeko && fseeko (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_fseeko=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_fseeko=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+if test $ac_cv_func_fseeko = yes; then

 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FSEEKO 1
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FSEEKO 1


@@ -26132,8 +25377,8 @@ fi
     fi
 fi
 
     fi
 fi
 

-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6

 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -26159,22 +25404,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -26196,39 +25446,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_c_bigendian=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_c_bigendian=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_c_bigendian=no
+ac_cv_c_bigendian=no

 fi
 fi

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

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

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

 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown


@@ -26251,22 +25503,13 @@ main () {
 }
 _ACEOF
 rm -f conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -26279,14 +25522,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-
-

 fi
 fi
 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6

 if test $ac_cv_c_bigendian = unknown; then
   { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5
 echo "$as_me: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;}
 if test $ac_cv_c_bigendian = unknown; then
   { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5
 echo "$as_me: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;}


@@ -26301,7 +25542,8 @@ fi
 
 
 
 
 
 

-    ac_ext=cpp
+
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -26312,9 +25554,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in iostream
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -26328,35 +25570,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -26385,14 +25630,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 

-  { echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5
-echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5
+echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6

 if test "${wx_cv_cpp_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
 if test "${wx_cv_cpp_bool+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 

-    ac_ext=cpp
+
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -26420,22 +25666,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
         wx_cv_cpp_bool=yes
 
 
         wx_cv_cpp_bool=yes
 


@@ -26448,8 +25699,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

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

 
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'


@@ -26459,8 +25709,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_cpp_bool" >&5
-echo "${ECHO_T}$wx_cv_cpp_bool" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_cpp_bool" >&5
+echo "${ECHO_T}$wx_cv_cpp_bool" >&6

 
   if test "$wx_cv_cpp_bool" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
   if test "$wx_cv_cpp_bool" = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -26471,14 +25721,15 @@ _ACEOF
 
 
 
 
 
 

-  { echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
-echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
+echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6

 if test "${wx_cv_explicit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
 if test "${wx_cv_explicit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 

-    ac_ext=cpp
+
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -26505,22 +25756,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -26544,42 +25800,45 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_explicit=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_explicit=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_explicit=yes
+wx_cv_explicit=yes

 
 fi
 
 fi

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

 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_explicit=no
+wx_cv_explicit=no

 
 fi
 
 fi

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

 
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'


@@ -26589,8 +25848,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_explicit" >&5
-echo "${ECHO_T}$wx_cv_explicit" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_explicit" >&5
+echo "${ECHO_T}$wx_cv_explicit" >&6

 
   if test "$wx_cv_explicit" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
   if test "$wx_cv_explicit" = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -26600,13 +25859,14 @@ _ACEOF
   fi
 
 
   fi
 
 

-{ echo "$as_me:$LINENO: checking whether the compiler supports const_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports const_cast<>... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether the compiler supports const_cast<>" >&5
+echo $ECHO_N "checking whether the compiler supports const_cast<>... $ECHO_C" >&6

 if test "${ac_cv_cxx_const_cast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${ac_cv_cxx_const_cast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

- ac_ext=cpp
+
+ ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -26628,31 +25888,35 @@ int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_cxx_const_cast=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_cxx_const_cast=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_cxx_const_cast=no
+ac_cv_cxx_const_cast=no

 fi
 fi

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

  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -26661,8 +25925,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_const_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_const_cast" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_cxx_const_cast" >&5
+echo "${ECHO_T}$ac_cv_cxx_const_cast" >&6

 if test "$ac_cv_cxx_const_cast" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 if test "$ac_cv_cxx_const_cast" = yes; then
 
 cat >>confdefs.h <<\_ACEOF


@@ -26671,13 +25935,14 @@ _ACEOF
 
 fi
 
 
 fi
 

-{ echo "$as_me:$LINENO: checking whether the compiler supports reinterpret_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports reinterpret_cast<>... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether the compiler supports reinterpret_cast<>" >&5
+echo $ECHO_N "checking whether the compiler supports reinterpret_cast<>... $ECHO_C" >&6

 if test "${ac_cv_cxx_reinterpret_cast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${ac_cv_cxx_reinterpret_cast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

- ac_ext=cpp
+
+ ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -26704,31 +25969,35 @@ Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_cxx_reinterpret_cast=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_cxx_reinterpret_cast=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_cxx_reinterpret_cast=no
+ac_cv_cxx_reinterpret_cast=no

 fi
 fi

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

  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -26737,8 +26006,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_reinterpret_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_reinterpret_cast" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_cxx_reinterpret_cast" >&5
+echo "${ECHO_T}$ac_cv_cxx_reinterpret_cast" >&6

 if test "$ac_cv_cxx_reinterpret_cast" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 if test "$ac_cv_cxx_reinterpret_cast" = yes; then
 
 cat >>confdefs.h <<\_ACEOF


@@ -26747,13 +26016,14 @@ _ACEOF
 
 fi
 
 
 fi
 

-{ echo "$as_me:$LINENO: checking whether the compiler supports static_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports static_cast<>... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking whether the compiler supports static_cast<>" >&5
+echo $ECHO_N "checking whether the compiler supports static_cast<>... $ECHO_C" >&6

 if test "${ac_cv_cxx_static_cast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${ac_cv_cxx_static_cast+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

- ac_ext=cpp
+
+ ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -26779,31 +26049,35 @@ Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_cxx_static_cast=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_cxx_static_cast=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_cxx_static_cast=no
+ac_cv_cxx_static_cast=no

 fi
 fi

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

  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -26812,8 +26086,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_static_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_static_cast" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_cxx_static_cast" >&5
+echo "${ECHO_T}$ac_cv_cxx_static_cast" >&6

 if test "$ac_cv_cxx_static_cast" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 if test "$ac_cv_cxx_static_cast" = yes; then
 
 cat >>confdefs.h <<\_ACEOF


@@ -26849,7 +26123,7 @@ if test "x$COMPAQCXX" = "xyes"; then
                                 CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
 fi
 
                                 CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
 fi
 

-ac_ext=cpp
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -26865,8 +26139,8 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
         char_type="char"
     fi
 
         char_type="char"
     fi
 

-        { echo "$as_me:$LINENO: checking for $std_string in <string>" >&5
-echo $ECHO_N "checking for $std_string in <string>... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for $std_string in <string>" >&5
+echo $ECHO_N "checking for $std_string in <string>... $ECHO_C" >&6

 if test "${wx_cv_class_stdstring+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_class_stdstring+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -26887,37 +26161,41 @@ $std_string foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_class_stdstring=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_class_stdstring=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_class_stdstring=no
+wx_cv_class_stdstring=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdstring" >&5
-echo "${ECHO_T}$wx_cv_class_stdstring" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_class_stdstring" >&5
+echo "${ECHO_T}$wx_cv_class_stdstring" >&6

 
     if test "$wx_cv_class_stdstring" = yes; then
         if test "$wxUSE_UNICODE" = "yes"; then
 
     if test "$wx_cv_class_stdstring" = yes; then
         if test "$wxUSE_UNICODE" = "yes"; then


@@ -26927,8 +26205,8 @@ _ACEOF
 
         fi
                     else
 
         fi
                     else

-        { echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5
-echo $ECHO_N "checking if std::basic_string<$char_type> works... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5
+echo $ECHO_N "checking if std::basic_string<$char_type> works... $ECHO_C" >&6

 if test "${wx_cv_class_stdbasicstring+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_class_stdbasicstring+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -26962,37 +26240,41 @@ std::basic_string<$char_type> foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_class_stdbasicstring=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_class_stdbasicstring=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_class_stdbasicstring=no
+wx_cv_class_stdbasicstring=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5
-echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5
+echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6

 
         if test "$wx_cv_class_stdbasicstring" != yes; then
             if test "$wxUSE_STL" = "yes"; then
 
         if test "$wx_cv_class_stdbasicstring" != yes; then
             if test "$wxUSE_STL" = "yes"; then


@@ -27013,8 +26295,8 @@ echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switchin
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then

-    { echo "$as_me:$LINENO: checking for std::istream" >&5
-echo $ECHO_N "checking for std::istream... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for std::istream" >&5
+echo $ECHO_N "checking for std::istream... $ECHO_C" >&6

 if test "${ac_cv_type_std__istream+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_std__istream+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27026,47 +26308,50 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <iostream>
 
 /* end confdefs.h.  */
 #include <iostream>
 

-typedef std::istream ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((std::istream *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (std::istream))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_std__istream=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_std__istream=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_std__istream=no
+ac_cv_type_std__istream=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5
-echo "${ECHO_T}$ac_cv_type_std__istream" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5
+echo "${ECHO_T}$ac_cv_type_std__istream" >&6

 if test $ac_cv_type_std__istream = yes; then
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_type_std__istream = yes; then
 
 cat >>confdefs.h <<_ACEOF


@@ -27077,8 +26362,8 @@ _ACEOF
 else
   wxUSE_STD_IOSTREAM=no
 fi
 else
   wxUSE_STD_IOSTREAM=no
 fi

-{ echo "$as_me:$LINENO: checking for std::ostream" >&5
-echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for std::ostream" >&5
+echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6

 if test "${ac_cv_type_std__ostream+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_std__ostream+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27090,47 +26375,50 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <iostream>
 
 /* end confdefs.h.  */
 #include <iostream>
 

-typedef std::ostream ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((std::ostream *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (std::ostream))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_std__ostream=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_std__ostream=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_std__ostream=no
+ac_cv_type_std__ostream=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_std__ostream" >&5
-echo "${ECHO_T}$ac_cv_type_std__ostream" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_std__ostream" >&5
+echo "${ECHO_T}$ac_cv_type_std__ostream" >&6

 if test $ac_cv_type_std__ostream = yes; then
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_type_std__ostream = yes; then
 
 cat >>confdefs.h <<_ACEOF


@@ -27156,8 +26444,8 @@ echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams"
 fi
 
 if test "$wxUSE_STL" = "yes"; then
 fi
 
 if test "$wxUSE_STL" = "yes"; then

-        { echo "$as_me:$LINENO: checking for basic STL functionality" >&5
-echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for basic STL functionality" >&5
+echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6

 if test "${wx_cv_lib_stl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_lib_stl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27185,36 +26473,40 @@ std::vector<int> moo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_lib_stl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_lib_stl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_lib_stl=no
+wx_cv_lib_stl=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5
-echo "${ECHO_T}$wx_cv_lib_stl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5
+echo "${ECHO_T}$wx_cv_lib_stl" >&6

 
     if test "$wx_cv_lib_stl" != yes; then
          { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5
 
     if test "$wx_cv_lib_stl" != yes; then
          { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5


@@ -27222,8 +26514,8 @@ echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missin
    { (exit 1); exit 1; }; }
     fi
 
    { (exit 1); exit 1; }; }
     fi
 

-        { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5
-echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5
+echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6

 if test "${wx_cv_func_stdstring_compare+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_stdstring_compare+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27249,36 +26541,40 @@ std::string foo, bar;
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_stdstring_compare=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_stdstring_compare=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_stdstring_compare=no
+wx_cv_func_stdstring_compare=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
-echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
+echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6

 
     if test "$wx_cv_func_stdstring_compare" = yes; then
         cat >>confdefs.h <<\_ACEOF
 
     if test "$wx_cv_func_stdstring_compare" = yes; then
         cat >>confdefs.h <<\_ACEOF


@@ -27287,8 +26583,8 @@ _ACEOF
 
     fi
 
 
     fi
 

-        { echo "$as_me:$LINENO: checking for hash_map" >&5
-echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for hash_map" >&5
+echo $ECHO_N "checking for hash_map... $ECHO_C" >&6

 if test "${ac_cv_header_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27304,37 +26600,41 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <hash_map>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <hash_map>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_hash_map=no
+ac_cv_header_hash_map=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_hash_map" >&6

 if test $ac_cv_header_hash_map = yes; then
 if test $ac_cv_header_hash_map = yes; then

-  { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
-echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
+echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6

 if test "${wx_cv_class_stdhashmapset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_class_stdhashmapset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27356,36 +26656,40 @@ std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_class_stdhashmapset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_class_stdhashmapset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_class_stdhashmapset=no
+wx_cv_class_stdhashmapset=no

 fi
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6

 fi
 
 
 fi
 
 


@@ -27401,8 +26705,8 @@ _ACEOF
 
     fi
 
 
     fi
 

-    { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
-echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for ext/hash_map" >&5
+echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6

 if test "${ac_cv_header_ext_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_ext_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27418,37 +26722,41 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <ext/hash_map>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <ext/hash_map>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_ext_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_ext_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_ext_hash_map=no
+ac_cv_header_ext_hash_map=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6

 if test $ac_cv_header_ext_hash_map = yes; then
 if test $ac_cv_header_ext_hash_map = yes; then

-  { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
-echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
+echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6

 if test "${wx_cv_class_gnuhashmapset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_class_gnuhashmapset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27470,36 +26778,40 @@ __gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<doub
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_class_gnuhashmapset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_class_gnuhashmapset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_class_gnuhashmapset=no
+wx_cv_class_gnuhashmapset=no

 fi
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6

 fi
 
 
 fi
 
 


@@ -27563,8 +26875,8 @@ SEARCH_INCLUDE="\
                               \
     /usr/openwin/share/include"
 
                               \
     /usr/openwin/share/include"
 

-{ echo "$as_me:$LINENO: checking for libraries directory" >&5
-echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for libraries directory" >&5
+echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6

 
 case "${host}" in
     *-*-irix6* )
 
 case "${host}" in
     *-*-irix6* )


@@ -27582,32 +26894,34 @@ else
 int main() { return 0; }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 int main() { return 0; }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_std_libpath=`echo $d | sed s@/usr/@@`
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_std_libpath=`echo $d | sed s@/usr/@@`
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
                             LIBS="$save_LIBS"
                             if test "x$wx_cv_std_libpath" != "x"; then
       conftest$ac_exeext conftest.$ac_ext
                             LIBS="$save_LIBS"
                             if test "x$wx_cv_std_libpath" != "x"; then


@@ -27647,8 +26961,8 @@ fi
         ;;
 esac
 
         ;;
 esac
 

-{ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
-echo "${ECHO_T}$wx_cv_std_libpath" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
+echo "${ECHO_T}$wx_cv_std_libpath" >&6

 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
 
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
 


@@ -27716,65 +27030,46 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.

-# So, we kill variables containing newlines.
+# So, don't put newlines in cache variables' values.

 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.

-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
+{

   (set) 2>&1 |
   (set) 2>&1 |

-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)

       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"

-      ;; #(
+      ;;

     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.

-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+       "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
       ;;

-    esac |
-    sort
-) |
+    esac;
+} |

   sed '
   sed '

-     /^ac_cv_env_/b end

      t clear
      t clear

-     :clear
+     : clear

      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end

-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"

     cat confcache >$cache_file
   else
     cat confcache >$cache_file
   else

-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    echo "not updating unwritable cache $cache_file"

   fi
 fi
 rm -f confcache
 
 if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
   fi
 fi
 rm -f confcache
 
 if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then

-    { echo "$as_me:$LINENO: checking for glibc 2.1 or later" >&5
-echo $ECHO_N "checking for glibc 2.1 or later... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for glibc 2.1 or later" >&5
+echo $ECHO_N "checking for glibc 2.1 or later... $ECHO_C" >&6

 if test "${wx_cv_lib_glibc21+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_lib_glibc21+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -27799,22 +27094,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                 wx_cv_lib_glibc21=yes
 
 
                 wx_cv_lib_glibc21=yes
 


@@ -27827,12 +27127,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_lib_glibc21" >&5
-echo "${ECHO_T}$wx_cv_lib_glibc21" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_lib_glibc21" >&5
+echo "${ECHO_T}$wx_cv_lib_glibc21" >&6

     if test "$wx_cv_lib_glibc21" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 #define wxHAVE_GLIBC2 1
     if test "$wx_cv_lib_glibc21" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 #define wxHAVE_GLIBC2 1


@@ -27856,9 +27155,9 @@ have_floor=0
 for ac_func in cos
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in cos
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -27884,60 +27183,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -27950,9 +27257,9 @@ done
 for ac_func in floor
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in floor
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -27978,60 +27285,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -28040,14 +27355,14 @@ _ACEOF
 fi
 done
 
 fi
 done
 

-{ echo "$as_me:$LINENO: checking if floating point functions link without -lm" >&5
-echo $ECHO_N "checking if floating point functions link without -lm... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking if floating point functions link without -lm" >&5
+echo $ECHO_N "checking if floating point functions link without -lm... $ECHO_C" >&6

 if test "$have_cos" = 1 -a "$have_floor" = 1; then
 if test "$have_cos" = 1 -a "$have_floor" = 1; then

-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 else
 else

-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

     LIBS="$LIBS -lm"
     # use different functions to avoid configure caching
     have_sin=0
     LIBS="$LIBS -lm"
     # use different functions to avoid configure caching
     have_sin=0


@@ -28056,9 +27371,9 @@ echo "${ECHO_T}no" >&6; }
 for ac_func in sin
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in sin
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -28084,60 +27399,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -28150,9 +27473,9 @@ done
 for ac_func in ceil
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in ceil
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -28178,60 +27501,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -28240,19 +27571,19 @@ _ACEOF
 fi
 done
 
 fi
 done
 

-    { echo "$as_me:$LINENO: checking if floating point functions link with -lm" >&5
-echo $ECHO_N "checking if floating point functions link with -lm... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if floating point functions link with -lm" >&5
+echo $ECHO_N "checking if floating point functions link with -lm... $ECHO_C" >&6

     if test "$have_sin" = 1 -a "$have_ceil" = 1; then
     if test "$have_sin" = 1 -a "$have_ceil" = 1; then

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

     else
     else

-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

         # not sure we should warn the user, crash, etc.
     fi
 fi
 
         # not sure we should warn the user, crash, etc.
     fi
 fi
 

-ac_ext=cpp
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -28262,9 +27593,9 @@ if test "wxUSE_UNICODE" = "yes"; then
 
   for wx_func in wcstoull
   do
 
   for wx_func in wcstoull
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -28294,38 +27625,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -28344,9 +27677,9 @@ else
 
   for wx_func in strtoull
   do
 
   for wx_func in strtoull
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -28376,38 +27709,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -28445,8 +27780,8 @@ echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode b
     fi
 
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
     fi
 
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then

-                        { echo "$as_me:$LINENO: checking for regex.h" >&5
-echo $ECHO_N "checking for regex.h... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking for regex.h" >&5
+echo $ECHO_N "checking for regex.h... $ECHO_C" >&6

 if test "${ac_cv_header_regex_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_regex_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -28461,43 +27796,47 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <regex.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <regex.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_regex_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_regex_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_regex_h=no
+ac_cv_header_regex_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
-echo "${ECHO_T}$ac_cv_header_regex_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
+echo "${ECHO_T}$ac_cv_header_regex_h" >&6

 if test $ac_cv_header_regex_h = yes; then
 
 
 for ac_func in regcomp re_search
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 if test $ac_cv_header_regex_h = yes; then
 
 
 for ac_func in regcomp re_search
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -28523,60 +27862,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -28621,8 +27968,8 @@ _ACEOF
                                                 if test "$USE_DARWIN" = 1; then
             system_zlib_h_ok="yes"
         else
                                                 if test "$USE_DARWIN" = 1; then
             system_zlib_h_ok="yes"
         else

-                                                                                    { echo "$as_me:$LINENO: checking for zlib.h >= 1.1.4" >&5
-echo $ECHO_N "checking for zlib.h >= 1.1.4... $ECHO_C" >&6; }
+                                                                                    echo "$as_me:$LINENO: checking for zlib.h >= 1.1.4" >&5
+echo $ECHO_N "checking for zlib.h >= 1.1.4... $ECHO_C" >&6

 if test "${ac_cv_header_zlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_zlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -28654,22 +28001,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -28682,16 +28020,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_zlib_h=no
 fi
 ( exit $ac_status )
 ac_cv_header_zlib_h=no
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

-
-

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
-                                    { echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+                                    echo "$as_me:$LINENO: checking for zlib.h" >&5
+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6

 if test "${ac_cv_header_zlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_zlib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -28706,34 +28042,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <zlib.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <zlib.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_zlib_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_zlib_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_zlib_h=no
+ac_cv_header_zlib_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6

 
 
 
 
 
 


@@ -28741,8 +28081,8 @@ echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }
         fi
 
         if test "$system_zlib_h_ok" = "yes"; then
         fi
 
         if test "$system_zlib_h_ok" = "yes"; then

-            { echo "$as_me:$LINENO: checking for deflate in -lz" >&5
-echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for deflate in -lz" >&5
+echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6

 if test "${ac_cv_lib_z_deflate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_z_deflate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -28755,53 +28095,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char deflate ();
 int
 main ()
 {
 char deflate ();
 int
 main ()
 {

-return deflate ();
+deflate ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_z_deflate=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_z_deflate=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_z_deflate=no
+ac_cv_lib_z_deflate=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
+echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6

 if test $ac_cv_lib_z_deflate = yes; then
   ZLIB_LINK=" -lz"
 fi
 if test $ac_cv_lib_z_deflate = yes; then
   ZLIB_LINK=" -lz"
 fi


@@ -28846,8 +28189,8 @@ echo "$as_me: WARNING: system png library doesn't work without system zlib, will
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then

-                                    { echo "$as_me:$LINENO: checking for png.h > 0.90" >&5
-echo $ECHO_N "checking for png.h > 0.90... $ECHO_C" >&6; }
+                                    echo "$as_me:$LINENO: checking for png.h > 0.90" >&5
+echo $ECHO_N "checking for png.h > 0.90... $ECHO_C" >&6

 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -28876,22 +28219,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -28904,16 +28238,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_png_h=no
 fi
 ( exit $ac_status )
 ac_cv_header_png_h=no
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

-
-

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
-            { echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+echo "${ECHO_T}$ac_cv_header_png_h" >&6
+            echo "$as_me:$LINENO: checking for png.h" >&5
+echo $ECHO_N "checking for png.h... $ECHO_C" >&6

 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_png_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -28928,40 +28260,44 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <png.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <png.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_png_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_png_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_png_h=no
+ac_cv_header_png_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+echo "${ECHO_T}$ac_cv_header_png_h" >&6

 
 
 
             if test "$ac_cv_header_png_h" = "yes"; then
 
 
 
             if test "$ac_cv_header_png_h" = "yes"; then

-                { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6

 if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -28974,53 +28310,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char png_check_sig ();
 int
 main ()
 {
 char png_check_sig ();
 int
 main ()
 {

-return png_check_sig ();
+png_check_sig ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_png_png_check_sig=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_png_png_check_sig=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_png_png_check_sig=no
+ac_cv_lib_png_png_check_sig=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6

 if test $ac_cv_lib_png_png_check_sig = yes; then
   PNG_LINK=" -lpng -lz"
 fi
 if test $ac_cv_lib_png_png_check_sig = yes; then
   PNG_LINK=" -lpng -lz"
 fi


@@ -29060,8 +28399,8 @@ echo "$as_me: WARNING: wxMGL doesn't work with builtin jpeg library, will use MG
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then

-                                                { echo "$as_me:$LINENO: checking for jpeglib.h" >&5
-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }
+                                                echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6

             if test "${ac_cv_header_jpeglib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
             if test "${ac_cv_header_jpeglib_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -29086,41 +28425,45 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_jpeglib_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_jpeglib_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_jpeglib_h=no
+ac_cv_header_jpeglib_h=no

 
 fi
 
 fi

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

 
 fi
 
 
 fi
 

-            { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
+            echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6

 
             if test "$ac_cv_header_jpeglib_h" = "yes"; then
 
             if test "$ac_cv_header_jpeglib_h" = "yes"; then

-                { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
-echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
+echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6

 if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -29133,53 +28476,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char jpeg_read_header ();
 int
 main ()
 {
 char jpeg_read_header ();
 int
 main ()
 {

-return jpeg_read_header ();
+jpeg_read_header ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_jpeg_jpeg_read_header=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_jpeg_jpeg_read_header=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_jpeg_jpeg_read_header=no
+ac_cv_lib_jpeg_jpeg_read_header=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6

 if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
   JPEG_LINK=" -ljpeg"
 fi
 if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
   JPEG_LINK=" -ljpeg"
 fi


@@ -29200,8 +28546,8 @@ echo "$as_me: WARNING: system jpeg library not found, will use built-in instead"
                                 wxUSE_LIBJPEG=sys
 
                 if test "$wxUSE_MSW" = 1; then
                                 wxUSE_LIBJPEG=sys
 
                 if test "$wxUSE_MSW" = 1; then

-                                                                                                    { echo "$as_me:$LINENO: checking for boolean" >&5
-echo $ECHO_N "checking for boolean... $ECHO_C" >&6; }
+                                                                                                    echo "$as_me:$LINENO: checking for boolean" >&5
+echo $ECHO_N "checking for boolean... $ECHO_C" >&6

 if test "${ac_cv_type_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -29213,47 +28559,50 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <windows.h>
 
 /* end confdefs.h.  */
 #include <windows.h>
 

-typedef boolean ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((boolean *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (boolean))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_boolean=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_boolean=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_boolean=no
+ac_cv_type_boolean=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5
-echo "${ECHO_T}$ac_cv_type_boolean" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5
+echo "${ECHO_T}$ac_cv_type_boolean" >&6

 if test $ac_cv_type_boolean = yes; then
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_type_boolean = yes; then
 
 cat >>confdefs.h <<_ACEOF


@@ -29261,8 +28610,8 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
 _ACEOF
 
 

-                            { echo "$as_me:$LINENO: checking for boolean" >&5
-echo $ECHO_N "checking for boolean... $ECHO_C" >&6; }
+                            echo "$as_me:$LINENO: checking for boolean" >&5
+echo $ECHO_N "checking for boolean... $ECHO_C" >&6

 if test "${ac_cv_type_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -29278,57 +28627,61 @@ cat >>conftest.$ac_ext <<_ACEOF
                                     #include <jpeglib.h>
 
 
                                     #include <jpeglib.h>
 
 

-typedef boolean ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((boolean *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (boolean))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_boolean=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_boolean=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_boolean=no
+ac_cv_type_boolean=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5
-echo "${ECHO_T}$ac_cv_type_boolean" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5
+echo "${ECHO_T}$ac_cv_type_boolean" >&6

 
 

-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of boolean" >&5
-echo $ECHO_N "checking size of boolean... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking size of boolean" >&5
+echo $ECHO_N "checking size of boolean... $ECHO_C" >&6

 if test "${ac_cv_sizeof_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_sizeof_boolean+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

+  if test "$ac_cv_type_boolean" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF


@@ -29343,11 +28696,10 @@ cat >>conftest.$ac_ext <<_ACEOF
                                     #include <jpeglib.h>
 
 
                                     #include <jpeglib.h>
 
 

-   typedef boolean ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (boolean))) >= 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -29355,22 +28707,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -29385,11 +28742,10 @@ cat >>conftest.$ac_ext <<_ACEOF
                                     #include <jpeglib.h>
 
 
                                     #include <jpeglib.h>
 
 

-   typedef boolean ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (boolean))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -29397,42 +28753,46 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr $ac_mid + 1`
-                       if test $ac_lo -le $ac_mid; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid + 1`
+ac_lo=`expr $ac_mid + 1`
+                   if test $ac_lo -le $ac_mid; then
+                     ac_lo= ac_hi=
+                     break
+                   fi
+                   ac_mid=`expr 2 '*' $ac_mid + 1`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -29444,11 +28804,10 @@ cat >>conftest.$ac_ext <<_ACEOF
                                     #include <jpeglib.h>
 
 
                                     #include <jpeglib.h>
 
 

-   typedef boolean ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (boolean))) < 0)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -29456,22 +28815,27 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF


@@ -29486,11 +28850,10 @@ cat >>conftest.$ac_ext <<_ACEOF
                                     #include <jpeglib.h>
 
 
                                     #include <jpeglib.h>
 
 

-   typedef boolean ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (boolean))) >= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -29498,48 +28861,50 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_lo=$ac_mid; break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_hi=`expr '(' $ac_mid ')' - 1`
-                       if test $ac_mid -le $ac_hi; then
-                         ac_lo= ac_hi=
-                         break
-                       fi
-                       ac_mid=`expr 2 '*' $ac_mid`
+ac_hi=`expr '(' $ac_mid ')' - 1`
+                      if test $ac_mid -le $ac_hi; then
+                        ac_lo= ac_hi=
+                        break
+                      fi
+                      ac_mid=`expr 2 '*' $ac_mid`

 fi
 fi

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

   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   done
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo= ac_hi=
+ac_lo= ac_hi=

 fi
 fi

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

 fi
 fi

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

 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`


@@ -29555,11 +28920,10 @@ cat >>conftest.$ac_ext <<_ACEOF
                                     #include <jpeglib.h>
 
 
                                     #include <jpeglib.h>
 
 

-   typedef boolean ac__type_sizeof_;

 int
 main ()
 {
 int
 main ()
 {

-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (boolean))) <= $ac_mid)];

 test_array [0] = 0
 
   ;
 test_array [0] = 0
 
   ;


@@ -29567,44 +28931,51 @@ test_array [0] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_hi=$ac_mid
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_lo=`expr '(' $ac_mid ')' + 1`
+ac_lo=`expr '(' $ac_mid ')' + 1`

 fi
 fi

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

 done
 case $ac_lo in
 ?*) ac_cv_sizeof_boolean=$ac_lo;;
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_boolean=$ac_lo;;

-'') if test "$ac_cv_type_boolean" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean)
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (boolean)
+echo "$as_me: error: cannot compute sizeof (boolean), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_boolean=0
-   fi ;;
+   { (exit 1); exit 1; }; } ;;

 esac
 esac

+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -29618,9 +28989,8 @@ cat >>conftest.$ac_ext <<_ACEOF
                                     #include <jpeglib.h>
 
 
                                     #include <jpeglib.h>
 
 

-   typedef boolean ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+long longval () { return (long) (sizeof (boolean)); }
+unsigned long ulongval () { return (long) (sizeof (boolean)); }

 #include <stdio.h>
 #include <stdlib.h>
 int
 #include <stdio.h>
 #include <stdlib.h>
 int


@@ -29629,44 +28999,35 @@ main ()
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
 
   FILE *f = fopen ("conftest.val", "w");
   if (! f)

-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+    exit (1);
+  if (((long) (sizeof (boolean))) < 0)

     {
     {

-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      long i = longval ();
+      if (i != ((long) (sizeof (boolean))))
+       exit (1);

       fprintf (f, "%ld\n", i);
     }
   else
     {
       fprintf (f, "%ld\n", i);
     }
   else
     {

-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (boolean))))
+       exit (1);

       fprintf (f, "%lu\n", i);
     }
       fprintf (f, "%lu\n", i);
     }

-  return ferror (f) || fclose (f) != 0;
+  exit (ferror (f) || fclose (f) != 0);

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -29677,25 +29038,22 @@ echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )

-if test "$ac_cv_type_boolean" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean)
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean), 77

 See \`config.log' for more details." >&5
 See \`config.log' for more details." >&5

-echo "$as_me: error: cannot compute sizeof (boolean)
+echo "$as_me: error: cannot compute sizeof (boolean), 77

 See \`config.log' for more details." >&2;}
 See \`config.log' for more details." >&2;}

-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_boolean=0
-   fi
+   { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 rm -f conftest.val
 fi
 rm -f conftest.val

+else
+  ac_cv_sizeof_boolean=0

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_boolean" >&5
-echo "${ECHO_T}$ac_cv_sizeof_boolean" >&6; }
-
-
-
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_boolean" >&5
+echo "${ECHO_T}$ac_cv_sizeof_boolean" >&6

 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_BOOLEAN $ac_cv_sizeof_boolean
 _ACEOF
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_BOOLEAN $ac_cv_sizeof_boolean
 _ACEOF


@@ -29730,8 +29088,8 @@ _ACEOF
         if test "$wxUSE_ZLIB" = "sys"; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
         fi
         if test "$wxUSE_ZLIB" = "sys"; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
         fi

-        { echo "$as_me:$LINENO: checking for tiffio.h" >&5
-echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for tiffio.h" >&5
+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6

 if test "${ac_cv_header_tiffio_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_tiffio_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -29747,38 +29105,42 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <tiffio.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <tiffio.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_tiffio_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_tiffio_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_tiffio_h=no
+ac_cv_header_tiffio_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
-echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6

 if test $ac_cv_header_tiffio_h = yes; then
 
 if test $ac_cv_header_tiffio_h = yes; then
 

-                            { echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5
-echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6; }
+                            echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5
+echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6

 if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -29791,53 +29153,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char TIFFError ();
 int
 main ()
 {
 char TIFFError ();
 int
 main ()
 {

-return TIFFError ();
+TIFFError ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_tiff_TIFFError=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_tiff_TIFFError=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_tiff_TIFFError=no
+ac_cv_lib_tiff_TIFFError=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFError" >&5
-echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFError" >&5
+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6

 if test $ac_cv_lib_tiff_TIFFError = yes; then
   TIFF_LINK=" -ltiff"
 fi
 if test $ac_cv_lib_tiff_TIFFError = yes; then
   TIFF_LINK=" -ltiff"
 fi


@@ -29889,8 +29254,8 @@ _ACEOF
 
 
     if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
 
 
     if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then

-        { echo "$as_me:$LINENO: checking for expat.h" >&5
-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6

 if test "${ac_cv_header_expat_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_expat_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -29905,47 +29270,51 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <expat.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <expat.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_expat_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_expat_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_expat_h=no
+ac_cv_header_expat_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6

 if test $ac_cv_header_expat_h = yes; then
   found_expat_h=1
 fi
 
 
         if test "x$found_expat_h" = "x1"; then
 if test $ac_cv_header_expat_h = yes; then
   found_expat_h=1
 fi
 
 
         if test "x$found_expat_h" = "x1"; then

-                        { echo "$as_me:$LINENO: checking if expat.h is valid C++ header" >&5
-echo $ECHO_N "checking if expat.h is valid C++ header... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking if expat.h is valid C++ header" >&5
+echo $ECHO_N "checking if expat.h is valid C++ header... $ECHO_C" >&6

 if test "${wx_cv_expat_is_not_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_expat_is_not_broken+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                ac_ext=cpp
+                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -29967,32 +29336,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_expat_is_not_broken=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_expat_is_not_broken=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_expat_is_not_broken=no
+wx_cv_expat_is_not_broken=no

 
 fi
 
 fi

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

                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -30002,11 +29375,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_expat_is_not_broken" >&5
-echo "${ECHO_T}$wx_cv_expat_is_not_broken" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_expat_is_not_broken" >&5
+echo "${ECHO_T}$wx_cv_expat_is_not_broken" >&6

             if test "$wx_cv_expat_is_not_broken" = "yes" ; then
             if test "$wx_cv_expat_is_not_broken" = "yes" ; then

-                { echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
-echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6

 if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -30019,53 +29392,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char XML_ParserCreate ();
 int
 main ()
 {
 char XML_ParserCreate ();
 int
 main ()
 {

-return XML_ParserCreate ();
+XML_ParserCreate ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_expat_XML_ParserCreate=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_expat_XML_ParserCreate=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_expat_XML_ParserCreate=no
+ac_cv_lib_expat_XML_ParserCreate=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6

 if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
   EXPAT_LINK=" -lexpat"
 fi
 if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
   EXPAT_LINK=" -lexpat"
 fi


@@ -30087,7 +29463,9 @@ echo "$as_me: WARNING: system expat library not found, will use built-in instead
         fi
     fi
     if test "$wxUSE_EXPAT" = "builtin" ; then
         fi
     fi
     if test "$wxUSE_EXPAT" = "builtin" ; then

-                subdirs="$subdirs src/expat"
+
+
+subdirs="$subdirs src/expat"

 
     fi
 fi
 
     fi
 fi


@@ -30095,8 +29473,8 @@ fi
 
 
 if test "$wxUSE_LIBMSPACK" != "no"; then
 
 
 if test "$wxUSE_LIBMSPACK" != "no"; then

-    { echo "$as_me:$LINENO: checking for mspack.h" >&5
-echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for mspack.h" >&5
+echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6

 if test "${ac_cv_header_mspack_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_mspack_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -30111,42 +29489,46 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <mspack.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <mspack.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_mspack_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_mspack_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_mspack_h=no
+ac_cv_header_mspack_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
+echo "${ECHO_T}$ac_cv_header_mspack_h" >&6

 if test $ac_cv_header_mspack_h = yes; then
   found_mspack_h=1
 fi
 
 
     if test "x$found_mspack_h" = "x1"; then
 if test $ac_cv_header_mspack_h = yes; then
   found_mspack_h=1
 fi
 
 
     if test "x$found_mspack_h" = "x1"; then

-        { echo "$as_me:$LINENO: checking for mspack_create_chm_decompressor in -lmspack" >&5
-echo $ECHO_N "checking for mspack_create_chm_decompressor in -lmspack... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for mspack_create_chm_decompressor in -lmspack" >&5
+echo $ECHO_N "checking for mspack_create_chm_decompressor in -lmspack... $ECHO_C" >&6

 if test "${ac_cv_lib_mspack_mspack_create_chm_decompressor+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_mspack_mspack_create_chm_decompressor+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -30159,53 +29541,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char mspack_create_chm_decompressor ();
 int
 main ()
 {
 char mspack_create_chm_decompressor ();
 int
 main ()
 {

-return mspack_create_chm_decompressor ();
+mspack_create_chm_decompressor ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_mspack_mspack_create_chm_decompressor=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_mspack_mspack_create_chm_decompressor=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_mspack_mspack_create_chm_decompressor=no
+ac_cv_lib_mspack_mspack_create_chm_decompressor=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5
-echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5
+echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6

 if test $ac_cv_lib_mspack_mspack_create_chm_decompressor = yes; then
   MSPACK_LINK=" -lmspack"
 fi
 if test $ac_cv_lib_mspack_mspack_create_chm_decompressor = yes; then
   MSPACK_LINK=" -lmspack"
 fi


@@ -30237,9 +29622,9 @@ if test "$USE_WIN32" = 1 ; then
 for ac_header in w32api.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in w32api.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -30253,35 +29638,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -30291,8 +29679,8 @@ fi
 
 done
 
 
 done
 

-    { echo "$as_me:$LINENO: checking for windows.h" >&5
-echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for windows.h" >&5
+echo $ECHO_N "checking for windows.h... $ECHO_C" >&6

 if test "${ac_cv_header_windows_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_windows_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -30307,34 +29695,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <windows.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <windows.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_windows_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_windows_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_windows_h=no
+ac_cv_header_windows_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
-echo "${ECHO_T}$ac_cv_header_windows_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+echo "${ECHO_T}$ac_cv_header_windows_h" >&6

 if test $ac_cv_header_windows_h = yes; then
   :
 else
 if test $ac_cv_header_windows_h = yes; then
   :
 else


@@ -30376,8 +29768,8 @@ _ACEOF
 
         WIN32INSTALL=win32install
 
 
         WIN32INSTALL=win32install
 

-        { echo "$as_me:$LINENO: checking for pbt.h" >&5
-echo $ECHO_N "checking for pbt.h... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for pbt.h" >&5
+echo $ECHO_N "checking for pbt.h... $ECHO_C" >&6

 if test "${ac_cv_header_pbt_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_pbt_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -30392,34 +29784,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <pbt.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <pbt.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_pbt_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_pbt_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_pbt_h=no
+ac_cv_header_pbt_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_pbt_h" >&5
-echo "${ECHO_T}$ac_cv_header_pbt_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_pbt_h" >&5
+echo "${ECHO_T}$ac_cv_header_pbt_h" >&6

 if test $ac_cv_header_pbt_h = yes; then
   :
 else
 if test $ac_cv_header_pbt_h = yes; then
   :
 else


@@ -30471,8 +29867,8 @@ echo "$as_me: WARNING: wxDragImage not supported under wxCocoa yet, disabled" >&
     fi
 
     if test "$wxUSE_GTK" = 1; then
     fi
 
     if test "$wxUSE_GTK" = 1; then

-                { echo "$as_me:$LINENO: checking for GTK+ version" >&5
-echo $ECHO_N "checking for GTK+ version... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for GTK+ version" >&5
+echo $ECHO_N "checking for GTK+ version... $ECHO_C" >&6

 
         gtk_version_cached=1
         if test "${wx_cv_lib_gtk+set}" = set; then
 
         gtk_version_cached=1
         if test "${wx_cv_lib_gtk+set}" = set; then


@@ -30480,8 +29876,8 @@ echo $ECHO_N "checking for GTK+ version... $ECHO_C" >&6; }
 else
 
                                                 gtk_version_cached=0
 else
 
                                                 gtk_version_cached=0

-                { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+                echo "$as_me:$LINENO: result: " >&5
+echo "${ECHO_T}" >&6

 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then
 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then


@@ -30498,13 +29894,13 @@ echo "${ECHO_T}" >&6; }
                             fi
                     esac
 
                             fi
                     esac
 

-                    # Check whether --enable-gtktest was given.
+                    # Check whether --enable-gtktest or --disable-gtktest was given.

 if test "${enable_gtktest+set}" = set; then
 if test "${enable_gtktest+set}" = set; then

-  enableval=$enable_gtktest;
+  enableval="$enable_gtktest"
+

 else
   enable_gtktest=yes
 else
   enable_gtktest=yes

-fi
-
+fi;

 
   pkg_config_args=gtk+-2.0
   for module in . $GTK_MODULES
 
   pkg_config_args=gtk+-2.0
   for module in . $GTK_MODULES


@@ -30520,8 +29916,8 @@ fi
 
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -30536,30 +29932,29 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG

+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 
 fi
 
 

-

   if test x$PKG_CONFIG != xno ; then
     if pkg-config --atleast-pkgconfig-version 0.7 ; then
       :
   if test x$PKG_CONFIG != xno ; then
     if pkg-config --atleast-pkgconfig-version 0.7 ; then
       :


@@ -30573,8 +29968,8 @@ fi
   fi
 
   min_gtk_version=2.0.0
   fi
 
   min_gtk_version=2.0.0

-  { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6

 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs


@@ -30688,22 +30083,13 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -30716,21 +30102,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gtk=yes
 fi
 ( exit $ac_status )
 no_gtk=yes
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-
-

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
+     echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6

      wx_cv_lib_gtk=2.0
   else
      wx_cv_lib_gtk=2.0
   else

-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+     echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

      if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
        echo "*** See http://pkgconfig.sourceforge.net"
      if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
        echo "*** See http://pkgconfig.sourceforge.net"


@@ -30762,23 +30146,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
           echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
           echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"


@@ -30792,11 +30180,10 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-        echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"

           echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
 fi
           echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"


@@ -30822,28 +30209,28 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
                                 if test -z "$wx_cv_lib_gtk"; then
                     if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then
 
                                 if test -z "$wx_cv_lib_gtk"; then
                     if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then
 

-# Check whether --with-gtk-prefix was given.
+# Check whether --with-gtk-prefix or --without-gtk-prefix was given.

 if test "${with_gtk_prefix+set}" = set; then
 if test "${with_gtk_prefix+set}" = set; then

-  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
+  withval="$with_gtk_prefix"
+  gtk_config_prefix="$withval"

 else
   gtk_config_prefix=""
 else
   gtk_config_prefix=""

-fi
+fi;

 
 

-
-# Check whether --with-gtk-exec-prefix was given.
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.

 if test "${with_gtk_exec_prefix+set}" = set; then
 if test "${with_gtk_exec_prefix+set}" = set; then

-  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
+  withval="$with_gtk_exec_prefix"
+  gtk_config_exec_prefix="$withval"

 else
   gtk_config_exec_prefix=""
 else
   gtk_config_exec_prefix=""

-fi
-
-# Check whether --enable-gtktest was given.
+fi;
+# Check whether --enable-gtktest or --disable-gtktest was given.

 if test "${enable_gtktest+set}" = set; then
 if test "${enable_gtktest+set}" = set; then

-  enableval=$enable_gtktest;
+  enableval="$enable_gtktest"
+

 else
   enable_gtktest=yes
 else
   enable_gtktest=yes

-fi
-
+fi;

 
   for module in . $GTK_MODULES
   do
 
   for module in . $GTK_MODULES
   do


@@ -30869,8 +30256,8 @@ fi
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -30885,32 +30272,31 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG

+

 if test -n "$GTK_CONFIG"; then
 if test -n "$GTK_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
+echo "${ECHO_T}$GTK_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

   min_gtk_version=1.2.7
   min_gtk_version=1.2.7

-  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6

   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes


@@ -31015,22 +30401,13 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -31043,21 +30420,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gtk=yes
 fi
 ( exit $ac_status )
 no_gtk=yes
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-
-

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+     echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

      wx_cv_lib_gtk=1.2.7
   else
      wx_cv_lib_gtk=1.2.7
   else

-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+     echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"


@@ -31089,23 +30464,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"


@@ -31124,13 +30503,12 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-        echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"

           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"


@@ -31147,28 +30525,28 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
                         if test -z "$wx_cv_lib_gtk"; then
 
 
                         if test -z "$wx_cv_lib_gtk"; then
 

-# Check whether --with-gtk-prefix was given.
+# Check whether --with-gtk-prefix or --without-gtk-prefix was given.

 if test "${with_gtk_prefix+set}" = set; then
 if test "${with_gtk_prefix+set}" = set; then

-  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
+  withval="$with_gtk_prefix"
+  gtk_config_prefix="$withval"

 else
   gtk_config_prefix=""
 else
   gtk_config_prefix=""

-fi
+fi;

 
 

-
-# Check whether --with-gtk-exec-prefix was given.
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.

 if test "${with_gtk_exec_prefix+set}" = set; then
 if test "${with_gtk_exec_prefix+set}" = set; then

-  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
+  withval="$with_gtk_exec_prefix"
+  gtk_config_exec_prefix="$withval"

 else
   gtk_config_exec_prefix=""
 else
   gtk_config_exec_prefix=""

-fi
-
-# Check whether --enable-gtktest was given.
+fi;
+# Check whether --enable-gtktest or --disable-gtktest was given.

 if test "${enable_gtktest+set}" = set; then
 if test "${enable_gtktest+set}" = set; then

-  enableval=$enable_gtktest;
+  enableval="$enable_gtktest"
+

 else
   enable_gtktest=yes
 else
   enable_gtktest=yes

-fi
-
+fi;

 
   for module in . $GTK_MODULES
   do
 
   for module in . $GTK_MODULES
   do


@@ -31194,8 +30572,8 @@ fi
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -31210,32 +30588,31 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG

+

 if test -n "$GTK_CONFIG"; then
 if test -n "$GTK_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
+echo "${ECHO_T}$GTK_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

   min_gtk_version=1.2.3
   min_gtk_version=1.2.3

-  { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6

   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes


@@ -31340,22 +30717,13 @@ main ()
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -31368,21 +30736,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_gtk=yes
 fi
 ( exit $ac_status )
 no_gtk=yes
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-
-

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+     echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

      wx_cv_lib_gtk=1.2.3
   else
      wx_cv_lib_gtk=1.2.3
   else

-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+     echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"


@@ -31414,23 +30780,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"


@@ -31449,13 +30819,12 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-        echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"

           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi
           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
           echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"


@@ -31485,8 +30854,8 @@ fi
 
 
                         if test "$gtk_version_cached" = 1; then
 
 
                         if test "$gtk_version_cached" = 1; then

-            { echo "$as_me:$LINENO: result: $wx_cv_lib_gtk" >&5
-echo "${ECHO_T}$wx_cv_lib_gtk" >&6; }
+            echo "$as_me:$LINENO: result: $wx_cv_lib_gtk" >&5
+echo "${ECHO_T}$wx_cv_lib_gtk" >&6

         fi
 
         case "$wx_cv_lib_gtk" in
         fi
 
         case "$wx_cv_lib_gtk" in


@@ -31524,8 +30893,8 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
             CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
             LIBS="$LIBS $wx_cv_libs_gtk"
 
             CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
             LIBS="$LIBS $wx_cv_libs_gtk"
 

-                                                            { echo "$as_me:$LINENO: checking whether gtk_icon_size_lookup is declared" >&5
-echo $ECHO_N "checking whether gtk_icon_size_lookup is declared... $ECHO_C" >&6; }
+                                                            echo "$as_me:$LINENO: checking whether gtk_icon_size_lookup is declared" >&5
+echo $ECHO_N "checking whether gtk_icon_size_lookup is declared... $ECHO_C" >&6

 if test "${ac_cv_have_decl_gtk_icon_size_lookup+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_have_decl_gtk_icon_size_lookup+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -31541,7 +30910,7 @@ int
 main ()
 {
 #ifndef gtk_icon_size_lookup
 main ()
 {
 #ifndef gtk_icon_size_lookup

-  (void) gtk_icon_size_lookup;
+  char *p = (char *) gtk_icon_size_lookup;

 #endif
 
   ;
 #endif
 
   ;


@@ -31549,34 +30918,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_have_decl_gtk_icon_size_lookup=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_have_decl_gtk_icon_size_lookup=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_have_decl_gtk_icon_size_lookup=no
+ac_cv_have_decl_gtk_icon_size_lookup=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5
-echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5
+echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6

 if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then
 
 cat >>confdefs.h <<_ACEOF


@@ -31598,8 +30971,8 @@ fi
 
 
 
 
 
 

-                        { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6

             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -31622,22 +30995,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                             cat >>confdefs.h <<\_ACEOF
 #define __WXGTK210__ 1
 
                             cat >>confdefs.h <<\_ACEOF
 #define __WXGTK210__ 1


@@ -31651,8 +31029,8 @@ _ACEOF
 #define __WXGTK24__ 1
 _ACEOF
 
 #define __WXGTK24__ 1
 _ACEOF
 

-                            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                             ac_wxgtk210=1
 
 else
                             ac_wxgtk210=1
 
 else


@@ -31660,17 +31038,16 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                             ac_wxgtk210=0
 
 fi
                             ac_wxgtk210=0
 
 fi

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

 
             if test "$ac_wxgtk210" = 0; then
 
             if test "$ac_wxgtk210" = 0; then

-                                { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
+                                echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6

                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -31693,22 +31070,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                                 cat >>confdefs.h <<\_ACEOF
 #define __WXGTK26__ 1
 
                                 cat >>confdefs.h <<\_ACEOF
 #define __WXGTK26__ 1


@@ -31718,8 +31100,8 @@ _ACEOF
 #define __WXGTK24__ 1
 _ACEOF
 
 #define __WXGTK24__ 1
 _ACEOF
 

-                                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                                echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                                 ac_wxgtk26=1
 
 else
                                 ac_wxgtk26=1
 
 else


@@ -31727,18 +31109,17 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                                echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                                 ac_wxgtk26=0
 
 fi
                                 ac_wxgtk26=0
 
 fi

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

             fi
 
             if test "$ac_wxgtk26" = 0; then
             fi
 
             if test "$ac_wxgtk26" = 0; then

-                                { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.4... $ECHO_C" >&6; }
+                                echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.4... $ECHO_C" >&6

                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -31761,41 +31142,45 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                                 cat >>confdefs.h <<\_ACEOF
 #define __WXGTK24__ 1
 _ACEOF
 
 
                                 cat >>confdefs.h <<\_ACEOF
 #define __WXGTK24__ 1
 _ACEOF
 

-                                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                                echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                                echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 
 fi
 
 fi

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

             fi
 
             CFLAGS="$save_CFLAGS"
             fi
 
             CFLAGS="$save_CFLAGS"


@@ -31807,8 +31192,8 @@ echo "$as_me: WARNING: Unicode configuration not supported with GTK+ 1.x" >&2;}
                 wxUSE_UNICODE=no
             fi
 
                 wxUSE_UNICODE=no
             fi
 

-                        { echo "$as_me:$LINENO: checking for gdk_im_open in -lgdk" >&5
-echo $ECHO_N "checking for gdk_im_open in -lgdk... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking for gdk_im_open in -lgdk" >&5
+echo $ECHO_N "checking for gdk_im_open in -lgdk... $ECHO_C" >&6

 if test "${ac_cv_lib_gdk_gdk_im_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_gdk_gdk_im_open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -31821,53 +31206,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char gdk_im_open ();
 int
 main ()
 {
 char gdk_im_open ();
 int
 main ()
 {

-return gdk_im_open ();
+gdk_im_open ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_gdk_gdk_im_open=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_gdk_gdk_im_open=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_gdk_gdk_im_open=no
+ac_cv_lib_gdk_gdk_im_open=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gdk_gdk_im_open" >&5
-echo "${ECHO_T}$ac_cv_lib_gdk_gdk_im_open" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_gdk_gdk_im_open" >&5
+echo "${ECHO_T}$ac_cv_lib_gdk_gdk_im_open" >&6

 if test $ac_cv_lib_gdk_gdk_im_open = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_XIM 1
 if test $ac_cv_lib_gdk_gdk_im_open = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_XIM 1


@@ -31881,9 +31269,9 @@ fi
 for ac_func in poll
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in poll
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -31909,60 +31297,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -31982,8 +31378,8 @@ done
         GUIDIST=GTK_DIST
 
                 if test "$wxUSE_GPE" = "yes"; then
         GUIDIST=GTK_DIST
 
                 if test "$wxUSE_GPE" = "yes"; then

-            { echo "$as_me:$LINENO: checking for gpewidget library" >&5
-echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for gpewidget library" >&5
+echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -32012,32 +31408,32 @@ echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; }
 
                                                 GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
                 WXGPE=1
 
                                                 GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
                 WXGPE=1

-                { echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
-echo "${ECHO_T}found in $ac_find_libraries" >&6; }
+                echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
+echo "${ECHO_T}found in $ac_find_libraries" >&6

             else
             else

-                { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+                echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

             fi
 
                                                                                                                     fi
     fi
 
     if test "$wxUSE_MGL" = 1; then
             fi
 
                                                                                                                     fi
     fi
 
     if test "$wxUSE_MGL" = 1; then

-       { echo "$as_me:$LINENO: checking for SciTech MGL library" >&5
-echo $ECHO_N "checking for SciTech MGL library... $ECHO_C" >&6; }
+       echo "$as_me:$LINENO: checking for SciTech MGL library" >&5
+echo $ECHO_N "checking for SciTech MGL library... $ECHO_C" >&6

         if test "x$MGL_ROOT" = x ; then
         if test "x$MGL_ROOT" = x ; then

-            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+            echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

             { { echo "$as_me:$LINENO: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&5
 echo "$as_me: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&2;}
    { (exit 1); exit 1; }; }
         else
             { { echo "$as_me:$LINENO: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&5
 echo "$as_me: error: Cannot find MGL library. Make sure MGL_ROOT is set." >&2;}
    { (exit 1); exit 1; }; }
         else

-            { echo "$as_me:$LINENO: result: $MGL_ROOT" >&5
-echo "${ECHO_T}$MGL_ROOT" >&6; }
+            echo "$as_me:$LINENO: result: $MGL_ROOT" >&5
+echo "${ECHO_T}$MGL_ROOT" >&6

         fi
 
         fi
 

-        { echo "$as_me:$LINENO: checking for libmgl location" >&5
-echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for libmgl location" >&5
+echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6

                                 case "${host}" in
             *-*-linux* )
                                           if test "x$wxUSE_SHARED" = xyes ; then
                                 case "${host}" in
             *-*-linux* )
                                           if test "x$wxUSE_SHARED" = xyes ; then


@@ -32078,14 +31474,14 @@ echo "$as_me: error: This system type ${host} is not yet supported by wxMGL." >&
         done
 
         if test "x$mgl_os" = x ; then
         done
 
         if test "x$mgl_os" = x ; then

-            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+            echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

             { { echo "$as_me:$LINENO: error: Cannot find MGL libraries, make sure they are compiled." >&5
 echo "$as_me: error: Cannot find MGL libraries, make sure they are compiled." >&2;}
    { (exit 1); exit 1; }; }
         fi
             { { echo "$as_me:$LINENO: error: Cannot find MGL libraries, make sure they are compiled." >&5
 echo "$as_me: error: Cannot find MGL libraries, make sure they are compiled." >&2;}
    { (exit 1); exit 1; }; }
         fi

-        { echo "$as_me:$LINENO: result: \"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&5
-echo "${ECHO_T}\"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&6; }
+        echo "$as_me:$LINENO: result: \"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&5
+echo "${ECHO_T}\"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&6

 
         wxUSE_UNIVERSAL="yes"
 
 
         wxUSE_UNIVERSAL="yes"
 


@@ -32104,8 +31500,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -32120,35 +31516,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG

+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -32163,42 +31558,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

+

 if test -n "$ac_pt_PKG_CONFIG"; then
 if test -n "$ac_pt_PKG_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
+  PKG_CONFIG=$ac_pt_PKG_CONFIG

 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi


@@ -32206,14 +31587,14 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
        _pkg_min_version=0.9.0
 fi
 if test -n "$PKG_CONFIG"; then
        _pkg_min_version=0.9.0

-       { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+       echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6

        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

-               { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+               echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

        else
        else

-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                PKG_CONFIG=""
        fi
 
                PKG_CONFIG=""
        fi
 


@@ -32221,8 +31602,8 @@ fi
 
 
 pkg_failed=no
 
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for DIRECTFB" >&5
-echo $ECHO_N "checking for DIRECTFB... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for DIRECTFB" >&5
+echo $ECHO_N "checking for DIRECTFB... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$DIRECTFB_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$DIRECTFB_CFLAGS"; then


@@ -32294,8 +31675,8 @@ echo "$as_me: error: DirectFB not found." >&2;}
 else
        DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
        DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
 else
        DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
        DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                            wxUSE_UNIVERSAL="yes"
                            TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"
 
                            wxUSE_UNIVERSAL="yes"
                            TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"


@@ -32307,22 +31688,22 @@ fi
     fi
 
     if test "$wxUSE_MICROWIN" = 1; then
     fi
 
     if test "$wxUSE_MICROWIN" = 1; then

-        { echo "$as_me:$LINENO: checking for MicroWindows" >&5
-echo $ECHO_N "checking for MicroWindows... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for MicroWindows" >&5
+echo $ECHO_N "checking for MicroWindows... $ECHO_C" >&6

         if test "x$MICROWINDOWS" = x ; then
         if test "x$MICROWINDOWS" = x ; then

-            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+            echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

             { { echo "$as_me:$LINENO: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." >&5
 echo "$as_me: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." >&2;}
    { (exit 1); exit 1; }; }
         else
             { { echo "$as_me:$LINENO: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." >&5
 echo "$as_me: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." >&2;}
    { (exit 1); exit 1; }; }
         else

-            { echo "$as_me:$LINENO: result: $MICROWINDOWS" >&5
-echo "${ECHO_T}$MICROWINDOWS" >&6; }
+            echo "$as_me:$LINENO: result: $MICROWINDOWS" >&5
+echo "${ECHO_T}$MICROWINDOWS" >&6

         fi
 
         if test -f $MICROWINDOWS/lib/libmwin.a; then
         fi
 
         if test -f $MICROWINDOWS/lib/libmwin.a; then

-            { echo "$as_me:$LINENO: result: MicroWindows' libraries found." >&5
-echo "${ECHO_T}MicroWindows' libraries found." >&6; }
+            echo "$as_me:$LINENO: result: MicroWindows' libraries found." >&5
+echo "${ECHO_T}MicroWindows' libraries found." >&6

         else
             { { echo "$as_me:$LINENO: error: Cannot find MicroWindows libraries, make sure they are compiled." >&5
 echo "$as_me: error: Cannot find MicroWindows libraries, make sure they are compiled." >&2;}
         else
             { { echo "$as_me:$LINENO: error: Cannot find MicroWindows libraries, make sure they are compiled." >&5
 echo "$as_me: error: Cannot find MicroWindows libraries, make sure they are compiled." >&2;}


@@ -32342,49 +31723,44 @@ echo "$as_me: error: Cannot find MicroWindows libraries, make sure they are comp
     fi
 
         if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
     fi
 
         if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then

-                                { echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+                                echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6

 
 
 
 

-# Check whether --with-x was given.
+# Check whether --with-x or --without-x was given.

 if test "${with_x+set}" = set; then
 if test "${with_x+set}" = set; then

-  withval=$with_x;
-fi
+  withval="$with_x"

 
 

+fi;

 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else
 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else

-  case $x_includes,$x_libraries in #(
-    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-echo "$as_me: error: Cannot use X directory names containing '" >&2;}
-   { (exit 1); exit 1; }; };; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+    if test "${ac_cv_have_x+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no

-rm -f -r conftest.dir
+rm -fr conftest.dir

 if mkdir conftest.dir; then
   cd conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir

+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.

   cat >Imakefile <<'_ACEOF'
   cat >Imakefile <<'_ACEOF'

-incroot:
-       @echo incroot='${INCROOT}'
-usrlibdir:
-       @echo usrlibdir='${USRLIBDIR}'
-libdir:
-       @echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+acfindx:
+       @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+_ACEOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then

     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.

-    for ac_var in incroot usrlibdir libdir; do
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`

     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl; do
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl; do

-      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-        test -f "$ac_im_libdir/libX11.$ac_extension"; then
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+        test -f $ac_im_libdir/libX11.$ac_extension; then

        ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
        ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done


@@ -32392,7 +31768,7 @@ _ACEOF
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in

-       /usr/include) ac_x_includes= ;;
+       /usr/include) ;;

        *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
        *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in


@@ -32401,7 +31777,7 @@ _ACEOF
     esac
   fi
   cd ..
     esac
   fi
   cd ..

-  rm -f -r conftest.dir
+  rm -fr conftest.dir

 fi
 
 # Standard set of common directories for X headers.
 fi
 
 # Standard set of common directories for X headers.


@@ -32442,7 +31818,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then

-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for Intrinsic.h.

   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -32450,24 +31826,26 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>

 _ACEOF
 _ACEOF

-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else


@@ -32475,13 +31853,12 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do

-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then

     ac_x_includes=$ac_dir
     break
   fi
 done
 fi
     ac_x_includes=$ac_dir
     break
   fi
 done
 fi

-

 rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
 rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 


@@ -32490,40 +31867,44 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS

-  LIBS="-lX11 $LIBS"
+  LIBS="-lXt $LIBS"

   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */

-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>

 int
 main ()
 {
 int
 main ()
 {

-XrmInitialize ()
+XtMalloc (0)

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=


@@ -32531,54 +31912,49 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       LIBS=$ac_save_LIBS
+LIBS=$ac_save_LIBS

 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl; do

-    if test -r "$ac_dir/libX11.$ac_extension"; then
+    if test -r $ac_dir/libXt.$ac_extension; then

       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 

-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x="have_x=yes\
-       ac_x_includes='$ac_x_includes'\
-       ac_x_libraries='$ac_x_libraries'"
-esac
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+               ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"

 fi
 fi

-;; #(
-    *) have_x=yes;;
-  esac
+fi
+
+  fi

   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then

-  { echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6; }
+  echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6

   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.

-  ac_cv_have_x="have_x=yes\
-       ac_x_includes='$x_includes'\
-       ac_x_libraries='$x_libraries'"
-  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
+  ac_cv_have_x="have_x=yes \
+               ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6

 fi
 
 if test "$no_x" = yes; then
 fi
 
 if test "$no_x" = yes; then


@@ -32599,12 +31975,12 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .

-    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-    ac_xsave_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    cat >conftest.$ac_ext <<_ACEOF
+    case `(uname -sr) 2>/dev/null` in
+    "SunOS 5"*)
+      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -32620,32 +31996,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-       X_LIBS="$X_LIBS -R$x_libraries"
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_R_nospace=yes

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

+ac_R_nospace=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+      if test $ac_R_nospace = yes; then
+       echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+       X_LIBS="$X_LIBS -R$x_libraries"
+      else

        LIBS="$ac_xsave_LIBS -R $x_libraries"
        LIBS="$ac_xsave_LIBS -R $x_libraries"

-       cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -32661,42 +32048,47 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-         X_LIBS="$X_LIBS -R $x_libraries"
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_R_space=yes

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6; }
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+ac_R_space=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
       conftest$ac_exeext conftest.$ac_ext

-    ac_c_werror_flag=$ac_xsave_c_werror_flag
-    LIBS=$ac_xsave_LIBS
+       if test $ac_R_space = yes; then
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+         X_LIBS="$X_LIBS -R $x_libraries"
+       else
+         echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6
+       fi
+      fi
+      LIBS=$ac_xsave_LIBS
+    esac

   fi
 
   # Check for system-dependent libraries X programs must link with.
   fi
 
   # Check for system-dependent libraries X programs must link with.


@@ -32717,46 +32109,50 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char XOpenDisplay ();
 int
 main ()
 {
 char XOpenDisplay ();
 int
 main ()
 {

-return XOpenDisplay ();
+XOpenDisplay ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   :
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   :
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6

 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -32769,60 +32165,63 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char dnet_ntoa ();
 int
 main ()
 {
 char dnet_ntoa ();
 int
 main ()
 {

-return dnet_ntoa ();
+dnet_ntoa ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_dnet_dnet_ntoa=no
+ac_cv_lib_dnet_dnet_ntoa=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6

 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

-      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6

 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -32835,61 +32234,63 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char dnet_ntoa ();
 int
 main ()
 {
 char dnet_ntoa ();
 int
 main ()
 {

-return dnet_ntoa ();
+dnet_ntoa ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_dnet_stub_dnet_ntoa=no
+ac_cv_lib_dnet_stub_dnet_ntoa=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6

 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 


@@ -32901,8 +32302,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.

-    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6

 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -32929,63 +32330,72 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef gethostbyname
 
 
 #undef gethostbyname
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char gethostbyname ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char gethostbyname ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_gethostbyname || defined __stub___gethostbyname
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)

 choke me
 choke me

+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return gethostbyname ();
+return f != gethostbyname;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_gethostbyname=no
+ac_cv_func_gethostbyname=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6

 
     if test $ac_cv_func_gethostbyname = no; then
 
     if test $ac_cv_func_gethostbyname = no; then

-      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6

 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -32998,60 +32408,63 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char gethostbyname ();
 int
 main ()
 {
 char gethostbyname ();
 int
 main ()
 {

-return gethostbyname ();
+gethostbyname ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_nsl_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_nsl_gethostbyname=no
+ac_cv_lib_nsl_gethostbyname=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6

 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then

-       { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+       echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6

 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33064,53 +32477,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char gethostbyname ();
 int
 main ()
 {
 char gethostbyname ();
 int
 main ()
 {

-return gethostbyname ();
+gethostbyname ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_bsd_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_bsd_gethostbyname=no
+ac_cv_lib_bsd_gethostbyname=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6

 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi


@@ -33125,8 +32541,8 @@ fi
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.

-    { echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6

 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33153,63 +32569,72 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef connect
 
 
 #undef connect
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char connect ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char connect ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_connect || defined __stub___connect
+#if defined (__stub_connect) || defined (__stub___connect)

 choke me
 choke me

+#else
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return connect ();
+return f != connect;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_connect=no
+ac_cv_func_connect=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6

 
     if test $ac_cv_func_connect = no; then
 
     if test $ac_cv_func_connect = no; then

-      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6

 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33222,53 +32647,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char connect ();
 int
 main ()
 {
 char connect ();
 int
 main ()
 {

-return connect ();
+connect ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_socket_connect=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_socket_connect=no
+ac_cv_lib_socket_connect=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6

 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi


@@ -33276,8 +32704,8 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.

-    { echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for remove" >&5
+echo $ECHO_N "checking for remove... $ECHO_C" >&6

 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33304,63 +32732,72 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef remove
 
 
 #undef remove
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char remove ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char remove ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_remove || defined __stub___remove
+#if defined (__stub_remove) || defined (__stub___remove)

 choke me
 choke me

+#else
+char (*f) () = remove;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return remove ();
+return f != remove;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_remove=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_remove=no
+ac_cv_func_remove=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6

 
     if test $ac_cv_func_remove = no; then
 
     if test $ac_cv_func_remove = no; then

-      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6

 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33373,53 +32810,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char remove ();
 int
 main ()
 {
 char remove ();
 int
 main ()
 {

-return remove ();
+remove ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_posix_remove=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_posix_remove=no
+ac_cv_lib_posix_remove=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6

 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi


@@ -33427,8 +32867,8 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    { echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for shmat" >&5
+echo $ECHO_N "checking for shmat... $ECHO_C" >&6

 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33455,63 +32895,72 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef shmat
 
 
 #undef shmat
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char shmat ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char shmat ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_shmat || defined __stub___shmat
+#if defined (__stub_shmat) || defined (__stub___shmat)

 choke me
 choke me

+#else
+char (*f) () = shmat;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return shmat ();
+return f != shmat;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_shmat=no
+ac_cv_func_shmat=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6

 
     if test $ac_cv_func_shmat = no; then
 
     if test $ac_cv_func_shmat = no; then

-      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6

 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33524,53 +32973,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char shmat ();
 int
 main ()
 {
 char shmat ();
 int
 main ()
 {

-return shmat ();
+shmat ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_ipc_shmat=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_ipc_shmat=no
+ac_cv_lib_ipc_shmat=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6

 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi


@@ -33587,8 +33039,8 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry

-  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6

 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33601,53 +33053,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char IceConnectionNumber ();
 int
 main ()
 {
 char IceConnectionNumber ();
 int
 main ()
 {

-return IceConnectionNumber ();
+IceConnectionNumber ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_ICE_IceConnectionNumber=no
+ac_cv_lib_ICE_IceConnectionNumber=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6

 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi


@@ -33672,17 +33127,17 @@ echo "$as_me: error: X11 not found, please use --x-includes and/or --x-libraries
 
     if test "$wxUSE_X11" = 1; then
         if test "$wxUSE_NANOX" = "yes"; then
 
     if test "$wxUSE_X11" = 1; then
         if test "$wxUSE_NANOX" = "yes"; then

-            { echo "$as_me:$LINENO: checking for MicroWindows/NanoX distribution" >&5
-echo $ECHO_N "checking for MicroWindows/NanoX distribution... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for MicroWindows/NanoX distribution" >&5
+echo $ECHO_N "checking for MicroWindows/NanoX distribution... $ECHO_C" >&6

             if test "x$MICROWIN" = x ; then
             if test "x$MICROWIN" = x ; then

-                { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+                echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

                 { { echo "$as_me:$LINENO: error: Cannot find MicroWindows library. Make sure MICROWIN is set." >&5
 echo "$as_me: error: Cannot find MicroWindows library. Make sure MICROWIN is set." >&2;}
    { (exit 1); exit 1; }; }
             else
                 { { echo "$as_me:$LINENO: error: Cannot find MicroWindows library. Make sure MICROWIN is set." >&5
 echo "$as_me: error: Cannot find MicroWindows library. Make sure MICROWIN is set." >&2;}
    { (exit 1); exit 1; }; }
             else

-                { echo "$as_me:$LINENO: result: $MICROWIN" >&5
-echo "${ECHO_T}$MICROWIN" >&6; }
+                echo "$as_me:$LINENO: result: $MICROWIN" >&5
+echo "${ECHO_T}$MICROWIN" >&6

                 cat >>confdefs.h <<\_ACEOF
 #define wxUSE_NANOX 1
 _ACEOF
                 cat >>confdefs.h <<\_ACEOF
 #define wxUSE_NANOX 1
 _ACEOF


@@ -33697,8 +33152,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33713,35 +33168,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG

+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -33756,42 +33210,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

+

 if test -n "$ac_pt_PKG_CONFIG"; then
 if test -n "$ac_pt_PKG_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
+  PKG_CONFIG=$ac_pt_PKG_CONFIG

 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi


@@ -33799,14 +33239,14 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
        _pkg_min_version=0.9.0
 fi
 if test -n "$PKG_CONFIG"; then
        _pkg_min_version=0.9.0

-       { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+       echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6

        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

-               { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+               echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

        else
        else

-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                PKG_CONFIG=""
        fi
 
                PKG_CONFIG=""
        fi
 


@@ -33814,8 +33254,8 @@ fi
 
 
 pkg_failed=no
 
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for PANGOX" >&5
-echo $ECHO_N "checking for PANGOX... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for PANGOX" >&5
+echo $ECHO_N "checking for PANGOX... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$PANGOX_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$PANGOX_CFLAGS"; then


@@ -33887,8 +33327,8 @@ echo "$as_me: error: pangox library not found, library cannot be compiled in Uni
 else
        PANGOX_CFLAGS=$pkg_cv_PANGOX_CFLAGS
        PANGOX_LIBS=$pkg_cv_PANGOX_LIBS
 else
        PANGOX_CFLAGS=$pkg_cv_PANGOX_CFLAGS
        PANGOX_LIBS=$pkg_cv_PANGOX_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                     CFLAGS="$PANGOX_CFLAGS $CFLAGS"
                     CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
 
                     CFLAGS="$PANGOX_CFLAGS $CFLAGS"
                     CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"


@@ -33897,8 +33337,8 @@ echo "${ECHO_T}yes" >&6; }
 fi
 
 pkg_failed=no
 fi
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for PANGOFT2" >&5
-echo $ECHO_N "checking for PANGOFT2... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for PANGOFT2" >&5
+echo $ECHO_N "checking for PANGOFT2... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$PANGOFT2_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$PANGOFT2_CFLAGS"; then


@@ -33970,8 +33410,8 @@ echo "$as_me: WARNING: pangoft2 library not found, library will be compiled with
 else
        PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS
        PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS
 else
        PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS
        PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                     CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
                     CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
 
                     CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
                     CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"


@@ -33980,8 +33420,8 @@ echo "${ECHO_T}yes" >&6; }
 fi
 
 pkg_failed=no
 fi
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for PANGOXFT" >&5
-echo $ECHO_N "checking for PANGOXFT... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for PANGOXFT" >&5
+echo $ECHO_N "checking for PANGOXFT... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$PANGOXFT_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$PANGOXFT_CFLAGS"; then


@@ -34051,8 +33491,8 @@ echo "$as_me: WARNING: pangoxft library not found, library will be compiled with
 else
        PANGOXFT_CFLAGS=$pkg_cv_PANGOXFT_CFLAGS
        PANGOXFT_LIBS=$pkg_cv_PANGOXFT_LIBS
 else
        PANGOXFT_CFLAGS=$pkg_cv_PANGOXFT_CFLAGS
        PANGOXFT_LIBS=$pkg_cv_PANGOXFT_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                     cat >>confdefs.h <<\_ACEOF
 #define HAVE_PANGO_XFT 1
 
                     cat >>confdefs.h <<\_ACEOF
 #define HAVE_PANGO_XFT 1


@@ -34069,9 +33509,9 @@ fi
 for ac_func in pango_font_family_is_monospace
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in pango_font_family_is_monospace
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -34097,60 +33537,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -34177,8 +33625,8 @@ done
     fi
 
     if test "$wxUSE_MOTIF" = 1; then
     fi
 
     if test "$wxUSE_MOTIF" = 1; then

-        { echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5
-echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5
+echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6

 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include;
 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include;


@@ -34190,8 +33638,8 @@ for ac_dir in $SEARCH_INCLUDE /usr/include;
   done
 
         if test "$ac_find_includes" != "" ; then
   done
 
         if test "$ac_find_includes" != "" ; then

-            { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
-echo "${ECHO_T}found in $ac_find_includes" >&6; }
+            echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
+echo "${ECHO_T}found in $ac_find_includes" >&6

 
     if test "x$ac_find_includes" = "x/usr/include"; then
     ac_path_to_include=""
 
     if test "x$ac_find_includes" = "x/usr/include"; then
     ac_path_to_include=""


@@ -34231,25 +33679,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
 

-                    { echo "$as_me:$LINENO: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6; }
+                    echo "$as_me:$LINENO: result: found in default search path" >&5
+echo "${ECHO_T}found in default search path" >&6

                     COMPILED_X_PROGRAM=1
 
 else
                     COMPILED_X_PROGRAM=1
 
 else


@@ -34257,23 +33710,22 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                     { { echo "$as_me:$LINENO: error: please set CPPFLAGS to contain the location of Xm/Xm.h" >&5
 echo "$as_me: error: please set CPPFLAGS to contain the location of Xm/Xm.h" >&2;}
    { (exit 1); exit 1; }; }
 
 
 fi
                     { { echo "$as_me:$LINENO: error: please set CPPFLAGS to contain the location of Xm/Xm.h" >&5
 echo "$as_me: error: please set CPPFLAGS to contain the location of Xm/Xm.h" >&2;}
    { (exit 1); exit 1; }; }
 
 
 fi

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

 
             CFLAGS=$save_CFLAGS
         fi
 
 
 
             CFLAGS=$save_CFLAGS
         fi
 
 

-        { echo "$as_me:$LINENO: checking for Motif/Lesstif library" >&5
-echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for Motif/Lesstif library" >&5
+echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -34288,8 +33740,8 @@ echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; }
 
 
         if test "x$ac_find_libraries" != "x" ; then
 
 
         if test "x$ac_find_libraries" != "x" ; then

-            { echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
-echo "${ECHO_T}found in $ac_find_libraries" >&6; }
+            echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
+echo "${ECHO_T}found in $ac_find_libraries" >&6

 
 
     if test "$ac_find_libraries" = "default location"; then
 
 
     if test "$ac_find_libraries" = "default location"; then


@@ -34332,26 +33784,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
 

-                    { echo "$as_me:$LINENO: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6; }
+                    echo "$as_me:$LINENO: result: found in default search path" >&5
+echo "${ECHO_T}found in default search path" >&6

                     COMPILED_X_PROGRAM=1
 
 else
                     COMPILED_X_PROGRAM=1
 
 else


@@ -34359,24 +33815,23 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                     { { echo "$as_me:$LINENO: error: please set LDFLAGS to contain the location of libXm" >&5
 echo "$as_me: error: please set LDFLAGS to contain the location of libXm" >&2;}
    { (exit 1); exit 1; }; }
 
 
 fi
                     { { echo "$as_me:$LINENO: error: please set LDFLAGS to contain the location of libXm" >&5
 echo "$as_me: error: please set LDFLAGS to contain the location of libXm" >&2;}
    { (exit 1); exit 1; }; }
 
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
             CFLAGS=$save_CFLAGS
             LIBS="$save_LIBS"
         fi
 
       conftest$ac_exeext conftest.$ac_ext
 
             CFLAGS=$save_CFLAGS
             LIBS="$save_LIBS"
         fi
 

-        { echo "$as_me:$LINENO: checking if we need -lXp and/or -lSM -lICE" >&5
-echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking if we need -lXp and/or -lSM -lICE" >&5
+echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6

         libp_link=""
         libsm_ice_link=""
         libs_found=0
         libp_link=""
         libsm_ice_link=""
         libs_found=0


@@ -34413,28 +33868,32 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                                 libp_link="$libp"
                                 libsm_ice_link="$libsm_ice"
 
                                 libp_link="$libp"
                                 libsm_ice_link="$libsm_ice"

-                                { echo "$as_me:$LINENO: result: need${libp_link}${libsm_ice_link}" >&5
-echo "${ECHO_T}need${libp_link}${libsm_ice_link}" >&6; }
+                                echo "$as_me:$LINENO: result: need${libp_link}${libsm_ice_link}" >&5
+echo "${ECHO_T}need${libp_link}${libsm_ice_link}" >&6

                                 libs_found=1
 
 else
                                 libs_found=1
 
 else


@@ -34444,8 +33903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
                         LIBS="$save_LIBS"
       conftest$ac_exeext conftest.$ac_ext
 
                         LIBS="$save_LIBS"


@@ -34456,15 +33914,15 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
         done
 
         if test "$libs_found" = "0"; then
         done
 
         if test "$libs_found" = "0"; then

-            { echo "$as_me:$LINENO: result: can't find the right libraries" >&5
-echo "${ECHO_T}can't find the right libraries" >&6; }
+            echo "$as_me:$LINENO: result: can't find the right libraries" >&5
+echo "${ECHO_T}can't find the right libraries" >&6

             { { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5
 echo "$as_me: error: can't link a simple motif program" >&2;}
    { (exit 1); exit 1; }; }
         fi
 
             { { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5
 echo "$as_me: error: can't link a simple motif program" >&2;}
    { (exit 1); exit 1; }; }
         fi
 

-                        { echo "$as_me:$LINENO: checking for SgCreateList in -lSgm" >&5
-echo $ECHO_N "checking for SgCreateList in -lSgm... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking for SgCreateList in -lSgm" >&5
+echo $ECHO_N "checking for SgCreateList in -lSgm... $ECHO_C" >&6

 if test "${ac_cv_lib_Sgm_SgCreateList+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_Sgm_SgCreateList+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -34477,53 +33935,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char SgCreateList ();
 int
 main ()
 {
 char SgCreateList ();
 int
 main ()
 {

-return SgCreateList ();
+SgCreateList ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_Sgm_SgCreateList=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_Sgm_SgCreateList=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_Sgm_SgCreateList=no
+ac_cv_lib_Sgm_SgCreateList=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Sgm_SgCreateList" >&5
-echo "${ECHO_T}$ac_cv_lib_Sgm_SgCreateList" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_Sgm_SgCreateList" >&5
+echo "${ECHO_T}$ac_cv_lib_Sgm_SgCreateList" >&6

 if test $ac_cv_lib_Sgm_SgCreateList = yes; then
   libsgm_link=" -lSgm"
 fi
 if test $ac_cv_lib_Sgm_SgCreateList = yes; then
   libsgm_link=" -lSgm"
 fi


@@ -34532,8 +33993,8 @@ fi
         save_CFLAGS=$CFLAGS
         CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
 
         save_CFLAGS=$CFLAGS
         CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
 

-        { echo "$as_me:$LINENO: checking for Motif 2" >&5
-echo $ECHO_N "checking for Motif 2... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for Motif 2" >&5
+echo $ECHO_N "checking for Motif 2... $ECHO_C" >&6

 if test "${wx_cv_lib_motif2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_lib_motif2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -34559,34 +34020,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_lib_motif2="yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_lib_motif2="yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_lib_motif2="no"
+wx_cv_lib_motif2="no"

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_lib_motif2" >&5
-echo "${ECHO_T}$wx_cv_lib_motif2" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_lib_motif2" >&5
+echo "${ECHO_T}$wx_cv_lib_motif2" >&6

         if test "$wx_cv_lib_motif2" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 #define __WXMOTIF20__ 1
         if test "$wx_cv_lib_motif2" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 #define __WXMOTIF20__ 1


@@ -34599,8 +34064,8 @@ _ACEOF
 
         fi
 
 
         fi
 

-        { echo "$as_me:$LINENO: checking whether Motif is Lesstif" >&5
-echo $ECHO_N "checking whether Motif is Lesstif... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking whether Motif is Lesstif" >&5
+echo $ECHO_N "checking whether Motif is Lesstif... $ECHO_C" >&6

 if test "${wx_cv_lib_lesstif+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_lib_lesstif+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -34626,35 +34091,39 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_lib_lesstif="yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_lib_lesstif="yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_lib_lesstif="no"
+wx_cv_lib_lesstif="no"

 fi
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_lib_lesstif" >&5
-echo "${ECHO_T}$wx_cv_lib_lesstif" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_lib_lesstif" >&5
+echo "${ECHO_T}$wx_cv_lib_lesstif" >&6

         if test "$wx_cv_lib_lesstif" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 #define __WXLESSTIF__ 1
         if test "$wx_cv_lib_lesstif" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 #define __WXLESSTIF__ 1


@@ -34676,8 +34145,8 @@ _ACEOF
 
         if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
                 if test "$wxUSE_LIBXPM" = "sys"; then
 
         if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
                 if test "$wxUSE_LIBXPM" = "sys"; then

-            { echo "$as_me:$LINENO: checking for Xpm library" >&5
-echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for Xpm library" >&5
+echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -34705,11 +34174,11 @@ echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; }
   fi
 
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
   fi
 
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"

-                { echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
-echo "${ECHO_T}found in $ac_find_libraries" >&6; }
+                echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
+echo "${ECHO_T}found in $ac_find_libraries" >&6

 
 

-                { echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
-echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
+echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6

 if test "${wx_cv_x11_xpm_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_x11_xpm_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -34738,39 +34207,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_x11_xpm_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_x11_xpm_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_x11_xpm_h=no
+wx_cv_x11_xpm_h=no

 
 fi
 
 fi

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

 
                         CFLAGS=$save_CFLAGS
 
 
 fi
 
                         CFLAGS=$save_CFLAGS
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_x11_xpm_h" >&5
-echo "${ECHO_T}$wx_cv_x11_xpm_h" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_x11_xpm_h" >&5
+echo "${ECHO_T}$wx_cv_x11_xpm_h" >&6

 
                 if test $wx_cv_x11_xpm_h = "yes"; then
                     GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm"
 
                 if test $wx_cv_x11_xpm_h = "yes"; then
                     GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm"


@@ -34786,8 +34259,8 @@ echo "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2;}
 
         fi
 
 
         fi
 

-                { echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
-echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
+echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6

 if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -34800,53 +34273,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char XShapeQueryExtension ();
 int
 main ()
 {
 char XShapeQueryExtension ();
 int
 main ()
 {

-return XShapeQueryExtension ();
+XShapeQueryExtension ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_Xext_XShapeQueryExtension=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_Xext_XShapeQueryExtension=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_Xext_XShapeQueryExtension=no
+ac_cv_lib_Xext_XShapeQueryExtension=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6

 if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
 
                       GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
 if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
 
                       GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"


@@ -34859,8 +34335,8 @@ fi
             save_CFLAGS="$CFLAGS"
             CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
 
             save_CFLAGS="$CFLAGS"
             CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
 

-            { echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
-echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
+echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6

             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -34884,60 +34360,64 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                             cat >>confdefs.h <<\_ACEOF
 #define HAVE_XSHAPE 1
 _ACEOF
 
 
                             cat >>confdefs.h <<\_ACEOF
 #define HAVE_XSHAPE 1
 _ACEOF
 

-                            { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
+                            echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6

 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+                            echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

 
 fi
 
 fi

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

             CFLAGS="$save_CFLAGS"
 
         fi
     fi
 
     if test "$wxUSE_MAC" = 1; then
             CFLAGS="$save_CFLAGS"
 
         fi
     fi
 
     if test "$wxUSE_MAC" = 1; then

-        { echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
-echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
+echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6

         if test "$GCC" = yes; then
         if test "$GCC" = yes; then

-            { echo "$as_me:$LINENO: result: gcc" >&5
-echo "${ECHO_T}gcc" >&6; }
+            echo "$as_me:$LINENO: result: gcc" >&5
+echo "${ECHO_T}gcc" >&6

             CPPFLAGS_PASCAL="-fpascal-strings"
         elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then
             CPPFLAGS_PASCAL="-fpascal-strings"
         elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then

-            { echo "$as_me:$LINENO: result: xlc" >&5
-echo "${ECHO_T}xlc" >&6; }
+            echo "$as_me:$LINENO: result: xlc" >&5
+echo "${ECHO_T}xlc" >&6

             CPPFLAGS_PASCAL="-qmacpstr"
         else
             CPPFLAGS_PASCAL="-qmacpstr"
         else

-            { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+            echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6

         fi
 
         if test "x$wxUSE_UNIX" = "xyes"; then
         fi
 
         if test "x$wxUSE_UNIX" = "xyes"; then


@@ -34959,8 +34439,8 @@ echo "${ECHO_T}none" >&6; }
     if test "$wxUSE_PM" = 1; then
         TOOLKIT=PM
         GUIDIST=PM_DIST
     if test "$wxUSE_PM" = 1; then
         TOOLKIT=PM
         GUIDIST=PM_DIST

-        { echo "$as_me:$LINENO: checking for type SPBCDATA" >&5
-echo $ECHO_N "checking for type SPBCDATA... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for type SPBCDATA" >&5
+echo $ECHO_N "checking for type SPBCDATA... $ECHO_C" >&6

 if test "${wx_cv_spbcdata+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_spbcdata+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -34986,37 +34466,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_spbcdata=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_spbcdata=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_spbcdata=no
+wx_cv_spbcdata=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_spbcdata" >&5
-echo "${ECHO_T}$wx_cv_spbcdata" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_spbcdata" >&5
+echo "${ECHO_T}$wx_cv_spbcdata" >&6

 
         if test $wx_cv_spbcdata = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test $wx_cv_spbcdata = "yes"; then
             cat >>confdefs.h <<\_ACEOF


@@ -35055,9 +34539,7 @@ fi
 
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
 
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then

-    if test "$TOOLKIT" = "DFB" ; then
-        wxUSE_UNICODE_UTF8=yes
-    elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then
+    if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then

         wxUSE_UNICODE_UTF8=yes
     elif test "$USE_OS2" = "1" ; then
                                 wxUSE_UNICODE_UTF8=yes
         wxUSE_UNICODE_UTF8=yes
     elif test "$USE_OS2" = "1" ; then
                                 wxUSE_UNICODE_UTF8=yes


@@ -35073,9 +34555,9 @@ if test "$wxUSE_GUI" = "yes"; then
 for ac_header in X11/Xlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in X11/Xlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -35089,35 +34571,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -35131,9 +34616,9 @@ done
 for ac_header in X11/XKBlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in X11/XKBlib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -35151,35 +34636,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -35201,8 +34689,8 @@ if test "$TOOLKIT" != "MSW" ; then
 
     if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
 
 
     if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
 

-        { echo "$as_me:$LINENO: checking for sql.h" >&5
-echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for sql.h" >&5
+echo $ECHO_N "checking for sql.h... $ECHO_C" >&6

 if test "${ac_cv_header_sql_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_sql_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -35217,42 +34705,46 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sql.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <sql.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_sql_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_sql_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_sql_h=no
+ac_cv_header_sql_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
-echo "${ECHO_T}$ac_cv_header_sql_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
+echo "${ECHO_T}$ac_cv_header_sql_h" >&6

 if test $ac_cv_header_sql_h = yes; then
   found_sql_h=1
 fi
 
 
         if test "x$found_sql_h" = "x1" ; then
 if test $ac_cv_header_sql_h = yes; then
   found_sql_h=1
 fi
 
 
         if test "x$found_sql_h" = "x1" ; then

-            { echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6

 if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -35265,59 +34757,62 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char SQLAllocEnv ();
 int
 main ()
 {
 char SQLAllocEnv ();
 int
 main ()
 {

-return SQLAllocEnv ();
+SQLAllocEnv ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_iodbc_SQLAllocEnv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_iodbc_SQLAllocEnv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_iodbc_SQLAllocEnv=no
+ac_cv_lib_iodbc_SQLAllocEnv=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6

 if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then
   ODBC_LINK=" -liodbc"
 else
 
 if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then
   ODBC_LINK=" -liodbc"
 else
 

-                { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6

 if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -35330,59 +34825,62 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char SQLAllocEnv ();
 int
 main ()
 {
 char SQLAllocEnv ();
 int
 main ()
 {

-return SQLAllocEnv ();
+SQLAllocEnv ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_unixodbc_SQLAllocEnv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_unixodbc_SQLAllocEnv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_unixodbc_SQLAllocEnv=no
+ac_cv_lib_unixodbc_SQLAllocEnv=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6

 if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
   ODBC_LINK=" -lunixodbc"
 else
 
 if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
   ODBC_LINK=" -lunixodbc"
 else
 

-                    { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6; }
+                    echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6

 if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -35395,53 +34893,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char SQLAllocEnv ();
 int
 main ()
 {
 char SQLAllocEnv ();
 int
 main ()
 {

-return SQLAllocEnv ();
+SQLAllocEnv ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_odbc_SQLAllocEnv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_odbc_SQLAllocEnv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_odbc_SQLAllocEnv=no
+ac_cv_lib_odbc_SQLAllocEnv=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6

 if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
   ODBC_LINK=" -lodbc"
 fi
 if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
   ODBC_LINK=" -lodbc"
 fi


@@ -35489,8 +34990,8 @@ fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
 
 if test "$wxUSE_DISPLAY" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then

-        { echo "$as_me:$LINENO: checking for Xinerama" >&5
-echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for Xinerama" >&5
+echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -35521,11 +35022,11 @@ echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; }
                 LDFLAGS="$LDFLAGS $ac_path_to_link"
             fi
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
                 LDFLAGS="$LDFLAGS $ac_path_to_link"
             fi
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
 

-            { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
-echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
+echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -35539,15 +35040,15 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
   done
 
             if test "$ac_find_libraries" != "" ; then
   done
 
             if test "$ac_find_libraries" != "" ; then

-                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
 for ac_header in X11/extensions/xf86vmode.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 for ac_header in X11/extensions/xf86vmode.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -35565,35 +35066,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -35606,20 +35110,20 @@ fi
 done
 
             else
 done
 
             else

-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

             fi
 
         else
             fi
 
         else

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

             { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5
 echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;}
             wxUSE_DISPLAY="no"
         fi
     elif test "$wxUSE_MSW" = 1; then
             { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5
 echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;}
             wxUSE_DISPLAY="no"
         fi
     elif test "$wxUSE_MSW" = 1; then

-        { echo "$as_me:$LINENO: checking for ddraw.h" >&5
-echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for ddraw.h" >&5
+echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6

 if test "${ac_cv_header_ddraw_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_ddraw_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -35634,34 +35138,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <ddraw.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <ddraw.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_ddraw_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_ddraw_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_ddraw_h=no
+ac_cv_header_ddraw_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5
-echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5
+echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6

 
 
     fi
 
 
     fi


@@ -35669,8 +35177,8 @@ fi
 
 if test "$wxUSE_DETECT_SM" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
 
 if test "$wxUSE_DETECT_SM" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then

-        { echo "$as_me:$LINENO: checking for -lSM - X11 session management" >&5
-echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for -lSM - X11 session management" >&5
+echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -35701,11 +35209,11 @@ echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; }
                 LDFLAGS="$LDFLAGS $ac_path_to_link"
             fi
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
                 LDFLAGS="$LDFLAGS $ac_path_to_link"
             fi
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"

-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

         else
         else

-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

             { echo "$as_me:$LINENO: WARNING: libSM not found; disabling session management detection" >&5
 echo "$as_me: WARNING: libSM not found; disabling session management detection" >&2;}
             wxUSE_DETECT_SM="no"
             { echo "$as_me:$LINENO: WARNING: libSM not found; disabling session management detection" >&5
 echo "$as_me: WARNING: libSM not found; disabling session management detection" >&2;}
             wxUSE_DETECT_SM="no"


@@ -35728,8 +35236,8 @@ echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
     else
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
     else

-                        { echo "$as_me:$LINENO: checking for OpenGL headers" >&5
-echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking for OpenGL headers" >&5
+echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6

 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;
 
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;


@@ -35741,8 +35249,8 @@ for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;
   done
 
         if test "$ac_find_includes" != "" ; then
   done
 
         if test "$ac_find_includes" != "" ; then

-            { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
-echo "${ECHO_T}found in $ac_find_includes" >&6; }
+            echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
+echo "${ECHO_T}found in $ac_find_includes" >&6

 
     if test "x$ac_find_includes" = "x/usr/include"; then
     ac_path_to_include=""
 
     if test "x$ac_find_includes" = "x/usr/include"; then
     ac_path_to_include=""


@@ -35758,12 +35266,12 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
 
             CPPFLAGS="$ac_path_to_include $CPPFLAGS"
         else
 
             CPPFLAGS="$ac_path_to_include $CPPFLAGS"
         else

-            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+            echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

         fi
 
         fi
 

-        { echo "$as_me:$LINENO: checking for GL/gl.h" >&5
-echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6

 if test "${ac_cv_header_GL_gl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_GL_gl_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -35778,38 +35286,42 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <GL/gl.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <GL/gl.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_GL_gl_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_GL_gl_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_GL_gl_h=no
+ac_cv_header_GL_gl_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6

 if test $ac_cv_header_GL_gl_h = yes; then
 
 if test $ac_cv_header_GL_gl_h = yes; then
 

-            { echo "$as_me:$LINENO: checking for GL/glu.h" >&5
-echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for GL/glu.h" >&5
+echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6

 if test "${ac_cv_header_GL_glu_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_GL_glu_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -35824,40 +35336,44 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <GL/glu.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <GL/glu.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_GL_glu_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_GL_glu_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_GL_glu_h=no
+ac_cv_header_GL_glu_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6

 if test $ac_cv_header_GL_glu_h = yes; then
 
                 found_gl=0
 
 if test $ac_cv_header_GL_glu_h = yes; then
 
                 found_gl=0
 

-                { echo "$as_me:$LINENO: checking for -lGL" >&5
-echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for -lGL" >&5
+echo $ECHO_N "checking for -lGL... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib;


@@ -35871,8 +35387,8 @@ echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
   done
 
                 if test "$ac_find_libraries" != "" ; then
   done
 
                 if test "$ac_find_libraries" != "" ; then

-                    { echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
-echo "${ECHO_T}found in $ac_find_libraries" >&6; }
+                    echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
+echo "${ECHO_T}found in $ac_find_libraries" >&6

 
 
     if test "$ac_find_libraries" = "default location"; then
 
 
     if test "$ac_find_libraries" = "default location"; then


@@ -35891,8 +35407,8 @@ echo "${ECHO_T}found in $ac_find_libraries" >&6; }
                         LDFLAGS_GL="$ac_path_to_link"
                     fi
 
                         LDFLAGS_GL="$ac_path_to_link"
                     fi
 

-                                                                                { echo "$as_me:$LINENO: checking for -lGLU" >&5
-echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; }
+                                                                                echo "$as_me:$LINENO: checking for -lGLU" >&5
+echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -35926,20 +35442,20 @@ echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; }
 
                         found_gl=1
                         OPENGL_LIBS="-lGL -lGLU"
 
                         found_gl=1
                         OPENGL_LIBS="-lGL -lGLU"

-                        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                     else
                     else

-                        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                     fi
                 else
                     fi
                 else

-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                 fi
 
                 if test "$found_gl" != 1; then
                 fi
 
                 if test "$found_gl" != 1; then

-                    { echo "$as_me:$LINENO: checking for -lMesaGL" >&5
-echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; }
+                    echo "$as_me:$LINENO: checking for -lMesaGL" >&5
+echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6

 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;
 
   ac_find_libraries=
   for ac_dir in $SEARCH_LIB;


@@ -35968,11 +35484,11 @@ echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; }
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
                         OPENGL_LIBS="-lMesaGL -lMesaGLU"
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
                         OPENGL_LIBS="-lMesaGL -lMesaGLU"

-                        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                     else
                     else

-                        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                     fi
                 fi
 
                     fi
                 fi
 


@@ -36031,8 +35547,8 @@ if test "$wxUSE_SHARED" = "yes"; then
             ;;
 
         *)
             ;;
 
         *)

-            { echo "$as_me:$LINENO: checking if the linker accepts --version-script" >&5
-echo $ECHO_N "checking if the linker accepts --version-script... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking if the linker accepts --version-script" >&5
+echo $ECHO_N "checking if the linker accepts --version-script... $ECHO_C" >&6

 if test "${wx_cv_version_script+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_version_script+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -36100,8 +35616,8 @@ else
                 rm -f conftest1.output conftest2.output conftest3.output
 
 fi
                 rm -f conftest1.output conftest2.output conftest3.output
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_version_script" >&5
-echo "${ECHO_T}$wx_cv_version_script" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_version_script" >&5
+echo "${ECHO_T}$wx_cv_version_script" >&6

 
             if test $wx_cv_version_script = yes ; then
                 LDFLAGS_VERSIONING="-Wl,--version-script,\$(wx_top_builddir)/version-script"
 
             if test $wx_cv_version_script = yes ; then
                 LDFLAGS_VERSIONING="-Wl,--version-script,\$(wx_top_builddir)/version-script"


@@ -36116,15 +35632,15 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; }
   if test -n "$GCC"; then
     CFLAGS_VISIBILITY="-fvisibility=hidden"
     CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"
   if test -n "$GCC"; then
     CFLAGS_VISIBILITY="-fvisibility=hidden"
     CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"

-    { echo "$as_me:$LINENO: checking for symbols visibility support" >&5
-echo $ECHO_N "checking for symbols visibility support... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for symbols visibility support" >&5
+echo $ECHO_N "checking for symbols visibility support... $ECHO_C" >&6

     if test "${wx_cv_cc_visibility+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       wx_save_CXXFLAGS="$CXXFLAGS"
       CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
     if test "${wx_cv_cc_visibility+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       wx_save_CXXFLAGS="$CXXFLAGS"
       CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"

-      ac_ext=cpp
+      ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -36143,6 +35659,11 @@ cat >>conftest.$ac_ext <<_ACEOF
          error this gcc is too old;
          #endif
 
          error this gcc is too old;
          #endif
 

+         /* visibility only makes sense for ELF shared libs: */
+         #if !defined(__ELF__) && !defined(__APPLE__)
+         error this platform has no visibility;
+         #endif
+

          extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
          extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
          extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
          extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);


@@ -36160,31 +35681,35 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_cc_visibility=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_cc_visibility=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_cc_visibility=no
+wx_cv_cc_visibility=no

 fi
 fi

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

       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -36194,23 +35719,25 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
       CXXFLAGS="$wx_save_CXXFLAGS"
 fi
 
       CXXFLAGS="$wx_save_CXXFLAGS"
 fi
 

-    { echo "$as_me:$LINENO: result: $wx_cv_cc_visibility" >&5
-echo "${ECHO_T}$wx_cv_cc_visibility" >&6; }
+    echo "$as_me:$LINENO: result: $wx_cv_cc_visibility" >&5
+echo "${ECHO_T}$wx_cv_cc_visibility" >&6

     if test $wx_cv_cc_visibility = yes; then
       cat >>confdefs.h <<\_ACEOF
 #define HAVE_VISIBILITY 1
 _ACEOF
 
 
     if test $wx_cv_cc_visibility = yes; then
       cat >>confdefs.h <<\_ACEOF
 #define HAVE_VISIBILITY 1
 _ACEOF
 
 

-                  { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5
-echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6; }
+                  echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5
+echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6

       if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         wx_save_CXXFLAGS="$CXXFLAGS"
       if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         wx_save_CXXFLAGS="$CXXFLAGS"

+        wx_save_LDFLAGS="$LDFLAGS"

         CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
         CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"

-        ac_ext=cpp
+        LDFLAGS="$LDFLAGS -shared -fPIC"
+        ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -36229,39 +35756,43 @@ int
 main ()
 {
 
 main ()
 {
 

-            std::string x;
+            std::string s("hello");
+            return s.length();

 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_cc_broken_libstdcxx_visibility=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_cc_broken_libstdcxx_visibility=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_cc_broken_libstdcxx_visibility=yes
+wx_cv_cc_broken_libstdcxx_visibility=yes

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
       conftest$ac_exeext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'


@@ -36270,10 +35801,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
         CXXFLAGS="$wx_save_CXXFLAGS"
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
         CXXFLAGS="$wx_save_CXXFLAGS"

+        LDFLAGS="$wx_save_LDFLAGS"

 fi
 
 fi
 

-      { echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5
-echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6; }
+      echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5
+echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6

       if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
         cat >>confdefs.h <<\_ACEOF
 #define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1
       if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
         cat >>confdefs.h <<\_ACEOF
 #define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1


@@ -36307,8 +35839,8 @@ _ACEOF
 
                         saveLdflags="$LDFLAGS"
         LDFLAGS="$saveLdflags -Wl,-rpath,/"
 
                         saveLdflags="$LDFLAGS"
         LDFLAGS="$saveLdflags -Wl,-rpath,/"

-        { echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5
-echo $ECHO_N "checking if the linker accepts -rpath... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5
+echo $ECHO_N "checking if the linker accepts -rpath... $ECHO_C" >&6

         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -36325,26 +35857,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
 

-                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                 SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
                 WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
 
                 SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
                 WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
 


@@ -36353,10 +35889,10 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                { echo "$as_me:$LINENO: checking if the linker accepts -R" >&5
-echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+                echo "$as_me:$LINENO: checking if the linker accepts -R" >&5
+echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6

                 LDFLAGS="$saveLdflags -Wl,-R,/"
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
                 LDFLAGS="$saveLdflags -Wl,-R,/"
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */


@@ -36374,26 +35910,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
 

-                        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                         SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
                         WXCONFIG_RPATH="-Wl,-R,\$libdir"
 
                         SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
                         WXCONFIG_RPATH="-Wl,-R,\$libdir"
 


@@ -36402,17 +35942,15 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 
 fi
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$saveLdflags"
       ;;
       conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$saveLdflags"
       ;;


@@ -36511,6 +36049,7 @@ fi
 
 if test "$wxUSE_COCOA" = 1; then
 
 
 if test "$wxUSE_COCOA" = 1; then
 

+

     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -36519,8 +36058,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_ext=m
 
 
 ac_ext=m
 

-    { echo "$as_me:$LINENO: checking if AppKit/NSEvent.h conflicts with CoreFoundation" >&5
-echo $ECHO_N "checking if AppKit/NSEvent.h conflicts with CoreFoundation... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if AppKit/NSEvent.h conflicts with CoreFoundation" >&5
+echo $ECHO_N "checking if AppKit/NSEvent.h conflicts with CoreFoundation... $ECHO_C" >&6

     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -36539,32 +36078,37 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-        { echo "$as_me:$LINENO: checking if defining __Point__ will fix it" >&5
-echo $ECHO_N "checking if defining __Point__ will fix it... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+        echo "$as_me:$LINENO: checking if defining __Point__ will fix it" >&5
+echo $ECHO_N "checking if defining __Point__ will fix it... $ECHO_C" >&6

         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -36584,24 +36128,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

             cat >>confdefs.h <<\_ACEOF
 #define __Point__ 1
 _ACEOF
             cat >>confdefs.h <<\_ACEOF
 #define __Point__ 1
 _ACEOF


@@ -36611,19 +36160,17 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { { echo "$as_me:$LINENO: error: no
+{ { echo "$as_me:$LINENO: error: no

 See \`config.log' for more details." >&5
 echo "$as_me: error: no
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 See \`config.log' for more details." >&5
 echo "$as_me: error: no
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 fi

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

 
 fi
 
 fi

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

     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -36632,157 +36179,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
 
 
 fi
 

-if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
-            WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
-    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
-
-        LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"

 
 

-    # Extract the first word of "Rez", so it can be a program name with args.
-set dummy Rez; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_REZ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$REZ"; then
-  ac_cv_prog_REZ="$REZ" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_REZ="Rez"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
-fi
-fi
-REZ=$ac_cv_prog_REZ
-if test -n "$REZ"; then
-  { echo "$as_me:$LINENO: result: $REZ" >&5
-echo "${ECHO_T}$REZ" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    # Extract the first word of "DeRez", so it can be a program name with args.
-set dummy DeRez; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DEREZ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DEREZ"; then
-  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DEREZ="DeRez"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
-fi
-fi
-DEREZ=$ac_cv_prog_DEREZ
-if test -n "$DEREZ"; then
-  { echo "$as_me:$LINENO: result: $DEREZ" >&5
-echo "${ECHO_T}$DEREZ" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    # Extract the first word of "SetFile", so it can be a program name with args.
-set dummy SetFile; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_SETFILE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$SETFILE"; then
-  ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_SETFILE="SetFile"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
-fi
-fi
-SETFILE=$ac_cv_prog_SETFILE
-if test -n "$SETFILE"; then
-  { echo "$as_me:$LINENO: result: $SETFILE" >&5
-echo "${ECHO_T}$SETFILE" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
-    MACSETFILE="\$(SETFILE)"
-
-            if test "$wxUSE_MAC" = 1; then
-        POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
-        RESCOMP="$REZ"
-        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
-    else
-        POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
-        RESCOMP="cat /dev/null \| $REZ"
-        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
-    fi
-
-else
-        MACSETFILE="@true"
-
-    if test "$wxUSE_PM" = 1; then
-        RESCOMP="emxbind"
-        WXCONFIG_RESFLAGS="-ep"
-
-                POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
-    else
-        POSTLINK_COMMAND="@true"
-    fi
-
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for mode_t" >&5
+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6

 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_mode_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -36793,47 +36192,50 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef mode_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((mode_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (mode_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_mode_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_mode_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_mode_t=no
+ac_cv_type_mode_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+echo "${ECHO_T}$ac_cv_type_mode_t" >&6

 if test $ac_cv_type_mode_t = yes; then
   :
 else
 if test $ac_cv_type_mode_t = yes; then
   :
 else


@@ -36844,8 +36246,8 @@ _ACEOF
 
 fi
 
 
 fi
 

-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6

 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -36856,59 +36258,62 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef off_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((off_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (off_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_off_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_off_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_off_t=no
+ac_cv_type_off_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6

 if test $ac_cv_type_off_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_type_off_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF

-#define off_t long int
+#define off_t long

 _ACEOF
 
 fi
 
 _ACEOF
 
 fi
 

-{ echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6

 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_pid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -36919,47 +36324,50 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef pid_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((pid_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (pid_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_pid_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_pid_t=no
+ac_cv_type_pid_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+echo "${ECHO_T}$ac_cv_type_pid_t" >&6

 if test $ac_cv_type_pid_t = yes; then
   :
 else
 if test $ac_cv_type_pid_t = yes; then
   :
 else


@@ -36970,8 +36378,8 @@ _ACEOF
 
 fi
 
 
 fi
 

-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6

 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -36982,59 +36390,62 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef size_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((size_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (size_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_size_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_size_t=no
+ac_cv_type_size_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6

 if test $ac_cv_type_size_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_type_size_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF

-#define size_t unsigned int
+#define size_t unsigned

 _ACEOF
 
 fi
 
 _ACEOF
 
 fi
 

-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6

 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_uid_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37056,8 +36467,8 @@ fi
 rm -f conftest*
 
 fi
 rm -f conftest*
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+echo "${ECHO_T}$ac_cv_type_uid_t" >&6

 if test $ac_cv_type_uid_t = no; then
 
 cat >>confdefs.h <<\_ACEOF
 if test $ac_cv_type_uid_t = no; then
 
 cat >>confdefs.h <<\_ACEOF


@@ -37072,8 +36483,8 @@ _ACEOF
 fi
 
 
 fi
 
 

-{ echo "$as_me:$LINENO: checking for ssize_t" >&5
-echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for ssize_t" >&5
+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6

 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37084,47 +36495,50 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default

-typedef ssize_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((ssize_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (ssize_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_ssize_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_ssize_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_ssize_t=no
+ac_cv_type_ssize_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+echo "${ECHO_T}$ac_cv_type_ssize_t" >&6

 if test $ac_cv_type_ssize_t = yes; then
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_type_ssize_t = yes; then
 
 cat >>confdefs.h <<_ACEOF


@@ -37135,13 +36549,13 @@ _ACEOF
 fi
 
 
 fi
 
 

-ac_ext=cpp
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

- { echo "$as_me:$LINENO: checking if size_t is unsigned int" >&5
-echo $ECHO_N "checking if size_t is unsigned int... $ECHO_C" >&6; }
+ echo "$as_me:$LINENO: checking if size_t is unsigned int" >&5
+echo $ECHO_N "checking if size_t is unsigned int... $ECHO_C" >&6

 if test "${wx_cv_size_t_is_uint+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_size_t_is_uint+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37168,37 +36582,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_size_t_is_uint=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_size_t_is_uint=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_size_t_is_uint=yes
+wx_cv_size_t_is_uint=yes

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_size_t_is_uint" >&5
-echo "${ECHO_T}$wx_cv_size_t_is_uint" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_size_t_is_uint" >&5
+echo "${ECHO_T}$wx_cv_size_t_is_uint" >&6

 
 if test "$wx_cv_size_t_is_uint" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
 if test "$wx_cv_size_t_is_uint" = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -37206,8 +36624,8 @@ if test "$wx_cv_size_t_is_uint" = "yes"; then
 _ACEOF
 
 else
 _ACEOF
 
 else

-    { echo "$as_me:$LINENO: checking if size_t is unsigned long" >&5
-echo $ECHO_N "checking if size_t is unsigned long... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if size_t is unsigned long" >&5
+echo $ECHO_N "checking if size_t is unsigned long... $ECHO_C" >&6

 if test "${wx_cv_size_t_is_ulong+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_size_t_is_ulong+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37233,36 +36651,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_size_t_is_ulong=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_size_t_is_ulong=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_size_t_is_ulong=yes
+wx_cv_size_t_is_ulong=yes

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_size_t_is_ulong" >&5
-echo "${ECHO_T}$wx_cv_size_t_is_ulong" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_size_t_is_ulong" >&5
+echo "${ECHO_T}$wx_cv_size_t_is_ulong" >&6

 
     if test "$wx_cv_size_t_is_ulong" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 
     if test "$wx_cv_size_t_is_ulong" = "yes"; then
         cat >>confdefs.h <<\_ACEOF


@@ -37272,8 +36694,8 @@ _ACEOF
     fi
 fi
 
     fi
 fi
 

-{ echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5
-echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5
+echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6

 if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37302,36 +36724,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_wchar_t_is_separate_type=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_wchar_t_is_separate_type=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_wchar_t_is_separate_type=no
+wx_cv_wchar_t_is_separate_type=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5
-echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5
+echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6

 
 if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
 if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -37352,8 +36778,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 

-{ echo "$as_me:$LINENO: checking for pw_gecos in struct passwd" >&5
-echo $ECHO_N "checking for pw_gecos in struct passwd... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for pw_gecos in struct passwd" >&5
+echo $ECHO_N "checking for pw_gecos in struct passwd... $ECHO_C" >&6

 if test "${wx_cv_struct_pw_gecos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_struct_pw_gecos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37378,22 +36804,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                 wx_cv_struct_pw_gecos=yes
 
 
                 wx_cv_struct_pw_gecos=yes
 


@@ -37406,13 +36837,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_struct_pw_gecos" >&5
-echo "${ECHO_T}$wx_cv_struct_pw_gecos" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_struct_pw_gecos" >&5
+echo "${ECHO_T}$wx_cv_struct_pw_gecos" >&6

 
 if test "$wx_cv_struct_pw_gecos" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
 if test "$wx_cv_struct_pw_gecos" = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -37434,9 +36864,9 @@ _ACEOF
 for ac_func in wcslen
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in wcslen
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -37462,60 +36892,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -37527,8 +36965,8 @@ done
 
     if test "$WCSLEN_FOUND" = 0; then
         if test "$TOOLKIT" = "MSW"; then
 
     if test "$WCSLEN_FOUND" = 0; then
         if test "$TOOLKIT" = "MSW"; then

-            { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5
-echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5
+echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6

 if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37541,60 +36979,63 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char wcslen ();
 int
 main ()
 {
 char wcslen ();
 int
 main ()
 {

-return wcslen ();
+wcslen ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_msvcrt_wcslen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_msvcrt_wcslen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_msvcrt_wcslen=no
+ac_cv_lib_msvcrt_wcslen=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_wcslen" >&5
-echo "${ECHO_T}$ac_cv_lib_msvcrt_wcslen" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_wcslen" >&5
+echo "${ECHO_T}$ac_cv_lib_msvcrt_wcslen" >&6

 if test $ac_cv_lib_msvcrt_wcslen = yes; then
   WCHAR_OK=1
 fi
 
         else
 if test $ac_cv_lib_msvcrt_wcslen = yes; then
   WCHAR_OK=1
 fi
 
         else

-            { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5
-echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for wcslen in -lw" >&5
+echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6

 if test "${ac_cv_lib_w_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_w_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37607,53 +37048,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char wcslen ();
 int
 main ()
 {
 char wcslen ();
 int
 main ()
 {

-return wcslen ();
+wcslen ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_w_wcslen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_w_wcslen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_w_wcslen=no
+ac_cv_lib_w_wcslen=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_wcslen" >&5
-echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_w_wcslen" >&5
+echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6

 if test $ac_cv_lib_w_wcslen = yes; then
 
                             WCHAR_LINK=" -lw"
 if test $ac_cv_lib_w_wcslen = yes; then
 
                             WCHAR_LINK=" -lw"


@@ -37675,9 +37119,9 @@ _ACEOF
 for ac_func in wcsdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in wcsdup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -37703,60 +37147,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -37770,8 +37222,8 @@ done
         CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
     fi
 
         CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
     fi
 

-                { echo "$as_me:$LINENO: checking for mbstate_t" >&5
-echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for mbstate_t" >&5
+echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6

 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -37783,47 +37235,50 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <wchar.h>
 
 /* end confdefs.h.  */
 #include <wchar.h>
 

-typedef mbstate_t ac__type_new_;

 int
 main ()
 {
 int
 main ()
 {

-if ((ac__type_new_ *) 0)
+if ((mbstate_t *) 0)

   return 0;
   return 0;

-if (sizeof (ac__type_new_))
+if (sizeof (mbstate_t))

   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
   return 0;
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_mbstate_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_type_mbstate_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_type_mbstate_t=no
+ac_cv_type_mbstate_t=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
-echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
+echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6

 if test $ac_cv_type_mbstate_t = yes; then
 
 cat >>confdefs.h <<_ACEOF
 if test $ac_cv_type_mbstate_t = yes; then
 
 cat >>confdefs.h <<_ACEOF


@@ -37834,9 +37289,9 @@ _ACEOF
 for ac_func in wcsrtombs
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in wcsrtombs
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -37862,60 +37317,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -37936,9 +37399,9 @@ fi
 for ac_func in snprintf vsnprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in snprintf vsnprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -37964,60 +37427,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -38028,8 +37499,8 @@ done
 
 
 if test "$ac_cv_func_vsnprintf" = "yes"; then
 
 
 if test "$ac_cv_func_vsnprintf" = "yes"; then

-        { echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5
-echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5
+echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6

 if test "${wx_cv_func_vsnprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_vsnprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -38063,37 +37534,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_vsnprintf_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_vsnprintf_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_vsnprintf_decl=no
+wx_cv_func_vsnprintf_decl=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_vsnprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_vsnprintf_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_vsnprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_vsnprintf_decl" >&6

 
     if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 
     if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF


@@ -38101,8 +37576,8 @@ echo "${ECHO_T}$wx_cv_func_vsnprintf_decl" >&6; }
 _ACEOF
 
 
 _ACEOF
 
 

-                        { echo "$as_me:$LINENO: checking if vsnprintf declaration is broken" >&5
-echo $ECHO_N "checking if vsnprintf declaration is broken... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking if vsnprintf declaration is broken" >&5
+echo $ECHO_N "checking if vsnprintf declaration is broken... $ECHO_C" >&6

 if test "${wx_cv_func_broken_vsnprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_broken_vsnprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -38137,37 +37612,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_broken_vsnprintf_decl=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_broken_vsnprintf_decl=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_broken_vsnprintf_decl=yes
+wx_cv_func_broken_vsnprintf_decl=yes

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_vsnprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_vsnprintf_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_broken_vsnprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_broken_vsnprintf_decl" >&6

 
         if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF


@@ -38179,8 +37658,8 @@ _ACEOF
 fi
 
 if test "$ac_cv_func_snprintf" = "yes"; then
 fi
 
 if test "$ac_cv_func_snprintf" = "yes"; then

-    { echo "$as_me:$LINENO: checking for snprintf declaration" >&5
-echo $ECHO_N "checking for snprintf declaration... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for snprintf declaration" >&5
+echo $ECHO_N "checking for snprintf declaration... $ECHO_C" >&6

 if test "${wx_cv_func_snprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_snprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -38213,37 +37692,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_snprintf_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_snprintf_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_snprintf_decl=no
+wx_cv_func_snprintf_decl=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6

 
     if test "$wx_cv_func_snprintf_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 
     if test "$wx_cv_func_snprintf_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF


@@ -38251,8 +37734,8 @@ echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
 _ACEOF
 
 
 _ACEOF
 
 

-                        { echo "$as_me:$LINENO: checking if snprintf declaration is broken" >&5
-echo $ECHO_N "checking if snprintf declaration is broken... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking if snprintf declaration is broken" >&5
+echo $ECHO_N "checking if snprintf declaration is broken... $ECHO_C" >&6

 if test "${wx_cv_func_broken_snprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_broken_snprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -38286,37 +37769,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_broken_snprintf_decl=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_broken_snprintf_decl=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_broken_snprintf_decl=yes
+wx_cv_func_broken_snprintf_decl=yes

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_snprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_snprintf_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_broken_snprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_broken_snprintf_decl" >&6

 
         if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF


@@ -38328,8 +37815,8 @@ _ACEOF
 
     if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
 
 
     if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
 

-                                        { echo "$as_me:$LINENO: checking if snprintf supports positional arguments" >&5
-echo $ECHO_N "checking if snprintf supports positional arguments... $ECHO_C" >&6; }
+                                        echo "$as_me:$LINENO: checking if snprintf supports positional arguments" >&5
+echo $ECHO_N "checking if snprintf supports positional arguments... $ECHO_C" >&6

 if test "${wx_cv_func_snprintf_pos_params+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_snprintf_pos_params+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -38364,22 +37851,13 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -38392,15 +37870,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 wx_cv_func_snprintf_pos_params=yes
 fi
 ( exit $ac_status )
 wx_cv_func_snprintf_pos_params=yes
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 
 fi
 
 

-
-

 fi
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_pos_params" >&5
-echo "${ECHO_T}$wx_cv_func_snprintf_pos_params" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_pos_params" >&5
+echo "${ECHO_T}$wx_cv_func_snprintf_pos_params" >&6

 
         if test "$wx_cv_func_snprintf_pos_params" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test "$wx_cv_func_snprintf_pos_params" = "yes"; then
             cat >>confdefs.h <<\_ACEOF


@@ -38417,9 +37893,9 @@ if test "$wxUSE_UNICODE" = yes; then
 for ac_func in swprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in swprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -38445,60 +37921,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -38509,8 +37993,8 @@ done
 
 
     if test "$ac_cv_func_swprintf" = "yes"; then
 
 
     if test "$ac_cv_func_swprintf" = "yes"; then

-        { echo "$as_me:$LINENO: checking if swprintf declaration is broken" >&5
-echo $ECHO_N "checking if swprintf declaration is broken... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking if swprintf declaration is broken" >&5
+echo $ECHO_N "checking if swprintf declaration is broken... $ECHO_C" >&6

 if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -38539,37 +38023,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_broken_swprintf_decl=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_broken_swprintf_decl=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_broken_swprintf_decl=yes
+wx_cv_func_broken_swprintf_decl=yes

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6

 
         if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF


@@ -38587,9 +38075,9 @@ _ACEOF
 for ac_header in widec.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in widec.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -38603,35 +38091,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -38650,9 +38141,9 @@ done
 
   for wx_func in wputc wputchar putws fputws wprintf vswprintf
   do
 
   for wx_func in wputc wputchar putws fputws wprintf vswprintf
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -38682,38 +38173,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -38729,8 +38222,8 @@ _ACEOF
   done
 
 
   done
 
 

-                { echo "$as_me:$LINENO: checking for _vsnwprintf" >&5
-echo $ECHO_N "checking for _vsnwprintf... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for _vsnwprintf" >&5
+echo $ECHO_N "checking for _vsnwprintf... $ECHO_C" >&6

     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -38747,24 +38240,29 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                     cat >>confdefs.h <<\_ACEOF
 #define HAVE__VSNWPRINTF 1
 _ACEOF
                     cat >>confdefs.h <<\_ACEOF
 #define HAVE__VSNWPRINTF 1
 _ACEOF


@@ -38773,20 +38271,19 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 fi

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

 fi
 
 if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
 
   for wx_func in fnmatch
   do
 fi
 
 if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
 
   for wx_func in fnmatch
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -38816,38 +38313,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -38868,9 +38367,9 @@ if test "$wxUSE_FILE" = "yes"; then
 
   for wx_func in fsync
   do
 
   for wx_func in fsync
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -38900,38 +38399,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -38948,7 +38449,7 @@ _ACEOF
 
 fi
 
 
 fi
 

-ac_ext=cpp
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -38957,9 +38458,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   for wx_func in round
   do
 
   for wx_func in round
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -38989,38 +38490,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -39048,19 +38551,19 @@ if test "$TOOLKIT" != "MSW"; then
 
 
 
 
 
 

-# Check whether --with-libiconv-prefix was given.
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.

 if test "${with_libiconv_prefix+set}" = set; then
 if test "${with_libiconv_prefix+set}" = set; then

-  withval=$with_libiconv_prefix;
+  withval="$with_libiconv_prefix"
+

     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
     done
 
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
     done
 

-fi
-
+fi;

 
 

-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6

 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${am_cv_func_iconv+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -39086,32 +38589,34 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   am_cv_func_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   am_cv_func_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"


@@ -39135,48 +38640,50 @@ iconv_t cd = iconv_open("","");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi

-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6

   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ICONV 1
 _ACEOF
 
   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ICONV 1
 _ACEOF
 

-    { echo "$as_me:$LINENO: checking if iconv needs const" >&5
-echo $ECHO_N "checking if iconv needs const... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if iconv needs const" >&5
+echo $ECHO_N "checking if iconv needs const... $ECHO_C" >&6

 if test "${wx_cv_func_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -39208,36 +38715,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_iconv_const="no"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_iconv_const="no"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_iconv_const="yes"
+wx_cv_func_iconv_const="yes"

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_iconv_const" >&5
-echo "${ECHO_T}$wx_cv_func_iconv_const" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_iconv_const" >&5
+echo "${ECHO_T}$wx_cv_func_iconv_const" >&6

 
     iconv_const=
     if test "x$wx_cv_func_iconv_const" = "xyes"; then
 
     iconv_const=
     if test "x$wx_cv_func_iconv_const" = "xyes"; then


@@ -39263,9 +38774,9 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
 for ac_func in sigaction
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in sigaction
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -39291,60 +38802,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -39361,13 +38880,13 @@ echo "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFatalE
     fi
 
     if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
     fi
 
     if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then

-      { echo "$as_me:$LINENO: checking for sa_handler type" >&5
-echo $ECHO_N "checking for sa_handler type... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for sa_handler type" >&5
+echo $ECHO_N "checking for sa_handler type... $ECHO_C" >&6

 if test "${wx_cv_type_sa_handler+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_type_sa_handler+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                ac_ext=cpp
+                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -39394,22 +38913,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                         wx_cv_type_sa_handler=int
 
 
                         wx_cv_type_sa_handler=int
 


@@ -39421,8 +38945,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
                         wx_cv_type_sa_handler=void
 
 fi
                         wx_cv_type_sa_handler=void
 
 fi

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

         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -39431,8 +38954,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_type_sa_handler" >&5
-echo "${ECHO_T}$wx_cv_type_sa_handler" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_type_sa_handler" >&5
+echo "${ECHO_T}$wx_cv_type_sa_handler" >&6

 
       cat >>confdefs.h <<_ACEOF
 #define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
 
       cat >>confdefs.h <<_ACEOF
 #define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler


@@ -39442,13 +38965,13 @@ _ACEOF
 fi
 
 if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
 fi
 
 if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then

-    { echo "$as_me:$LINENO: checking for backtrace() in <execinfo.h>" >&5
-echo $ECHO_N "checking for backtrace() in <execinfo.h>... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for backtrace() in <execinfo.h>" >&5
+echo $ECHO_N "checking for backtrace() in <execinfo.h>... $ECHO_C" >&6

 if test "${wx_cv_func_backtrace+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_func_backtrace+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-            ac_ext=cpp
+            ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -39476,32 +38999,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_backtrace=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_backtrace=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_backtrace=no
+wx_cv_func_backtrace=no

 
 fi
 
 fi

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

             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -39511,8 +39038,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_backtrace" >&5
-echo "${ECHO_T}$wx_cv_func_backtrace" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_backtrace" >&5
+echo "${ECHO_T}$wx_cv_func_backtrace" >&6

 
 
     if test "$wx_cv_func_backtrace" = "no"; then
 
 
     if test "$wx_cv_func_backtrace" = "no"; then


@@ -39520,13 +39047,13 @@ echo "${ECHO_T}$wx_cv_func_backtrace" >&6; }
 echo "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;}
         wxUSE_STACKWALKER=no
     else
 echo "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;}
         wxUSE_STACKWALKER=no
     else

-        { echo "$as_me:$LINENO: checking for __cxa_demangle() in <cxxabi.h>" >&5
-echo $ECHO_N "checking for __cxa_demangle() in <cxxabi.h>... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for __cxa_demangle() in <cxxabi.h>" >&5
+echo $ECHO_N "checking for __cxa_demangle() in <cxxabi.h>... $ECHO_C" >&6

 if test "${wx_cv_func_cxa_demangle+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_func_cxa_demangle+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                ac_ext=cpp
+                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -39551,33 +39078,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_cxa_demangle=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_cxa_demangle=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_cxa_demangle=no
+wx_cv_func_cxa_demangle=no

 
 fi
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
       conftest$ac_exeext conftest.$ac_ext
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'


@@ -39588,8 +39118,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_cxa_demangle" >&5
-echo "${ECHO_T}$wx_cv_func_cxa_demangle" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_cxa_demangle" >&5
+echo "${ECHO_T}$wx_cv_func_cxa_demangle" >&6

 
         if test "$wx_cv_func_cxa_demangle" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test "$wx_cv_func_cxa_demangle" = "yes"; then
             cat >>confdefs.h <<\_ACEOF


@@ -39612,9 +39142,9 @@ fi
 for ac_func in mkstemp mktemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in mkstemp mktemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -39640,60 +39170,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -39703,8 +39241,8 @@ fi
 done
 
 
 done
 
 

-{ echo "$as_me:$LINENO: checking for statfs" >&5
-echo $ECHO_N "checking for statfs... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for statfs" >&5
+echo $ECHO_N "checking for statfs... $ECHO_C" >&6

 if test "${wx_cv_func_statfs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_statfs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -39738,44 +39276,48 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_statfs=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_statfs=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_statfs=no
+wx_cv_func_statfs=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_statfs" >&5
-echo "${ECHO_T}$wx_cv_func_statfs" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_statfs" >&5
+echo "${ECHO_T}$wx_cv_func_statfs" >&6

 
 if test "$wx_cv_func_statfs" = "yes"; then
 
 if test "$wx_cv_func_statfs" = "yes"; then

-        { echo "$as_me:$LINENO: checking for statfs declaration" >&5
-echo $ECHO_N "checking for statfs declaration... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for statfs declaration" >&5
+echo $ECHO_N "checking for statfs declaration... $ECHO_C" >&6

 if test "${wx_cv_func_statfs_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_statfs_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_ext=cpp
+  ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -39807,32 +39349,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_statfs_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_statfs_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_statfs_decl=no
+wx_cv_func_statfs_decl=no

 
 fi
 
 fi

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

         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -39841,8 +39387,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_statfs_decl" >&5
-echo "${ECHO_T}$wx_cv_func_statfs_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_statfs_decl" >&5
+echo "${ECHO_T}$wx_cv_func_statfs_decl" >&6

 
     if test "$wx_cv_func_statfs_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 
     if test "$wx_cv_func_statfs_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF


@@ -39857,8 +39403,8 @@ _ACEOF
 _ACEOF
 
 else
 _ACEOF
 
 else

-    { echo "$as_me:$LINENO: checking for statvfs" >&5
-echo $ECHO_N "checking for statvfs... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for statvfs" >&5
+echo $ECHO_N "checking for statvfs... $ECHO_C" >&6

 if test "${wx_cv_func_statvfs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_statvfs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -39883,44 +39429,48 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_statvfs=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_statvfs=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_statvfs=no
+wx_cv_func_statvfs=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_statvfs" >&5
-echo "${ECHO_T}$wx_cv_func_statvfs" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_statvfs" >&5
+echo "${ECHO_T}$wx_cv_func_statvfs" >&6

 
     if test "$wx_cv_func_statvfs" = "yes"; then
 
     if test "$wx_cv_func_statvfs" = "yes"; then

-                                                                { echo "$as_me:$LINENO: checking for statvfs argument type" >&5
-echo $ECHO_N "checking for statvfs argument type... $ECHO_C" >&6; }
+                                                                echo "$as_me:$LINENO: checking for statvfs argument type" >&5
+echo $ECHO_N "checking for statvfs argument type... $ECHO_C" >&6

 if test "${wx_cv_type_statvfs_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_type_statvfs_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else

-  ac_ext=cpp
+  ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -39951,22 +39501,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_statvfs_t=statvfs_t
 else
   echo "$as_me: failed program was:" >&5
   wx_cv_type_statvfs_t=statvfs_t
 else
   echo "$as_me: failed program was:" >&5


@@ -39998,37 +39553,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_statvfs_t="struct statvfs"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_type_statvfs_t="struct statvfs"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_type_statvfs_t="unknown"
+wx_cv_type_statvfs_t="unknown"

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

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

             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -40037,8 +39595,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_type_statvfs_t" >&5
-echo "${ECHO_T}$wx_cv_type_statvfs_t" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_type_statvfs_t" >&5
+echo "${ECHO_T}$wx_cv_type_statvfs_t" >&6

 
         if test "$wx_cv_type_statvfs_t" != "unknown"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test "$wx_cv_type_statvfs_t" != "unknown"; then
             cat >>confdefs.h <<\_ACEOF


@@ -40067,9 +39625,9 @@ if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
 for ac_func in fcntl flock
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in fcntl flock
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -40095,60 +39653,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -40169,9 +39735,9 @@ fi
 for ac_func in timegm
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in timegm
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -40197,60 +39763,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -40265,9 +39839,9 @@ done
 for ac_func in setenv putenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in setenv putenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -40293,60 +39867,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -40355,6 +39937,110 @@ _ACEOF
 fi
 done
 
 fi
 done
 

+if test "$ac_cv_func_setenv" = "yes"; then
+
+for ac_func in unsetenv
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+fi

 
 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then
 
 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then


@@ -40379,9 +40065,9 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
 for ac_func in nanosleep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in nanosleep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -40407,60 +40093,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -40471,8 +40165,8 @@ _ACEOF
 
 else
 
 
 else
 

-            { echo "$as_me:$LINENO: checking for nanosleep in -lposix4" >&5
-echo $ECHO_N "checking for nanosleep in -lposix4... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for nanosleep in -lposix4" >&5
+echo $ECHO_N "checking for nanosleep in -lposix4... $ECHO_C" >&6

 if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -40485,53 +40179,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char nanosleep ();
 int
 main ()
 {
 char nanosleep ();
 int
 main ()
 {

-return nanosleep ();
+nanosleep ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_posix4_nanosleep=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_posix4_nanosleep=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_posix4_nanosleep=no
+ac_cv_lib_posix4_nanosleep=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_nanosleep" >&5
-echo "${ECHO_T}$ac_cv_lib_posix4_nanosleep" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_nanosleep" >&5
+echo "${ECHO_T}$ac_cv_lib_posix4_nanosleep" >&6

 if test $ac_cv_lib_posix4_nanosleep = yes; then
 
                     cat >>confdefs.h <<\_ACEOF
 if test $ac_cv_lib_posix4_nanosleep = yes; then
 
                     cat >>confdefs.h <<\_ACEOF


@@ -40545,9 +40242,9 @@ else
 
   for wx_func in usleep
   do
 
   for wx_func in usleep
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -40577,38 +40274,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -40639,9 +40338,9 @@ fi
 
   for wx_func in uname
   do
 
   for wx_func in uname
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -40671,38 +40370,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -40721,9 +40422,9 @@ if test "$wx_cv_func_uname" != yes; then
 
   for wx_func in gethostname
   do
 
   for wx_func in gethostname
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -40753,38 +40454,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -40804,9 +40507,9 @@ fi
 
   for wx_func in strtok_r
   do
 
   for wx_func in strtok_r
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -40836,38 +40539,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -40888,9 +40593,9 @@ INET_LINK=
 for ac_func in inet_addr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in inet_addr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -40916,60 +40621,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -40980,8 +40693,8 @@ _ACEOF
 
 else
 
 
 else
 

-        { echo "$as_me:$LINENO: checking for inet_addr in -lnsl" >&5
-echo $ECHO_N "checking for inet_addr in -lnsl... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for inet_addr in -lnsl" >&5
+echo $ECHO_N "checking for inet_addr in -lnsl... $ECHO_C" >&6

 if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -40994,59 +40707,62 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char inet_addr ();
 int
 main ()
 {
 char inet_addr ();
 int
 main ()
 {

-return inet_addr ();
+inet_addr ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_nsl_inet_addr=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_nsl_inet_addr=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_nsl_inet_addr=no
+ac_cv_lib_nsl_inet_addr=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_addr" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_inet_addr" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_addr" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_inet_addr" >&6

 if test $ac_cv_lib_nsl_inet_addr = yes; then
   INET_LINK="nsl"
 else
 
 if test $ac_cv_lib_nsl_inet_addr = yes; then
   INET_LINK="nsl"
 else
 

-                { echo "$as_me:$LINENO: checking for inet_addr in -lresolv" >&5
-echo $ECHO_N "checking for inet_addr in -lresolv... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for inet_addr in -lresolv" >&5
+echo $ECHO_N "checking for inet_addr in -lresolv... $ECHO_C" >&6

 if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -41059,59 +40775,62 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char inet_addr ();
 int
 main ()
 {
 char inet_addr ();
 int
 main ()
 {

-return inet_addr ();
+inet_addr ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_resolv_inet_addr=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_resolv_inet_addr=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_resolv_inet_addr=no
+ac_cv_lib_resolv_inet_addr=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_addr" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_inet_addr" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_addr" >&5
+echo "${ECHO_T}$ac_cv_lib_resolv_inet_addr" >&6

 if test $ac_cv_lib_resolv_inet_addr = yes; then
   INET_LINK="resolv"
 else
 
 if test $ac_cv_lib_resolv_inet_addr = yes; then
   INET_LINK="resolv"
 else
 

-                        { echo "$as_me:$LINENO: checking for inet_addr in -lsocket" >&5
-echo $ECHO_N "checking for inet_addr in -lsocket... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking for inet_addr in -lsocket" >&5
+echo $ECHO_N "checking for inet_addr in -lsocket... $ECHO_C" >&6

 if test "${ac_cv_lib_socket_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_socket_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -41124,53 +40843,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char inet_addr ();
 int
 main ()
 {
 char inet_addr ();
 int
 main ()
 {

-return inet_addr ();
+inet_addr ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_socket_inet_addr=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_socket_inet_addr=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_socket_inet_addr=no
+ac_cv_lib_socket_inet_addr=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_inet_addr" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_inet_addr" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_inet_addr" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_inet_addr" >&6

 if test $ac_cv_lib_socket_inet_addr = yes; then
   INET_LINK="socket"
 
 if test $ac_cv_lib_socket_inet_addr = yes; then
   INET_LINK="socket"
 


@@ -41194,9 +40916,9 @@ done
 for ac_func in inet_aton
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in inet_aton
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -41222,60 +40944,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -41287,9 +41017,9 @@ _ACEOF
 else
 
                         as_ac_Lib=`echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh`
 else
 
                         as_ac_Lib=`echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for inet_aton in -l$INET_LINK" >&5
-echo $ECHO_N "checking for inet_aton in -l$INET_LINK... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for inet_aton in -l$INET_LINK" >&5
+echo $ECHO_N "checking for inet_aton in -l$INET_LINK... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Lib+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS


@@ -41301,54 +41031,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char inet_aton ();
 int
 main ()
 {
 char inet_aton ();
 int
 main ()
 {

-return inet_aton ();
+inet_aton ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Lib=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Lib=no"
+eval "$as_ac_Lib=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-ac_res=`eval echo '${'$as_ac_Lib'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6

 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_INET_ATON 1
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_INET_ATON 1


@@ -41372,9 +41104,9 @@ fi
 
   for wx_func in fdopen
   do
 
   for wx_func in fdopen
   do

-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6
+if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 


@@ -41404,38 +41136,40 @@ main ()
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval wx_cv_func_$wx_func=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval wx_cv_func_$wx_func=no
+eval wx_cv_func_$wx_func=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5
+echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6

 
     if eval test \$wx_cv_func_$wx_func = yes
     then
 
     if eval test \$wx_cv_func_$wx_func = yes
     then


@@ -41473,58 +41207,39 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.

-# So, we kill variables containing newlines.
+# So, don't put newlines in cache variables' values.

 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.

-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
+{

   (set) 2>&1 |
   (set) 2>&1 |

-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)

       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"

-      ;; #(
+      ;;

     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.

-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+       "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
       ;;

-    esac |
-    sort
-) |
+    esac;
+} |

   sed '
   sed '

-     /^ac_cv_env_/b end

      t clear
      t clear

-     :clear
+     : clear

      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end

-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"

     cat confcache >$cache_file
   else
     cat confcache >$cache_file
   else

-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    echo "not updating unwritable cache $cache_file"

   fi
 fi
 rm -f confcache
   fi
 fi
 rm -f confcache


@@ -41595,19 +41310,19 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
         for flag in $THREAD_OPTS; do
             case $flag in
                 none)
         for flag in $THREAD_OPTS; do
             case $flag in
                 none)

-                    { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
-echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }
+                    echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
+echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6

                     ;;
 
                 -*)
                     ;;
 
                 -*)

-                    { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
+                    echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
+echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6

                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)
                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)

-                    { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }
+                    echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
+echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6

                     THREADS_LINK="-l$flag"
                     ;;
               esac
                     THREADS_LINK="-l$flag"
                     ;;
               esac


@@ -41633,39 +41348,41 @@ pthread_create(0,0,0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   THREADS_OK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   THREADS_OK=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 
       conftest$ac_exeext conftest.$ac_ext
 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 

-              { echo "$as_me:$LINENO: result: $THREADS_OK" >&5
-echo "${ECHO_T}$THREADS_OK" >&6; }
+              echo "$as_me:$LINENO: result: $THREADS_OK" >&5
+echo "${ECHO_T}$THREADS_OK" >&6

               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi
               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi


@@ -41682,8 +41399,8 @@ echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
                               LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
           LIBS="$THREADS_LINK $LIBS"
 
                               LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
           LIBS="$THREADS_LINK $LIBS"
 

-          { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
+echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6

           flag=no
           case "${host}" in
             *-aix*)
           flag=no
           case "${host}" in
             *-aix*)


@@ -41703,8 +41420,8 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_
                 flag="-D_REENTRANT"
                 ;;
           esac
                 flag="-D_REENTRANT"
                 ;;
           esac

-          { echo "$as_me:$LINENO: result: ${flag}" >&5
-echo "${ECHO_T}${flag}" >&6; }
+          echo "$as_me:$LINENO: result: ${flag}" >&5
+echo "${ECHO_T}${flag}" >&6

           if test "x$flag" != xno; then
               THREADS_CFLAGS="$THREADS_CFLAGS $flag"
           fi
           if test "x$flag" != xno; then
               THREADS_CFLAGS="$THREADS_CFLAGS $flag"
           fi


@@ -41718,9 +41435,9 @@ echo "${ECHO_T}${flag}" >&6; }
 for ac_func in thr_setconcurrency
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in thr_setconcurrency
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -41746,60 +41463,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -41809,13 +41534,13 @@ fi
 done
 
 
 done
 
 

-                  { echo "$as_me:$LINENO: checking for pthread_cleanup_push/pop" >&5
-echo $ECHO_N "checking for pthread_cleanup_push/pop... $ECHO_C" >&6; }
+                  echo "$as_me:$LINENO: checking for pthread_cleanup_push/pop" >&5
+echo $ECHO_N "checking for pthread_cleanup_push/pop... $ECHO_C" >&6

 if test "${wx_cv_func_pthread_cleanup+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_func_pthread_cleanup+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                                ac_ext=cpp
+                                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -41843,22 +41568,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                wx_cv_func_pthread_cleanup=yes
 
 
                wx_cv_func_pthread_cleanup=yes
 


@@ -41871,8 +41601,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

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

         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -41881,8 +41610,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup" >&5
-echo "${ECHO_T}$wx_cv_func_pthread_cleanup" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup" >&5
+echo "${ECHO_T}$wx_cv_func_pthread_cleanup" >&6

       if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
         cat >>confdefs.h <<\_ACEOF
 #define wxHAVE_PTHREAD_CLEANUP 1
       if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
         cat >>confdefs.h <<\_ACEOF
 #define wxHAVE_PTHREAD_CLEANUP 1


@@ -41894,9 +41623,9 @@ _ACEOF
 for ac_header in sched.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in sched.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -41910,35 +41639,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -41949,8 +41681,8 @@ fi
 done
 
       if test "$ac_cv_header_sched_h" = "yes"; then
 done
 
       if test "$ac_cv_header_sched_h" = "yes"; then

-          { echo "$as_me:$LINENO: checking for sched_yield" >&5
-echo $ECHO_N "checking for sched_yield... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for sched_yield" >&5
+echo $ECHO_N "checking for sched_yield... $ECHO_C" >&6

 if test "${ac_cv_func_sched_yield+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_sched_yield+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -41977,59 +41709,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef sched_yield
 
 
 #undef sched_yield
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char sched_yield ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char sched_yield ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_sched_yield || defined __stub___sched_yield
+#if defined (__stub_sched_yield) || defined (__stub___sched_yield)

 choke me
 choke me

+#else
+char (*f) () = sched_yield;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return sched_yield ();
+return f != sched_yield;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_sched_yield=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_sched_yield=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_sched_yield=no
+ac_cv_func_sched_yield=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_sched_yield" >&5
-echo "${ECHO_T}$ac_cv_func_sched_yield" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_sched_yield" >&5
+echo "${ECHO_T}$ac_cv_func_sched_yield" >&6

 if test $ac_cv_func_sched_yield = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SCHED_YIELD 1
 if test $ac_cv_func_sched_yield = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SCHED_YIELD 1


@@ -42037,8 +41778,8 @@ _ACEOF
 
 else
 
 
 else
 

-                { echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5
-echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5
+echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6

 if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42051,53 +41792,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char sched_yield ();
 int
 main ()
 {
 char sched_yield ();
 int
 main ()
 {

-return sched_yield ();
+sched_yield ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_posix4_sched_yield=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_posix4_sched_yield=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_posix4_sched_yield=no
+ac_cv_lib_posix4_sched_yield=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5
-echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5
+echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6

 if test $ac_cv_lib_posix4_sched_yield = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SCHED_YIELD 1
 if test $ac_cv_lib_posix4_sched_yield = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_SCHED_YIELD 1


@@ -42116,8 +41860,8 @@ fi
       fi
 
                                           HAVE_PRIOR_FUNCS=0
       fi
 
                                           HAVE_PRIOR_FUNCS=0

-      { echo "$as_me:$LINENO: checking for pthread_attr_getschedpolicy" >&5
-echo $ECHO_N "checking for pthread_attr_getschedpolicy... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for pthread_attr_getschedpolicy" >&5
+echo $ECHO_N "checking for pthread_attr_getschedpolicy... $ECHO_C" >&6

 if test "${ac_cv_func_pthread_attr_getschedpolicy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_pthread_attr_getschedpolicy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42144,62 +41888,71 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef pthread_attr_getschedpolicy
 
 
 #undef pthread_attr_getschedpolicy
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char pthread_attr_getschedpolicy ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char pthread_attr_getschedpolicy ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_pthread_attr_getschedpolicy || defined __stub___pthread_attr_getschedpolicy
+#if defined (__stub_pthread_attr_getschedpolicy) || defined (__stub___pthread_attr_getschedpolicy)

 choke me
 choke me

+#else
+char (*f) () = pthread_attr_getschedpolicy;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return pthread_attr_getschedpolicy ();
+return f != pthread_attr_getschedpolicy;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_pthread_attr_getschedpolicy=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_pthread_attr_getschedpolicy=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_pthread_attr_getschedpolicy=no
+ac_cv_func_pthread_attr_getschedpolicy=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_getschedpolicy" >&5
-echo "${ECHO_T}$ac_cv_func_pthread_attr_getschedpolicy" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_getschedpolicy" >&5
+echo "${ECHO_T}$ac_cv_func_pthread_attr_getschedpolicy" >&6

 if test $ac_cv_func_pthread_attr_getschedpolicy = yes; then
 if test $ac_cv_func_pthread_attr_getschedpolicy = yes; then

-  { echo "$as_me:$LINENO: checking for pthread_attr_setschedparam" >&5
-echo $ECHO_N "checking for pthread_attr_setschedparam... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for pthread_attr_setschedparam" >&5
+echo $ECHO_N "checking for pthread_attr_setschedparam... $ECHO_C" >&6

 if test "${ac_cv_func_pthread_attr_setschedparam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_pthread_attr_setschedparam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42226,62 +41979,71 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef pthread_attr_setschedparam
 
 
 #undef pthread_attr_setschedparam
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char pthread_attr_setschedparam ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char pthread_attr_setschedparam ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_pthread_attr_setschedparam || defined __stub___pthread_attr_setschedparam
+#if defined (__stub_pthread_attr_setschedparam) || defined (__stub___pthread_attr_setschedparam)

 choke me
 choke me

+#else
+char (*f) () = pthread_attr_setschedparam;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return pthread_attr_setschedparam ();
+return f != pthread_attr_setschedparam;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_pthread_attr_setschedparam=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_pthread_attr_setschedparam=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_pthread_attr_setschedparam=no
+ac_cv_func_pthread_attr_setschedparam=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_setschedparam" >&5
-echo "${ECHO_T}$ac_cv_func_pthread_attr_setschedparam" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_setschedparam" >&5
+echo "${ECHO_T}$ac_cv_func_pthread_attr_setschedparam" >&6

 if test $ac_cv_func_pthread_attr_setschedparam = yes; then
 if test $ac_cv_func_pthread_attr_setschedparam = yes; then

-  { echo "$as_me:$LINENO: checking for sched_get_priority_max" >&5
-echo $ECHO_N "checking for sched_get_priority_max... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for sched_get_priority_max" >&5
+echo $ECHO_N "checking for sched_get_priority_max... $ECHO_C" >&6

 if test "${ac_cv_func_sched_get_priority_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_sched_get_priority_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42308,64 +42070,73 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef sched_get_priority_max
 
 
 #undef sched_get_priority_max
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char sched_get_priority_max ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char sched_get_priority_max ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_sched_get_priority_max || defined __stub___sched_get_priority_max
+#if defined (__stub_sched_get_priority_max) || defined (__stub___sched_get_priority_max)

 choke me
 choke me

+#else
+char (*f) () = sched_get_priority_max;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return sched_get_priority_max ();
+return f != sched_get_priority_max;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_sched_get_priority_max=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_sched_get_priority_max=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_sched_get_priority_max=no
+ac_cv_func_sched_get_priority_max=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_sched_get_priority_max" >&5
-echo "${ECHO_T}$ac_cv_func_sched_get_priority_max" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_sched_get_priority_max" >&5
+echo "${ECHO_T}$ac_cv_func_sched_get_priority_max" >&6

 if test $ac_cv_func_sched_get_priority_max = yes; then
   HAVE_PRIOR_FUNCS=1
 else
 if test $ac_cv_func_sched_get_priority_max = yes; then
   HAVE_PRIOR_FUNCS=1
 else

-  { echo "$as_me:$LINENO: checking for sched_get_priority_max in -lposix4" >&5
-echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for sched_get_priority_max in -lposix4" >&5
+echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6

 if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42378,53 +42149,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char sched_get_priority_max ();
 int
 main ()
 {
 char sched_get_priority_max ();
 int
 main ()
 {

-return sched_get_priority_max ();
+sched_get_priority_max ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_posix4_sched_get_priority_max=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_posix4_sched_get_priority_max=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_posix4_sched_get_priority_max=no
+ac_cv_lib_posix4_sched_get_priority_max=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5
-echo "${ECHO_T}$ac_cv_lib_posix4_sched_get_priority_max" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5
+echo "${ECHO_T}$ac_cv_lib_posix4_sched_get_priority_max" >&6

 if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then
 
                                 HAVE_PRIOR_FUNCS=1
 if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then
 
                                 HAVE_PRIOR_FUNCS=1


@@ -42452,8 +42226,8 @@ _ACEOF
 echo "$as_me: WARNING: Setting thread priority will not work" >&2;}
       fi
 
 echo "$as_me: WARNING: Setting thread priority will not work" >&2;}
       fi
 

-      { echo "$as_me:$LINENO: checking for pthread_cancel" >&5
-echo $ECHO_N "checking for pthread_cancel... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for pthread_cancel" >&5
+echo $ECHO_N "checking for pthread_cancel... $ECHO_C" >&6

 if test "${ac_cv_func_pthread_cancel+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_pthread_cancel+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42480,59 +42254,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef pthread_cancel
 
 
 #undef pthread_cancel
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char pthread_cancel ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char pthread_cancel ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_pthread_cancel || defined __stub___pthread_cancel
+#if defined (__stub_pthread_cancel) || defined (__stub___pthread_cancel)

 choke me
 choke me

+#else
+char (*f) () = pthread_cancel;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return pthread_cancel ();
+return f != pthread_cancel;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_pthread_cancel=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_pthread_cancel=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_pthread_cancel=no
+ac_cv_func_pthread_cancel=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cancel" >&5
-echo "${ECHO_T}$ac_cv_func_pthread_cancel" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cancel" >&5
+echo "${ECHO_T}$ac_cv_func_pthread_cancel" >&6

 if test $ac_cv_func_pthread_cancel = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_CANCEL 1
 if test $ac_cv_func_pthread_cancel = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_CANCEL 1


@@ -42544,8 +42327,8 @@ echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;}
 fi
 
 
 fi
 
 

-      { echo "$as_me:$LINENO: checking for pthread_mutex_timedlock" >&5
-echo $ECHO_N "checking for pthread_mutex_timedlock... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for pthread_mutex_timedlock" >&5
+echo $ECHO_N "checking for pthread_mutex_timedlock... $ECHO_C" >&6

 if test "${ac_cv_func_pthread_mutex_timedlock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_pthread_mutex_timedlock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42572,59 +42355,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef pthread_mutex_timedlock
 
 
 #undef pthread_mutex_timedlock
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char pthread_mutex_timedlock ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char pthread_mutex_timedlock ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_pthread_mutex_timedlock || defined __stub___pthread_mutex_timedlock
+#if defined (__stub_pthread_mutex_timedlock) || defined (__stub___pthread_mutex_timedlock)

 choke me
 choke me

+#else
+char (*f) () = pthread_mutex_timedlock;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return pthread_mutex_timedlock ();
+return f != pthread_mutex_timedlock;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_pthread_mutex_timedlock=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_pthread_mutex_timedlock=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_pthread_mutex_timedlock=no
+ac_cv_func_pthread_mutex_timedlock=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_mutex_timedlock" >&5
-echo "${ECHO_T}$ac_cv_func_pthread_mutex_timedlock" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_pthread_mutex_timedlock" >&5
+echo "${ECHO_T}$ac_cv_func_pthread_mutex_timedlock" >&6

 if test $ac_cv_func_pthread_mutex_timedlock = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1
 if test $ac_cv_func_pthread_mutex_timedlock = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1


@@ -42636,8 +42428,8 @@ echo "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;}
 fi
 
 
 fi
 
 

-      { echo "$as_me:$LINENO: checking for pthread_attr_setstacksize" >&5
-echo $ECHO_N "checking for pthread_attr_setstacksize... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for pthread_attr_setstacksize" >&5
+echo $ECHO_N "checking for pthread_attr_setstacksize... $ECHO_C" >&6

 if test "${ac_cv_func_pthread_attr_setstacksize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_pthread_attr_setstacksize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42664,59 +42456,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef pthread_attr_setstacksize
 
 
 #undef pthread_attr_setstacksize
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char pthread_attr_setstacksize ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char pthread_attr_setstacksize ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_pthread_attr_setstacksize || defined __stub___pthread_attr_setstacksize
+#if defined (__stub_pthread_attr_setstacksize) || defined (__stub___pthread_attr_setstacksize)

 choke me
 choke me

+#else
+char (*f) () = pthread_attr_setstacksize;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return pthread_attr_setstacksize ();
+return f != pthread_attr_setstacksize;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_pthread_attr_setstacksize=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_pthread_attr_setstacksize=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_pthread_attr_setstacksize=no
+ac_cv_func_pthread_attr_setstacksize=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_setstacksize" >&5
-echo "${ECHO_T}$ac_cv_func_pthread_attr_setstacksize" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_setstacksize" >&5
+echo "${ECHO_T}$ac_cv_func_pthread_attr_setstacksize" >&6

 if test $ac_cv_func_pthread_attr_setstacksize = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 if test $ac_cv_func_pthread_attr_setstacksize = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1


@@ -42726,8 +42527,8 @@ fi
 
 
 
 
 
 

-      { echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5
-echo $ECHO_N "checking for pthread_mutexattr_t... $ECHO_C" >&6; }
+      echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5
+echo $ECHO_N "checking for pthread_mutexattr_t... $ECHO_C" >&6

 if test "${wx_cv_type_pthread_mutexattr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_type_pthread_mutexattr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42751,36 +42552,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_pthread_mutexattr_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_type_pthread_mutexattr_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_type_pthread_mutexattr_t=no
+wx_cv_type_pthread_mutexattr_t=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_mutexattr_t" >&5
-echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_type_pthread_mutexattr_t" >&5
+echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6

 
       if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 
       if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
         cat >>confdefs.h <<\_ACEOF


@@ -42788,8 +42593,8 @@ echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6; }
 _ACEOF
 
 
 _ACEOF
 
 

-                        { echo "$as_me:$LINENO: checking for pthread_mutexattr_settype declaration" >&5
-echo $ECHO_N "checking for pthread_mutexattr_settype declaration... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking for pthread_mutexattr_settype declaration" >&5
+echo $ECHO_N "checking for pthread_mutexattr_settype declaration... $ECHO_C" >&6

 if test "${wx_cv_func_pthread_mutexattr_settype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_pthread_mutexattr_settype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42813,36 +42618,40 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_pthread_mutexattr_settype_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_pthread_mutexattr_settype_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_pthread_mutexattr_settype_decl=no
+wx_cv_func_pthread_mutexattr_settype_decl=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5
-echo "${ECHO_T}$wx_cv_func_pthread_mutexattr_settype_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5
+echo "${ECHO_T}$wx_cv_func_pthread_mutexattr_settype_decl" >&6

         if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
         if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1


@@ -42850,8 +42659,8 @@ _ACEOF
 
         fi
       else
 
         fi
       else

-                { echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
-echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6

 if test "${wx_cv_type_pthread_rec_mutex_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_type_pthread_rec_mutex_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42874,22 +42683,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                     wx_cv_type_pthread_rec_mutex_init=yes
 
 
                     wx_cv_type_pthread_rec_mutex_init=yes
 


@@ -42902,12 +42716,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_rec_mutex_init" >&5
-echo "${ECHO_T}$wx_cv_type_pthread_rec_mutex_init" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_type_pthread_rec_mutex_init" >&5
+echo "${ECHO_T}$wx_cv_type_pthread_rec_mutex_init" >&6

         if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
           cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
         if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
           cat >>confdefs.h <<\_ACEOF
 #define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1


@@ -42924,8 +42737,8 @@ else
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
         *-*-mingw32* )
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
         *-*-mingw32* )

-                        { echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
-echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
+echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6

 if test "${wx_cv_cflags_mthread+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_cflags_mthread+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -42948,37 +42761,41 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_cflags_mthread=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_cflags_mthread=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_cflags_mthread=no
+wx_cv_cflags_mthread=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_cflags_mthread" >&5
-echo "${ECHO_T}$wx_cv_cflags_mthread" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_cflags_mthread" >&5
+echo "${ECHO_T}$wx_cv_cflags_mthread" >&6

 
             if test "$wx_cv_cflags_mthread" = "yes"; then
                                 WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads"
 
             if test "$wx_cv_cflags_mthread" = "yes"; then
                                 WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads"


@@ -42995,8 +42812,8 @@ echo "${ECHO_T}$wx_cv_cflags_mthread" >&6; }
     fi
 fi
 
     fi
 fi
 

-{ echo "$as_me:$LINENO: checking for localtime_r" >&5
-echo $ECHO_N "checking for localtime_r... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for localtime_r" >&5
+echo $ECHO_N "checking for localtime_r... $ECHO_C" >&6

 if test "${ac_cv_func_localtime_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_localtime_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -43023,59 +42840,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef localtime_r
 
 
 #undef localtime_r
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char localtime_r ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char localtime_r ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_localtime_r || defined __stub___localtime_r
+#if defined (__stub_localtime_r) || defined (__stub___localtime_r)

 choke me
 choke me

+#else
+char (*f) () = localtime_r;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return localtime_r ();
+return f != localtime_r;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_localtime_r=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_localtime_r=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_localtime_r=no
+ac_cv_func_localtime_r=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_localtime_r" >&5
-echo "${ECHO_T}$ac_cv_func_localtime_r" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_localtime_r" >&5
+echo "${ECHO_T}$ac_cv_func_localtime_r" >&6

 if test $ac_cv_func_localtime_r = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_LOCALTIME_R 1
 if test $ac_cv_func_localtime_r = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_LOCALTIME_R 1


@@ -43083,8 +42909,8 @@ _ACEOF
 
 fi
 
 
 fi
 

-{ echo "$as_me:$LINENO: checking for gmtime_r" >&5
-echo $ECHO_N "checking for gmtime_r... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for gmtime_r" >&5
+echo $ECHO_N "checking for gmtime_r... $ECHO_C" >&6

 if test "${ac_cv_func_gmtime_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_gmtime_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -43111,59 +42937,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef gmtime_r
 
 
 #undef gmtime_r
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char gmtime_r ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char gmtime_r ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_gmtime_r || defined __stub___gmtime_r
+#if defined (__stub_gmtime_r) || defined (__stub___gmtime_r)

 choke me
 choke me

+#else
+char (*f) () = gmtime_r;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return gmtime_r ();
+return f != gmtime_r;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_gmtime_r=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_gmtime_r=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_gmtime_r=no
+ac_cv_func_gmtime_r=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_gmtime_r" >&5
-echo "${ECHO_T}$ac_cv_func_gmtime_r" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_gmtime_r" >&5
+echo "${ECHO_T}$ac_cv_func_gmtime_r" >&6

 if test $ac_cv_func_gmtime_r = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_GMTIME_R 1
 if test $ac_cv_func_gmtime_r = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_GMTIME_R 1


@@ -43171,8 +43006,8 @@ _ACEOF
 
 fi
 
 
 fi
 

-{ echo "$as_me:$LINENO: checking for readdir_r" >&5
-echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for readdir_r" >&5
+echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6

 if test "${ac_cv_func_readdir_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_readdir_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -43199,59 +43034,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef readdir_r
 
 
 #undef readdir_r
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char readdir_r ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char readdir_r ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_readdir_r || defined __stub___readdir_r
+#if defined (__stub_readdir_r) || defined (__stub___readdir_r)

 choke me
 choke me

+#else
+char (*f) () = readdir_r;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return readdir_r ();
+return f != readdir_r;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_readdir_r=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_readdir_r=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_readdir_r=no
+ac_cv_func_readdir_r=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
-echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
+echo "${ECHO_T}$ac_cv_func_readdir_r" >&6

 if test $ac_cv_func_readdir_r = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_READDIR_R 1
 if test $ac_cv_func_readdir_r = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_READDIR_R 1


@@ -43268,8 +43112,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-    { echo "$as_me:$LINENO: checking how many arguments gethostbyname_r() takes" >&5
-echo $ECHO_N "checking how many arguments gethostbyname_r() takes... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking how many arguments gethostbyname_r() takes" >&5
+echo $ECHO_N "checking how many arguments gethostbyname_r() takes... $ECHO_C" >&6

 
     if test "${ac_cv_func_which_gethostbyname_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 
     if test "${ac_cv_func_which_gethostbyname_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -43308,31 +43152,34 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_which_gethostbyname_r=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_which_gethostbyname_r=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

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

 
 #
 # SIX ARGUMENTS
 
 #
 # SIX ARGUMENTS


@@ -43364,31 +43211,34 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_which_gethostbyname_r=six
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_which_gethostbyname_r=six
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

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

 
 fi
 
 
 fi
 


@@ -43422,31 +43272,34 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_which_gethostbyname_r=five
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_which_gethostbyname_r=five
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

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

 
 fi
 
 
 fi
 


@@ -43478,31 +43331,34 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_which_gethostbyname_r=three
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_which_gethostbyname_r=three
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

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

 
 fi
 
 
 fi
 


@@ -43513,8 +43369,8 @@ fi
 
 case "$ac_cv_func_which_gethostbyname_r" in
     three)
 
 case "$ac_cv_func_which_gethostbyname_r" in
     three)

-    { echo "$as_me:$LINENO: result: three" >&5
-echo "${ECHO_T}three" >&6; }
+    echo "$as_me:$LINENO: result: three" >&5
+echo "${ECHO_T}three" >&6

     cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_GETHOSTBYNAME_R_3 1
 _ACEOF
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_GETHOSTBYNAME_R_3 1
 _ACEOF


@@ -43522,8 +43378,8 @@ _ACEOF
     ;;
 
     five)
     ;;
 
     five)

-    { echo "$as_me:$LINENO: result: five" >&5
-echo "${ECHO_T}five" >&6; }
+    echo "$as_me:$LINENO: result: five" >&5
+echo "${ECHO_T}five" >&6

     cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_GETHOSTBYNAME_R_5 1
 _ACEOF
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_GETHOSTBYNAME_R_5 1
 _ACEOF


@@ -43531,8 +43387,8 @@ _ACEOF
     ;;
 
     six)
     ;;
 
     six)

-    { echo "$as_me:$LINENO: result: six" >&5
-echo "${ECHO_T}six" >&6; }
+    echo "$as_me:$LINENO: result: six" >&5
+echo "${ECHO_T}six" >&6

     cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_GETHOSTBYNAME_R_6 1
 _ACEOF
     cat >>confdefs.h <<\_ACEOF
 #define HAVE_FUNC_GETHOSTBYNAME_R_6 1
 _ACEOF


@@ -43540,13 +43396,13 @@ _ACEOF
     ;;
 
     no)
     ;;
 
     no)

-    { echo "$as_me:$LINENO: result: cannot find function declaration in netdb.h" >&5
-echo "${ECHO_T}cannot find function declaration in netdb.h" >&6; }
+    echo "$as_me:$LINENO: result: cannot find function declaration in netdb.h" >&5
+echo "${ECHO_T}cannot find function declaration in netdb.h" >&6

     ;;
 
     unknown)
     ;;
 
     unknown)

-    { echo "$as_me:$LINENO: result: can't tell" >&5
-echo "${ECHO_T}can't tell" >&6; }
+    echo "$as_me:$LINENO: result: can't tell" >&5
+echo "${ECHO_T}can't tell" >&6

     ;;
 
     *)
     ;;
 
     *)


@@ -43566,8 +43422,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
       if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \
               "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then
 
       if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \
               "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then

-          { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
+          echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6

 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -43594,59 +43450,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef gethostbyname
 
 
 #undef gethostbyname
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char gethostbyname ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char gethostbyname ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_gethostbyname || defined __stub___gethostbyname
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)

 choke me
 choke me

+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return gethostbyname ();
+return f != gethostbyname;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_gethostbyname=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_gethostbyname=no
+ac_cv_func_gethostbyname=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6

 if test $ac_cv_func_gethostbyname = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_GETHOSTBYNAME 1
 if test $ac_cv_func_gethostbyname = yes; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_GETHOSTBYNAME 1


@@ -43656,13 +43521,13 @@ fi
 
       fi
 
 
       fi
 

-{ echo "$as_me:$LINENO: checking how many arguments getservbyname_r() takes" >&5
-echo $ECHO_N "checking how many arguments getservbyname_r() takes... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking how many arguments getservbyname_r() takes" >&5
+echo $ECHO_N "checking how many arguments getservbyname_r() takes... $ECHO_C" >&6

 if test "${ac_cv_func_which_getservbyname_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${ac_cv_func_which_getservbyname_r+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                ac_ext=cpp
+                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -43692,22 +43557,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_which_getservbyname_r=six
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_which_getservbyname_r=six
 else
   echo "$as_me: failed program was:" >&5


@@ -43737,22 +43607,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_which_getservbyname_r=five
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_func_which_getservbyname_r=five
 else
   echo "$as_me: failed program was:" >&5


@@ -43781,42 +43656,44 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_which_getservbyname_r=four
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_which_getservbyname_r=four
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_which_getservbyname_r=no
+ac_cv_func_which_getservbyname_r=no

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

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

 
 
 fi
 
 
 fi

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

         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -43826,8 +43703,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_which_getservbyname_r" >&5
-echo "${ECHO_T}$ac_cv_func_which_getservbyname_r" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_which_getservbyname_r" >&5
+echo "${ECHO_T}$ac_cv_func_which_getservbyname_r" >&6

 
 if test $ac_cv_func_which_getservbyname_r = six; then
   cat >>confdefs.h <<\_ACEOF
 
 if test $ac_cv_func_which_getservbyname_r = six; then
   cat >>confdefs.h <<\_ACEOF


@@ -43853,9 +43730,9 @@ fi
 for ac_func in getservbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in getservbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -43881,60 +43758,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -43957,15 +43842,15 @@ _ACEOF
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
       if test "$wx_cv_func_strtok_r" = "yes"; then
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
       if test "$wx_cv_func_strtok_r" = "yes"; then

-    { echo "$as_me:$LINENO: checking if -D_REENTRANT is needed" >&5
-echo $ECHO_N "checking if -D_REENTRANT is needed... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking if -D_REENTRANT is needed" >&5
+echo $ECHO_N "checking if -D_REENTRANT is needed... $ECHO_C" >&6

     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_REENTRANT"
     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_REENTRANT"

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

     else
     else

-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

     fi
   fi
 fi
     fi
   fi
 fi


@@ -44141,9 +44026,9 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
 for ac_func in dlopen
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in dlopen
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -44169,60 +44054,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -44236,8 +44129,8 @@ _ACEOF
 
 else
 
 
 else
 

-                { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6

 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -44250,53 +44143,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char dlopen ();
 int
 main ()
 {
 char dlopen ();
 int
 main ()
 {

-return dlopen ();
+dlopen ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_dl_dlopen=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_dl_dlopen=no
+ac_cv_lib_dl_dlopen=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6

 if test $ac_cv_lib_dl_dlopen = yes; then
 
                                 cat >>confdefs.h <<\_ACEOF
 if test $ac_cv_lib_dl_dlopen = yes; then
 
                                 cat >>confdefs.h <<\_ACEOF


@@ -44312,9 +44208,9 @@ else
 for ac_func in shl_load
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in shl_load
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -44340,60 +44236,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -44407,8 +44311,8 @@ _ACEOF
 
 else
 
 
 else
 

-                                                { echo "$as_me:$LINENO: checking for dld in -lshl_load" >&5
-echo $ECHO_N "checking for dld in -lshl_load... $ECHO_C" >&6; }
+                                                echo "$as_me:$LINENO: checking for dld in -lshl_load" >&5
+echo $ECHO_N "checking for dld in -lshl_load... $ECHO_C" >&6

 if test "${ac_cv_lib_shl_load_dld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_shl_load_dld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -44421,53 +44325,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char dld ();
 int
 main ()
 {
 char dld ();
 int
 main ()
 {

-return dld ();
+dld ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_shl_load_dld=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_shl_load_dld=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_shl_load_dld=no
+ac_cv_lib_shl_load_dld=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_shl_load_dld" >&5
-echo "${ECHO_T}$ac_cv_lib_shl_load_dld" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_shl_load_dld" >&5
+echo "${ECHO_T}$ac_cv_lib_shl_load_dld" >&6

 if test $ac_cv_lib_shl_load_dld = yes; then
 
                                                                 HAVE_SHL_FUNCS=1
 if test $ac_cv_lib_shl_load_dld = yes; then
 
                                                                 HAVE_SHL_FUNCS=1


@@ -44492,9 +44399,9 @@ done
 for ac_func in dlerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in dlerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -44520,60 +44427,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -44584,8 +44499,8 @@ _ACEOF
 
 else
 
 
 else
 

-                    { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
-echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; }
+                    echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
+echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6

 if test "${ac_cv_lib_dl_dlerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_dl_dlerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -44598,53 +44513,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char dlerror ();
 int
 main ()
 {
 char dlerror ();
 int
 main ()
 {

-return dlerror ();
+dlerror ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_dl_dlerror=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_dl_dlerror=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_dl_dlerror=no
+ac_cv_lib_dl_dlerror=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlerror" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlerror" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlerror" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlerror" >&6

 if test $ac_cv_lib_dl_dlerror = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_DLERROR 1
 if test $ac_cv_lib_dl_dlerror = yes; then
   cat >>confdefs.h <<\_ACEOF
 #define HAVE_DLERROR 1


@@ -44746,8 +44664,8 @@ fi
 
 if test "$USE_UNIX" = "1" ; then
         if test "$wxUSE_MGL" != 1; then
 
 if test "$USE_UNIX" = "1" ; then
         if test "$wxUSE_MGL" != 1; then

-                                { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
-echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; }
+                                echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
+echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6

 if test "${ac_cv_header_sys_soundcard+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_sys_soundcard+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -44773,23 +44691,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_sys_soundcard=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_sys_soundcard=yes
 else
   echo "$as_me: failed program was:" >&5


@@ -44819,23 +44741,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_sys_soundcard=yes
 else
   echo "$as_me: failed program was:" >&5
   ac_cv_header_sys_soundcard=yes
 else
   echo "$as_me: failed program was:" >&5


@@ -44847,19 +44773,17 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 
 fi
       conftest$ac_exeext conftest.$ac_ext
 
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5
-echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5
+echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6

     fi
 
     if test "$ac_cv_header_sys_soundcard" = "yes"; then
     fi
 
     if test "$ac_cv_header_sys_soundcard" = "yes"; then


@@ -44875,28 +44799,28 @@ if test "$wxUSE_SOUND" = "yes"; then
   if test "$USE_UNIX" = "1" ; then
     if test "$wxUSE_LIBSDL" != "no"; then
 
   if test "$USE_UNIX" = "1" ; then
     if test "$wxUSE_LIBSDL" != "no"; then
 

-# Check whether --with-sdl-prefix was given.
+# Check whether --with-sdl-prefix or --without-sdl-prefix was given.

 if test "${with_sdl_prefix+set}" = set; then
 if test "${with_sdl_prefix+set}" = set; then

-  withval=$with_sdl_prefix; sdl_prefix="$withval"
+  withval="$with_sdl_prefix"
+  sdl_prefix="$withval"

 else
   sdl_prefix=""
 else
   sdl_prefix=""

-fi
-
+fi;

 
 

-# Check whether --with-sdl-exec-prefix was given.
+# Check whether --with-sdl-exec-prefix or --without-sdl-exec-prefix was given.

 if test "${with_sdl_exec_prefix+set}" = set; then
 if test "${with_sdl_exec_prefix+set}" = set; then

-  withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
+  withval="$with_sdl_exec_prefix"
+  sdl_exec_prefix="$withval"

 else
   sdl_exec_prefix=""
 else
   sdl_exec_prefix=""

-fi
-
-# Check whether --enable-sdltest was given.
+fi;
+# Check whether --enable-sdltest or --disable-sdltest was given.

 if test "${enable_sdltest+set}" = set; then
 if test "${enable_sdltest+set}" = set; then

-  enableval=$enable_sdltest;
+  enableval="$enable_sdltest"
+

 else
   enable_sdltest=yes
 else
   enable_sdltest=yes

-fi
-
+fi;

 
   if test x$sdl_exec_prefix != x ; then
     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
 
   if test x$sdl_exec_prefix != x ; then
     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"


@@ -44916,8 +44840,8 @@ fi
   fi
   # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2
   fi
   # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -44932,32 +44856,31 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
   ;;
 esac
 fi
 SDL_CONFIG=$ac_cv_path_SDL_CONFIG
 
   test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
   ;;
 esac
 fi
 SDL_CONFIG=$ac_cv_path_SDL_CONFIG

+

 if test -n "$SDL_CONFIG"; then
 if test -n "$SDL_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
-echo "${ECHO_T}$SDL_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
+echo "${ECHO_T}$SDL_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

   min_sdl_version=1.2.0
   min_sdl_version=1.2.0

-  { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
-echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
+echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6

   no_sdl=""
   if test "$SDL_CONFIG" = "no" ; then
     no_sdl=yes
   no_sdl=""
   if test "$SDL_CONFIG" = "no" ; then
     no_sdl=yes


@@ -45048,22 +44971,13 @@ int main (int argc, char *argv[])
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -45076,18 +44990,16 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 no_sdl=yes
 fi
 ( exit $ac_status )
 no_sdl=yes
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-
-

        CFLAGS="$ac_save_CFLAGS"
        CXXFLAGS="$ac_save_CXXFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_sdl" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        CXXFLAGS="$ac_save_CXXFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_sdl" = x ; then

-     { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+     echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                     EXTRALIBS_SDL="$SDL_LIBS"
                     CFLAGS="$SDL_CFLAGS $CFLAGS"
 
                     EXTRALIBS_SDL="$SDL_LIBS"
                     CFLAGS="$SDL_CFLAGS $CFLAGS"


@@ -45098,8 +45010,8 @@ _ACEOF
 
 
   else
 
 
   else

-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+     echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

      if test "$SDL_CONFIG" = "no" ; then
        echo "*** The sdl-config script installed by SDL could not be found"
        echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
      if test "$SDL_CONFIG" = "no" ; then
        echo "*** The sdl-config script installed by SDL could not be found"
        echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"


@@ -45137,23 +45049,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"
           echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding SDL or finding the wrong"
           echo "*** version of SDL. If it is not finding SDL, you'll need to set your"


@@ -45167,13 +45083,12 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-        echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"

           echo "*** exact error that occured. This usually means SDL was incorrectly installed"
           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
           echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
 fi
           echo "*** exact error that occured. This usually means SDL was incorrectly installed"
           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
           echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           CXXFLAGS="$ac_save_CXXFLAGS"
       conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           CXXFLAGS="$ac_save_CXXFLAGS"


@@ -45216,8 +45131,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -45232,35 +45147,34 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG

+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -45275,42 +45189,28 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

+

 if test -n "$ac_pt_PKG_CONFIG"; then
 if test -n "$ac_pt_PKG_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
+  PKG_CONFIG=$ac_pt_PKG_CONFIG

 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi


@@ -45318,26 +45218,117 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
        _pkg_min_version=0.9.0
 fi
 if test -n "$PKG_CONFIG"; then
        _pkg_min_version=0.9.0

-       { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+       echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6

        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

-               { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+               echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

        else
        else

-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

                PKG_CONFIG=""
        fi
 
 fi
 
     if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
                PKG_CONFIG=""
        fi
 
 fi
 
     if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then

+
+        if test "$wxUSE_GTKPRINT" = "yes" ; then
+
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for GTKPRINT" >&5
+echo $ECHO_N "checking for GTKPRINT... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GTKPRINT_CFLAGS"; then
+        pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GTKPRINT_LIBS"; then
+        pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GTKPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"`
+        else
+               GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$GTKPRINT_PKG_ERRORS" >&5
+
+
+                        { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;}
+                        wxUSE_GTKPRINT="no"
+
+
+elif test $pkg_failed = untried; then
+
+                        { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;}
+                        wxUSE_GTKPRINT="no"
+
+
+else
+       GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS
+       GTKPRINT_LIBS=$pkg_cv_GTKPRINT_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+                        CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
+                        CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
+                        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_GTKPRINT 1
+_ACEOF
+
+
+fi
+        fi
+

         if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
 
 
 pkg_failed=no
         if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
 
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for LIBGNOMEPRINTUI" >&5
-echo $ECHO_N "checking for LIBGNOMEPRINTUI... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for LIBGNOMEPRINTUI" >&5
+echo $ECHO_N "checking for LIBGNOMEPRINTUI... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$LIBGNOMEPRINTUI_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$LIBGNOMEPRINTUI_CFLAGS"; then


@@ -45409,8 +45400,8 @@ echo "$as_me: WARNING: libgnomeprintui not found, library will use standard Post
 else
        LIBGNOMEPRINTUI_CFLAGS=$pkg_cv_LIBGNOMEPRINTUI_CFLAGS
        LIBGNOMEPRINTUI_LIBS=$pkg_cv_LIBGNOMEPRINTUI_LIBS
 else
        LIBGNOMEPRINTUI_CFLAGS=$pkg_cv_LIBGNOMEPRINTUI_CFLAGS
        LIBGNOMEPRINTUI_LIBS=$pkg_cv_LIBGNOMEPRINTUI_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                         CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
                         CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
 
                         CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
                         CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"


@@ -45428,8 +45419,8 @@ fi
 
 
 pkg_failed=no
 
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for GNOMEVFS" >&5
-echo $ECHO_N "checking for GNOMEVFS... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for GNOMEVFS" >&5
+echo $ECHO_N "checking for GNOMEVFS... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GNOMEVFS_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GNOMEVFS_CFLAGS"; then


@@ -45501,8 +45492,8 @@ echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate
 else
        GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS
        GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS
 else
        GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS
        GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                         CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
                         CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
 
                         CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
                         CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"


@@ -45518,8 +45509,8 @@ fi
     if test "$wxUSE_LIBHILDON" = "yes" ; then
 
 pkg_failed=no
     if test "$wxUSE_LIBHILDON" = "yes" ; then
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for HILDON" >&5
-echo $ECHO_N "checking for HILDON... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for HILDON" >&5
+echo $ECHO_N "checking for HILDON... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$HILDON_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$HILDON_CFLAGS"; then


@@ -45591,8 +45582,8 @@ echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
 else
        HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS
        HILDON_LIBS=$pkg_cv_HILDON_LIBS
 else
        HILDON_CFLAGS=$pkg_cv_HILDON_CFLAGS
        HILDON_LIBS=$pkg_cv_HILDON_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                 EXTRALIBS_HILDON="$HILDON_LIBS"
                 CFLAGS="$CFLAGS $HILDON_CFLAGS"
 
                 EXTRALIBS_HILDON="$HILDON_LIBS"
                 CFLAGS="$CFLAGS $HILDON_CFLAGS"


@@ -45931,9 +45922,9 @@ _ACEOF
 for ac_header in sys/epoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in sys/epoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -45947,35 +45938,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -46004,9 +45998,9 @@ fi
 for ac_func in gettimeofday ftime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in gettimeofday ftime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -46032,60 +46026,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -46096,8 +46098,8 @@ done
 
 
 if test "$ac_cv_func_gettimeofday" = "yes"; then
 
 
 if test "$ac_cv_func_gettimeofday" = "yes"; then

-    { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
-echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
+echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6

 if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -46124,28 +46126,33 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_gettimeofday_has_2_args=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_gettimeofday_has_2_args=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -46167,22 +46174,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_gettimeofday_has_2_args=no
 else
   echo "$as_me: failed program was:" >&5
   wx_cv_func_gettimeofday_has_2_args=no
 else
   echo "$as_me: failed program was:" >&5


@@ -46195,16 +46207,14 @@ echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >
 
 
 fi
 
 
 fi

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

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
-echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
+echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6

 
     if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
         cat >>confdefs.h <<\_ACEOF
 
     if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
         cat >>confdefs.h <<\_ACEOF


@@ -46215,8 +46225,8 @@ _ACEOF
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then

-        { echo "$as_me:$LINENO: checking for strptime" >&5
-echo $ECHO_N "checking for strptime... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for strptime" >&5
+echo $ECHO_N "checking for strptime... $ECHO_C" >&6

 if test "${ac_cv_func_strptime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_strptime+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -46243,68 +46253,77 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef strptime
 
 
 #undef strptime
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char strptime ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char strptime ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_strptime || defined __stub___strptime
+#if defined (__stub_strptime) || defined (__stub___strptime)

 choke me
 choke me

+#else
+char (*f) () = strptime;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return strptime ();
+return f != strptime;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_strptime=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_strptime=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_strptime=no
+ac_cv_func_strptime=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
-echo "${ECHO_T}$ac_cv_func_strptime" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
+echo "${ECHO_T}$ac_cv_func_strptime" >&6

 
     if test "$ac_cv_func_strptime" = "yes"; then
 
     if test "$ac_cv_func_strptime" = "yes"; then

-        { echo "$as_me:$LINENO: checking for strptime declaration" >&5
-echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for strptime declaration" >&5
+echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6

 if test "${wx_cv_func_strptime_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_func_strptime_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                ac_ext=cpp
+                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -46331,32 +46350,36 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_strptime_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_func_strptime_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_func_strptime_decl=no
+wx_cv_func_strptime_decl=no

 
 fi
 
 fi

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

                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -46366,8 +46389,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5
+echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6

     fi
     if test "$wx_cv_func_strptime_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
     fi
     if test "$wx_cv_func_strptime_decl" = "yes"; then
         cat >>confdefs.h <<\_ACEOF


@@ -46378,8 +46401,8 @@ _ACEOF
         wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
     fi
     if test "$ac_cv_func_strptime" = "yes"; then
         wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
     fi
     if test "$ac_cv_func_strptime" = "yes"; then

-                                        { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
-echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; }
+                                        echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
+echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6

 if test "${wx_cv_func_strptime_ok+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_func_strptime_ok+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -46403,22 +46426,13 @@ else
 
 _ACEOF
 rm -f conftest$ac_exeext
 
 _ACEOF
 rm -f conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5

   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then


@@ -46431,14 +46445,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 wx_cv_func_strptime_ok=no
 fi
 ( exit $ac_status )
 wx_cv_func_strptime_ok=no
 fi

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

-
-

 fi
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
+echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6

 
         if test "$wx_cv_func_strptime_ok" = "yes"; then
             cat >>confdefs.h <<\_ACEOF
 
         if test "$wx_cv_func_strptime_ok" = "yes"; then
             cat >>confdefs.h <<\_ACEOF


@@ -46448,13 +46460,13 @@ _ACEOF
         fi
     fi
 
         fi
     fi
 

-            { echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
-echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
+echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6

 if test "${wx_cv_var_timezone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_var_timezone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                        ac_ext=cpp
+                        ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -46481,22 +46493,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                                 wx_cv_var_timezone=timezone
 
 
                                 wx_cv_var_timezone=timezone
 


@@ -46526,22 +46543,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                                         wx_cv_var_timezone=_timezone
 
 
                                         wx_cv_var_timezone=_timezone
 


@@ -46571,22 +46593,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                                                 wx_cv_var_timezone=__timezone
 
 
                                                 wx_cv_var_timezone=__timezone
 


@@ -46602,18 +46629,15 @@ echo "$as_me: WARNING: no timezone variable" >&2;}
 
 
 fi
 
 
 fi

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

 
 
 fi
 
 
 fi

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

 
 
 fi
 
 
 fi

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

                         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
                         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -46623,8 +46647,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5
-echo "${ECHO_T}$wx_cv_var_timezone" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5
+echo "${ECHO_T}$wx_cv_var_timezone" >&6

 
         if test "x$wx_cv_var_timezone" != x ; then
         cat >>confdefs.h <<_ACEOF
 
         if test "x$wx_cv_var_timezone" != x ; then
         cat >>confdefs.h <<_ACEOF


@@ -46637,9 +46661,9 @@ _ACEOF
 for ac_func in localtime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 for ac_func in localtime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -46665,60 +46689,68 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef $ac_func
 
 
 #undef $ac_func
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_$ac_func || defined __stub___$ac_func
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 choke me

+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return $ac_func ();
+return f != $ac_func;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_var=no"
+eval "$as_ac_var=no"

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1


@@ -46729,8 +46761,8 @@ done
 
 
     if test "$ac_cv_func_localtime" = "yes"; then
 
 
     if test "$ac_cv_func_localtime" = "yes"; then

-        { echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6

 if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -46756,22 +46788,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                     wx_cv_struct_tm_has_gmtoff=yes
 
 
                     wx_cv_struct_tm_has_gmtoff=yes
 


@@ -46779,15 +46816,14 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_struct_tm_has_gmtoff=no
+wx_cv_struct_tm_has_gmtoff=no

 
 fi
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
-echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
+echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6

     fi
 
     if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
     fi
 
     if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then


@@ -46811,8 +46847,8 @@ fi
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         if test "$TOOLKIT" != "MSW"; then

-                { echo "$as_me:$LINENO: checking for socket" >&5
-echo $ECHO_N "checking for socket... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for socket" >&5
+echo $ECHO_N "checking for socket... $ECHO_C" >&6

 if test "${ac_cv_func_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_func_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -46839,65 +46875,74 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 #undef socket
 
 
 #undef socket
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char socket ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 char socket ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */

-#if defined __stub_socket || defined __stub___socket
+#if defined (__stub_socket) || defined (__stub___socket)

 choke me
 choke me

+#else
+char (*f) () = socket;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 int
 main ()
 {
 #endif
 
 int
 main ()
 {

-return socket ();
+return f != socket;

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_func_socket=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_func_socket=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_func_socket=no
+ac_cv_func_socket=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 fi
       conftest$ac_exeext conftest.$ac_ext
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
-echo "${ECHO_T}$ac_cv_func_socket" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
+echo "${ECHO_T}$ac_cv_func_socket" >&6

 if test $ac_cv_func_socket = yes; then
   :
 else
 
 if test $ac_cv_func_socket = yes; then
   :
 else
 

-                { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6

 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -46910,53 +46955,56 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */

 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif

+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */

 char socket ();
 int
 main ()
 {
 char socket ();
 int
 main ()
 {

-return socket ();
+socket ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_socket_socket=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_socket_socket=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_socket_socket=no
+ac_cv_lib_socket_socket=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6

 if test $ac_cv_lib_socket_socket = yes; then
   if test "$INET_LINK" != " -lsocket"; then
                         INET_LINK="$INET_LINK -lsocket"
 if test $ac_cv_lib_socket_socket = yes; then
   if test "$INET_LINK" != " -lsocket"; then
                         INET_LINK="$INET_LINK -lsocket"


@@ -46979,13 +47027,13 @@ fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then

-                                        { echo "$as_me:$LINENO: checking what is the type of the third argument of getsockname" >&5
-echo $ECHO_N "checking what is the type of the third argument of getsockname... $ECHO_C" >&6; }
+                                        echo "$as_me:$LINENO: checking what is the type of the third argument of getsockname" >&5
+echo $ECHO_N "checking what is the type of the third argument of getsockname... $ECHO_C" >&6

 if test "${wx_cv_type_getsockname3+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_type_getsockname3+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                ac_ext=cpp
+                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -47013,22 +47061,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockname3=socklen_t
 else
   echo "$as_me: failed program was:" >&5
   wx_cv_type_getsockname3=socklen_t
 else
   echo "$as_me: failed program was:" >&5


@@ -47062,28 +47115,33 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockname3=size_t
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_type_getsockname3=size_t
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -47105,43 +47163,45 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockname3=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_type_getsockname3=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_type_getsockname3=unknown
+wx_cv_type_getsockname3=unknown

 
 fi
 
 fi

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

 
 fi
 
 fi

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

 
                         CFLAGS="$CFLAGS_OLD"
 
 
 fi
 
                         CFLAGS="$CFLAGS_OLD"
 
 
 fi

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

                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -47150,8 +47210,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockname3" >&5
-echo "${ECHO_T}$wx_cv_type_getsockname3" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_type_getsockname3" >&5
+echo "${ECHO_T}$wx_cv_type_getsockname3" >&6

 
         if test "$wx_cv_type_getsockname3" = "unknown"; then
             wxUSE_SOCKETS=no
 
         if test "$wx_cv_type_getsockname3" = "unknown"; then
             wxUSE_SOCKETS=no


@@ -47163,13 +47223,13 @@ echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;}
 _ACEOF
 
         fi
 _ACEOF
 
         fi

-                { echo "$as_me:$LINENO: checking what is the type of the fifth argument of getsockopt" >&5
-echo $ECHO_N "checking what is the type of the fifth argument of getsockopt... $ECHO_C" >&6; }
+                echo "$as_me:$LINENO: checking what is the type of the fifth argument of getsockopt" >&5
+echo $ECHO_N "checking what is the type of the fifth argument of getsockopt... $ECHO_C" >&6

 if test "${wx_cv_type_getsockopt5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "${wx_cv_type_getsockopt5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 

-                                                                                                ac_ext=cpp
+                                                                                                ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -47197,22 +47257,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockopt5=socklen_t
 else
   echo "$as_me: failed program was:" >&5
   wx_cv_type_getsockopt5=socklen_t
 else
   echo "$as_me: failed program was:" >&5


@@ -47241,28 +47306,33 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockopt5=size_t
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_type_getsockopt5=size_t
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext


@@ -47284,41 +47354,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockopt5=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   wx_cv_type_getsockopt5=int
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       wx_cv_type_getsockopt5=unknown
+wx_cv_type_getsockopt5=unknown

 
 fi
 
 fi

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

 
 fi
 
 fi

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

 
 
 fi
 
 
 fi

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

                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -47327,8 +47399,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
 
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockopt5" >&5
-echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_type_getsockopt5" >&5
+echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6

 
         if test "$wx_cv_type_getsockopt5" = "unknown"; then
             wxUSE_SOCKETS=no
 
         if test "$wx_cv_type_getsockopt5" = "unknown"; then
             wxUSE_SOCKETS=no


@@ -47428,9 +47500,9 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
 
         elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
         if test "$USE_DARWIN" = 1; then
 
         elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
         if test "$USE_DARWIN" = 1; then

-                        { echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5
-echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; }
-            ac_ext=cpp
+                        echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5
+echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6
+            ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


@@ -47454,40 +47526,43 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    wxUSE_JOYSTICK=yes
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
    wxUSE_JOYSTICK=yes
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-

 fi
 fi

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

             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 

-            { echo "$as_me:$LINENO: result: $wxUSE_JOYSTICK" >&5
-echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
+            echo "$as_me:$LINENO: result: $wxUSE_JOYSTICK" >&5
+echo "${ECHO_T}$wxUSE_JOYSTICK" >&6

         fi
 
         else
         fi
 
         else


@@ -47496,9 +47571,9 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
 for ac_header in linux/joystick.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 for ac_header in linux/joystick.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -47512,35 +47587,38 @@ $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       eval "$as_ac_Header=no"
+eval "$as_ac_Header=no"

 fi
 fi

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

 fi
 fi

-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1


@@ -47592,8 +47670,8 @@ _ACEOF
   fi
 
   if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
   fi
 
   if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then

-        { echo "$as_me:$LINENO: checking for main in -lunicows" >&5
-echo $ECHO_N "checking for main in -lunicows... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for main in -lunicows" >&5
+echo $ECHO_N "checking for main in -lunicows... $ECHO_C" >&6

 if test "${ac_cv_lib_unicows_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_lib_unicows_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -47610,43 +47688,46 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
 int
 main ()
 {

-return main ();
+main ();

   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_lib_unicows_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_lib_unicows_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_lib_unicows_main=no
+ac_cv_lib_unicows_main=no

 fi
 fi

-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f conftest.err conftest.$ac_objext \

       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_unicows_main" >&5
-echo "${ECHO_T}$ac_cv_lib_unicows_main" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_lib_unicows_main" >&5
+echo "${ECHO_T}$ac_cv_lib_unicows_main" >&6

 if test $ac_cv_lib_unicows_main = yes; then
 
                 cat >>confdefs.h <<\_ACEOF
 if test $ac_cv_lib_unicows_main = yes; then
 
                 cat >>confdefs.h <<\_ACEOF


@@ -47792,8 +47873,8 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                           -o "$wxUSE_CLIPBOARD"     = "yes" \
                           -o "$wxUSE_OLE"     = "yes" \
                           -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
                           -o "$wxUSE_CLIPBOARD"     = "yes" \
                           -o "$wxUSE_OLE"     = "yes" \
                           -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then

-    { echo "$as_me:$LINENO: checking for ole2.h" >&5
-echo $ECHO_N "checking for ole2.h... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for ole2.h" >&5
+echo $ECHO_N "checking for ole2.h... $ECHO_C" >&6

 if test "${ac_cv_header_ole2_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_ole2_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -47808,41 +47889,45 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <ole2.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <ole2.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_ole2_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_ole2_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_ole2_h=no
+ac_cv_header_ole2_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_ole2_h" >&5
-echo "${ECHO_T}$ac_cv_header_ole2_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_ole2_h" >&5
+echo "${ECHO_T}$ac_cv_header_ole2_h" >&6

 
 
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then
 
 
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then

-            { echo "$as_me:$LINENO: checking if g++ requires -fvtable-thunks" >&5
-echo $ECHO_N "checking if g++ requires -fvtable-thunks... $ECHO_C" >&6; }
+            echo "$as_me:$LINENO: checking if g++ requires -fvtable-thunks" >&5
+echo $ECHO_N "checking if g++ requires -fvtable-thunks... $ECHO_C" >&6

             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -47860,34 +47945,38 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                             WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks"
 fi
                             WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks"
 fi

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

             LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
             if test "$wxUSE_OLE" = "yes" ; then
                 cat >>confdefs.h <<\_ACEOF
             LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
             if test "$wxUSE_OLE" = "yes" ; then
                 cat >>confdefs.h <<\_ACEOF


@@ -48624,8 +48713,8 @@ if test "$wxUSE_WEBKIT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
         old_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="-x objective-c++ $CPPFLAGS"
     if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
         old_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="-x objective-c++ $CPPFLAGS"

-        { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5
-echo $ECHO_N "checking for WebKit/HIWebView.h... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5
+echo $ECHO_N "checking for WebKit/HIWebView.h... $ECHO_C" >&6

 if test "${ac_cv_header_WebKit_HIWebView_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_header_WebKit_HIWebView_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -48643,34 +48732,38 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <WebKit/HIWebView.h>
 _ACEOF
 rm -f conftest.$ac_objext
 #include <WebKit/HIWebView.h>
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_WebKit_HIWebView_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_cv_header_WebKit_HIWebView_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-       ac_cv_header_WebKit_HIWebView_h=no
+ac_cv_header_WebKit_HIWebView_h=no

 fi
 fi

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

 fi
 fi

-{ echo "$as_me:$LINENO: result: $ac_cv_header_WebKit_HIWebView_h" >&5
-echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_WebKit_HIWebView_h" >&5
+echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6

 if test $ac_cv_header_WebKit_HIWebView_h = yes; then
 
                            cat >>confdefs.h <<\_ACEOF
 if test $ac_cv_header_WebKit_HIWebView_h = yes; then
 
                            cat >>confdefs.h <<\_ACEOF


@@ -48991,55 +49084,58 @@ fi
 
 if test "$wxUSE_MSW" = 1 ; then
 
 
 if test "$wxUSE_MSW" = 1 ; then
 

-if test "$wxUSE_DC_CACHEING" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_DC_CACHEING" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DC_CACHEING 1
 _ACEOF
 
 #define wxUSE_DC_CACHEING 1
 _ACEOF
 

-fi
-
-if test "$wxUSE_INICONF" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_INICONF 1
-_ACEOF
-
-fi
+    fi

 
 

-if test "$wxUSE_DIB" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_DIB" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_WXDIB 1
 _ACEOF
 
 #define wxUSE_WXDIB 1
 _ACEOF
 

-fi
+    fi

 
 

-if test "$wxUSE_OWNER_DRAWN" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_OWNER_DRAWN 1
 _ACEOF
 
 #define wxUSE_OWNER_DRAWN 1
 _ACEOF
 

-fi
+    fi

 
 

-if test "$wxUSE_REGKEY" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_REGKEY 1
+    if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1

 _ACEOF
 
 _ACEOF
 

-fi
+    fi

 
 

-if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+    if test "$wxUSE_UXTHEME" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UXTHEME 1

 _ACEOF
 
 _ACEOF
 

+    fi
+

 fi
 
 fi
 

-if test "$wxUSE_UXTHEME" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_UXTHEME 1
+
+if test "$USE_WIN32" = 1 ; then
+    if test "$wxUSE_INICONF" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INICONF 1

 _ACEOF
 
 _ACEOF
 

-fi
+    fi
+
+    if test "$wxUSE_REGKEY" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REGKEY 1
+_ACEOF

 
 

+    fi

 fi
 
 
 fi
 
 


@@ -49057,8 +49153,8 @@ _ACEOF
    else
 
 pkg_failed=no
    else
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for CAIRO" >&5
-echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for CAIRO" >&5
+echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$CAIRO_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$CAIRO_CFLAGS"; then


@@ -49124,8 +49220,8 @@ echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CON
 else
        CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
        CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
 else
        CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
        CAIRO_LIBS=$pkg_cv_CAIRO_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GRAPHICS_CONTEXT 1
 _ACEOF
        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GRAPHICS_CONTEXT 1
 _ACEOF


@@ -49150,8 +49246,8 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
         if test "$wxUSE_GSTREAMER8" = "no"; then
 
 pkg_failed=no
         if test "$wxUSE_GSTREAMER8" = "no"; then
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for GST" >&5
-echo $ECHO_N "checking for GST... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for GST" >&5
+echo $ECHO_N "checking for GST... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then


@@ -49223,8 +49319,8 @@ echo "$as_me: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&2;}
 else
        GST_CFLAGS=$pkg_cv_GST_CFLAGS
        GST_LIBS=$pkg_cv_GST_LIBS
 else
        GST_CFLAGS=$pkg_cv_GST_CFLAGS
        GST_LIBS=$pkg_cv_GST_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 
                     wxUSE_GSTREAMER="yes"
                     GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
 
                     wxUSE_GSTREAMER="yes"
                     GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"


@@ -49238,8 +49334,8 @@ fi
             GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
 
 pkg_failed=no
             GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
 
 pkg_failed=no

-{ echo "$as_me:$LINENO: checking for GST" >&5
-echo $ECHO_N "checking for GST... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for GST" >&5
+echo $ECHO_N "checking for GST... $ECHO_C" >&6

 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then


@@ -49307,8 +49403,8 @@ echo "$as_me: WARNING: GStreamer 0.8/0.10 not available." >&2;}
 else
        GST_CFLAGS=$pkg_cv_GST_CFLAGS
        GST_LIBS=$pkg_cv_GST_LIBS
 else
        GST_CFLAGS=$pkg_cv_GST_CFLAGS
        GST_LIBS=$pkg_cv_GST_LIBS

-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

        wxUSE_GSTREAMER="yes"
 fi
         fi
        wxUSE_GSTREAMER="yes"
 fi
         fi


@@ -49514,6 +49610,7 @@ EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS_ODBC="$ODBC_LINK"
 EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
 EXTRALIBS_ODBC="$ODBC_LINK"
 EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then

+#    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT $EXTRALIBS_GTKPRINT`

     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then


@@ -49635,6 +49732,7 @@ fi
 
 
 
 
 
 

+

 
 
 TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
 
 
 TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`


@@ -49651,6 +49749,9 @@ case "$TOOLKIT" in
         TOOLKIT_DESC="GTK+"
         if test "$WXGTK20" = 1; then
             TOOLKIT_DESC="$TOOLKIT_DESC 2"
         TOOLKIT_DESC="GTK+"
         if test "$WXGTK20" = 1; then
             TOOLKIT_DESC="$TOOLKIT_DESC 2"

+            if test "$wxUSE_GTKPRINT" = "yes" ; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
+            fi

             if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint";
             fi
             if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint";
             fi


@@ -49682,8 +49783,8 @@ fi
 
 if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no
 then
 
 if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no
 then

-    { echo "$as_me:$LINENO: checking for gcc precompiled header bug" >&5
-echo $ECHO_N "checking for gcc precompiled header bug... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for gcc precompiled header bug" >&5
+echo $ECHO_N "checking for gcc precompiled header bug... $ECHO_C" >&6

 if test "${wx_cv_gcc_pch_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_gcc_pch_bug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -49719,8 +49820,8 @@ else
             rm -f conftest.h conftest.gch conftest.cpp conftest$PROGRAM_EXT
 
 fi
             rm -f conftest.h conftest.gch conftest.cpp conftest$PROGRAM_EXT
 
 fi

-{ echo "$as_me:$LINENO: result: $wx_cv_gcc_pch_bug" >&5
-echo "${ECHO_T}$wx_cv_gcc_pch_bug" >&6; }
+echo "$as_me:$LINENO: result: $wx_cv_gcc_pch_bug" >&5
+echo "${ECHO_T}$wx_cv_gcc_pch_bug" >&6

 
     if test "$wx_cv_gcc_pch_bug" = yes; then
                         bk_use_pch=no
 
     if test "$wx_cv_gcc_pch_bug" = yes; then
                         bk_use_pch=no


@@ -49745,8 +49846,8 @@ echo "$as_me: error: You must call the autoconf \"CANONICAL_HOST\" macro in your
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -49759,34 +49860,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then

-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -49799,41 +49898,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_RANLIB="ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 

+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"

 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
+  RANLIB=$ac_ct_RANLIB

 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi


@@ -49851,8 +49936,8 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.

-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6

 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -49874,7 +49959,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do

-       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+       if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then

          if test $ac_prog = install &&
            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
            # AIX install.  It has an incompatible calling convention.
          if test $ac_prog = install &&
            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
            # AIX install.  It has an incompatible calling convention.


@@ -49893,22 +49978,21 @@ case $as_dir/ in
     ;;
 esac
 done
     ;;
 esac
 done

-IFS=$as_save_IFS

 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
 
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else

-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will

     # break other packages using the cache if that directory is
     # break other packages using the cache if that directory is

-    # removed, or if the value is a relative name.
+    # removed, or if the path is relative.

     INSTALL=$ac_install_sh
   fi
 fi
     INSTALL=$ac_install_sh
   fi
 fi

-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6

 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.


@@ -49918,45 +50002,44 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 

-    { echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6

 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then

-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6

 fi
 
 
 fi
 
 

-    { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+    echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF

-SHELL = /bin/sh

 all:
 all:

-       @echo '@@@%%%=$(MAKE)=@@@%%%'
+       @echo 'ac_maketemp="$(MAKE)"'

 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.

-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi

 rm -f conftest.make
 fi
 rm -f conftest.make
 fi

-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

   SET_MAKE=
 else
   SET_MAKE=
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 


@@ -49974,8 +50057,8 @@ fi
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -49988,34 +50071,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_AR="${ac_tool_prefix}ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_AR="${ac_tool_prefix}ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then

-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50028,41 +50109,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_AR="ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_AR="ar"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 

+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"

 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_ct_AR" = x; then
-    AR="ar"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
+  AR=$ac_ct_AR

 else
   AR="$ac_cv_prog_AR"
 fi
 else
   AR="$ac_cv_prog_AR"
 fi


@@ -50074,8 +50141,8 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50088,34 +50155,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then

-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50128,41 +50193,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_STRIP="strip"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 

+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"

 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
+  STRIP=$ac_ct_STRIP

 else
   STRIP="$ac_cv_prog_STRIP"
 fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi


@@ -50170,8 +50221,8 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nm; ac_word=$2
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nm; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50184,34 +50235,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_NM="${ac_tool_prefix}nm"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_NM="${ac_tool_prefix}nm"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
 
 fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then

-  { echo "$as_me:$LINENO: result: $NM" >&5
-echo "${ECHO_T}$NM" >&6; }
+  echo "$as_me:$LINENO: result: $NM" >&5
+echo "${ECHO_T}$NM" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_prog_NM"; then
   ac_ct_NM=$NM
   # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2
 fi
 if test -z "$ac_cv_prog_NM"; then
   ac_ct_NM=$NM
   # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50224,41 +50273,27 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_NM="nm"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_NM="nm"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 

+  test -z "$ac_cv_prog_ac_ct_NM" && ac_cv_prog_ac_ct_NM=":"

 fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
 fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
-echo "${ECHO_T}$ac_ct_NM" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
+echo "${ECHO_T}$ac_ct_NM" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_ct_NM" = x; then
-    NM=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    NM=$ac_ct_NM
-  fi
+  NM=$ac_ct_NM

 else
   NM="$ac_cv_prog_NM"
 fi
 else
   NM="$ac_cv_prog_NM"
 fi


@@ -50283,8 +50318,8 @@ fi
 
     fi
 
 
     fi
 

-        { echo "$as_me:$LINENO: checking if make is GNU make" >&5
-echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6; }
+        echo "$as_me:$LINENO: checking if make is GNU make" >&5
+echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6

 if test "${bakefile_cv_prog_makeisgnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_prog_makeisgnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50297,8 +50332,8 @@ else
         fi
 
 fi
         fi
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_prog_makeisgnu" >&5
-echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_prog_makeisgnu" >&5
+echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6

 
     if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
         IF_GNU_MAKE=""
 
     if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
         IF_GNU_MAKE=""


@@ -50379,11 +50414,11 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
 
 
 
 
 
 

-    # Check whether --enable-omf was given.
+    # Check whether --enable-omf or --disable-omf was given.

 if test "${enable_omf+set}" = set; then
 if test "${enable_omf+set}" = set; then

-  enableval=$enable_omf; bk_os2_use_omf="$enableval"
-fi
-
+  enableval="$enable_omf"
+  bk_os2_use_omf="$enableval"
+fi;

 
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )
 
     case "${BAKEFILE_HOST}" in
       *-*-darwin* )


@@ -50627,8 +50662,8 @@ EOF
         SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
 
 
         SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
 
 

-                                { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
-echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6; }
+                                echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
+echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6

 if test "${bakefile_cv_gcc31+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${bakefile_cv_gcc31+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50654,22 +50689,27 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
                    bakefile_cv_gcc31=yes
 
 
                    bakefile_cv_gcc31=yes
 


@@ -50682,12 +50722,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
 
 fi

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

 
 fi
 
 fi

-{ echo "$as_me:$LINENO: result: $bakefile_cv_gcc31" >&5
-echo "${ECHO_T}$bakefile_cv_gcc31" >&6; }
+echo "$as_me:$LINENO: result: $bakefile_cv_gcc31" >&5
+echo "${ECHO_T}$bakefile_cv_gcc31" >&6

         if test "$bakefile_cv_gcc31" = "no"; then
                         SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
             SHARED_LD_CXX="$SHARED_LD_CC"
         if test "$bakefile_cv_gcc31" = "no"; then
                         SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
             SHARED_LD_CXX="$SHARED_LD_CC"


@@ -50719,8 +50758,8 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6; }
         else
                                     # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
 set dummy makeC++SharedLib; ac_word=$2
         else
                                     # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
 set dummy makeC++SharedLib; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -50733,28 +50772,26 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
 fi
 fi
 AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD
 if test -n "$AIX_CXX_LD"; then
 
   test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
 fi
 fi
 AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD
 if test -n "$AIX_CXX_LD"; then

-  { echo "$as_me:$LINENO: result: $AIX_CXX_LD" >&5
-echo "${ECHO_T}$AIX_CXX_LD" >&6; }
+  echo "$as_me:$LINENO: result: $AIX_CXX_LD" >&5
+echo "${ECHO_T}$AIX_CXX_LD" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

             SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
             SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
         fi
             SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
             SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
         fi


@@ -51346,20 +51383,20 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
 
 
 
 
 
 

-    # Check whether --enable-dependency-tracking was given.
+    # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.

 if test "${enable_dependency_tracking+set}" = set; then
 if test "${enable_dependency_tracking+set}" = set; then

-  enableval=$enable_dependency_tracking; bk_use_trackdeps="$enableval"
-fi
+  enableval="$enable_dependency_tracking"
+  bk_use_trackdeps="$enableval"
+fi;

 
 

-
-    { echo "$as_me:$LINENO: checking for dependency tracking method" >&5
-echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6; }
+    echo "$as_me:$LINENO: checking for dependency tracking method" >&5
+echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6

 
     BK_DEPS=""
     if test "x$bk_use_trackdeps" = "xno" ; then
         DEPS_TRACKING=0
 
     BK_DEPS=""
     if test "x$bk_use_trackdeps" = "xno" ; then
         DEPS_TRACKING=0

-        { echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6; }
+        echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6

     else
         DEPS_TRACKING=1
 
     else
         DEPS_TRACKING=1
 


@@ -51373,37 +51410,37 @@ echo "${ECHO_T}disabled" >&6; }
                     DEPSFLAG="-MMD"
                 ;;
             esac
                     DEPSFLAG="-MMD"
                 ;;
             esac

-            { echo "$as_me:$LINENO: result: gcc" >&5
-echo "${ECHO_T}gcc" >&6; }
+            echo "$as_me:$LINENO: result: gcc" >&5
+echo "${ECHO_T}gcc" >&6

         elif test "x$MWCC" = "xyes"; then
             DEPSMODE=mwcc
             DEPSFLAG="-MM"
         elif test "x$MWCC" = "xyes"; then
             DEPSMODE=mwcc
             DEPSFLAG="-MM"

-            { echo "$as_me:$LINENO: result: mwcc" >&5
-echo "${ECHO_T}mwcc" >&6; }
+            echo "$as_me:$LINENO: result: mwcc" >&5
+echo "${ECHO_T}mwcc" >&6

         elif test "x$SUNCC" = "xyes"; then
             DEPSMODE=unixcc
             DEPSFLAG="-xM1"
         elif test "x$SUNCC" = "xyes"; then
             DEPSMODE=unixcc
             DEPSFLAG="-xM1"

-            { echo "$as_me:$LINENO: result: Sun cc" >&5
-echo "${ECHO_T}Sun cc" >&6; }
+            echo "$as_me:$LINENO: result: Sun cc" >&5
+echo "${ECHO_T}Sun cc" >&6

         elif test "x$SGICC" = "xyes"; then
             DEPSMODE=unixcc
             DEPSFLAG="-M"
         elif test "x$SGICC" = "xyes"; then
             DEPSMODE=unixcc
             DEPSFLAG="-M"

-            { echo "$as_me:$LINENO: result: SGI cc" >&5
-echo "${ECHO_T}SGI cc" >&6; }
+            echo "$as_me:$LINENO: result: SGI cc" >&5
+echo "${ECHO_T}SGI cc" >&6

         elif test "x$HPCC" = "xyes"; then
             DEPSMODE=unixcc
             DEPSFLAG="+make"
         elif test "x$HPCC" = "xyes"; then
             DEPSMODE=unixcc
             DEPSFLAG="+make"

-            { echo "$as_me:$LINENO: result: HP cc" >&5
-echo "${ECHO_T}HP cc" >&6; }
+            echo "$as_me:$LINENO: result: HP cc" >&5
+echo "${ECHO_T}HP cc" >&6

         elif test "x$COMPAQCC" = "xyes"; then
             DEPSMODE=gcc
             DEPSFLAG="-MD"
         elif test "x$COMPAQCC" = "xyes"; then
             DEPSMODE=gcc
             DEPSFLAG="-MD"

-            { echo "$as_me:$LINENO: result: Compaq cc" >&5
-echo "${ECHO_T}Compaq cc" >&6; }
+            echo "$as_me:$LINENO: result: Compaq cc" >&5
+echo "${ECHO_T}Compaq cc" >&6

         else
             DEPS_TRACKING=0
         else
             DEPS_TRACKING=0

-            { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+            echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6

         fi
 
         if test $DEPS_TRACKING = 1 ; then
         fi
 
         if test $DEPS_TRACKING = 1 ; then


@@ -51525,8 +51562,8 @@ EOF
                         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
                         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -51539,34 +51576,32 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
 
 fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then

-  { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
+  echo "$as_me:$LINENO: result: $WINDRES" >&5
+echo "${ECHO_T}$WINDRES" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

 fi
 if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
 fi
 if test -z "$ac_cv_prog_WINDRES"; then
   ac_ct_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -51579,41 +51614,26 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_ac_ct_WINDRES="windres"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_ac_ct_WINDRES="windres"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
 fi
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
 
 fi
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then

-  { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
+echo "${ECHO_T}$ac_ct_WINDRES" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-  if test "x$ac_ct_WINDRES" = x; then
-    WINDRES=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    WINDRES=$ac_ct_WINDRES
-  fi
+  WINDRES=$ac_ct_WINDRES

 else
   WINDRES="$ac_cv_prog_WINDRES"
 fi
 else
   WINDRES="$ac_cv_prog_WINDRES"
 fi


@@ -51623,8 +51643,8 @@ fi
       *-*-darwin* | powerpc-apple-macos* )
             # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2
       *-*-darwin* | powerpc-apple-macos* )
             # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_REZ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_REZ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -51637,32 +51657,30 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_REZ="Rez"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_REZ="Rez"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
 fi
 fi
 REZ=$ac_cv_prog_REZ
 if test -n "$REZ"; then
 
   test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
 fi
 fi
 REZ=$ac_cv_prog_REZ
 if test -n "$REZ"; then

-  { echo "$as_me:$LINENO: result: $REZ" >&5
-echo "${ECHO_T}$REZ" >&6; }
+  echo "$as_me:$LINENO: result: $REZ" >&5
+echo "${ECHO_T}$REZ" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

             # Extract the first word of "SetFile", so it can be a program name with args.
 set dummy SetFile; ac_word=$2
             # Extract the first word of "SetFile", so it can be a program name with args.
 set dummy SetFile; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_prog_SETFILE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_prog_SETFILE+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -51675,28 +51693,26 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_prog_SETFILE="SetFile"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_prog_SETFILE="SetFile"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
 fi
 fi
 SETFILE=$ac_cv_prog_SETFILE
 if test -n "$SETFILE"; then
 
   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
 fi
 fi
 SETFILE=$ac_cv_prog_SETFILE
 if test -n "$SETFILE"; then

-  { echo "$as_me:$LINENO: result: $SETFILE" >&5
-echo "${ECHO_T}$SETFILE" >&6; }
+  echo "$as_me:$LINENO: result: $SETFILE" >&5
+echo "${ECHO_T}$SETFILE" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

         ;;
     esac
 
         ;;
     esac
 


@@ -51712,11 +51728,11 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2"
 
 
 
 
 
 

-    # Check whether --enable-precomp-headers was given.
+    # Check whether --enable-precomp-headers or --disable-precomp-headers was given.

 if test "${enable_precomp_headers+set}" = set; then
 if test "${enable_precomp_headers+set}" = set; then

-  enableval=$enable_precomp_headers; bk_use_pch="$enableval"
-fi
-
+  enableval="$enable_precomp_headers"
+  bk_use_pch="$enableval"
+fi;

 
     GCC_PCH=0
     ICC_PCH=0
 
     GCC_PCH=0
     ICC_PCH=0


@@ -51731,8 +51747,8 @@ fi
 
     if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
         if test "x$GCC" = "xyes"; then
 
     if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
         if test "x$GCC" = "xyes"; then

-                        { echo "$as_me:$LINENO: checking if the compiler supports precompiled headers" >&5
-echo $ECHO_N "checking if the compiler supports precompiled headers... $ECHO_C" >&6; }
+                        echo "$as_me:$LINENO: checking if the compiler supports precompiled headers" >&5
+echo $ECHO_N "checking if the compiler supports precompiled headers... $ECHO_C" >&6

             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


@@ -51762,25 +51778,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
 

-                    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                     GCC_PCH=1
 
 else
                     GCC_PCH=1
 
 else


@@ -51809,25 +51830,30 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
 }
 _ACEOF
 rm -f conftest.$ac_objext

-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
 

-                            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                             ICC_PCH=1
 
 else
                             ICC_PCH=1
 
 else


@@ -51835,16 +51861,14 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 
 fi
 
 fi

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

 
 fi
 
 fi

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

             if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
                 USE_PCH=1
 
             if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
                 USE_PCH=1
 


@@ -52793,6 +52817,89 @@ case ${INSTALL} in
      INSTALL=`pwd`/${INSTALL} ;;
 esac
 
      INSTALL=`pwd`/${INSTALL} ;;
 esac
 

+if test "$wxUSE_GUI" = "yes"; then
+
+if test "$wxUSE_MSW" = 1 ; then
+    if test "x$WINDRES" = "x"; then
+        { { echo "$as_me:$LINENO: error: Required windres program not found" >&5
+echo "$as_me: error: Required windres program not found" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    RESCOMP="$WINDRES"
+fi
+
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+            WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
+    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
+
+        LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+
+    # Extract the first word of "DeRez", so it can be a program name with args.
+set dummy DeRez; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_DEREZ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DEREZ="DeRez"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
+fi
+fi
+DEREZ=$ac_cv_prog_DEREZ
+if test -n "$DEREZ"; then
+  echo "$as_me:$LINENO: result: $DEREZ" >&5
+echo "${ECHO_T}$DEREZ" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+    MACSETFILE="\$(SETFILE)"
+
+            if test "$wxUSE_MAC" = 1; then
+        POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
+        RESCOMP="$REZ"
+        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
+    else
+        POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
+        RESCOMP="cat /dev/null \| $REZ"
+        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
+    fi
+
+else
+        MACSETFILE="@true"
+
+    if test "$wxUSE_PM" = 1; then
+        RESCOMP="emxbind"
+        WXCONFIG_RESFLAGS="-ep"
+
+                POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
+    else
+        POSTLINK_COMMAND="@true"
+    fi
+fi
+
+fi
+
+

 if test $GCC_PCH = 1
 then
     if test "$wx_cv_gcc_pch_bug" = yes; then
 if test $GCC_PCH = 1
 then
     if test "$wx_cv_gcc_pch_bug" = yes; then


@@ -52930,62 +53037,61 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
 
 
 

-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF

-SHELL = /bin/sh

 all:
 all:

-       @echo '@@@%%%=$(MAKE)=@@@%%%'
+       @echo 'ac_maketemp="$(MAKE)"'

 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.

-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi

 rm -f conftest.make
 fi
 rm -f conftest.make
 fi

-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

   SET_MAKE=
 else
   SET_MAKE=
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 
 
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 
 

-ac_config_headers="$ac_config_headers lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in"
+          ac_config_headers="$ac_config_headers lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in"

 
 
 if test "$USE_WIN32" = 1; then
 
 
 if test "$USE_WIN32" = 1; then

-    ac_config_commands="$ac_config_commands
+              ac_config_commands="$ac_config_commands

             rcdefs.h
         "
 
 fi
 
             rcdefs.h
         "
 
 fi
 

-ac_config_files="$ac_config_files lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in"
+          ac_config_files="$ac_config_files lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in"

 
 
 
 

-ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in"
+          ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in"

 
 
 if test "$wx_cv_version_script" = "yes"; then
 
 
 if test "$wx_cv_version_script" = "yes"; then

-    ac_config_files="$ac_config_files version-script"
+              ac_config_files="$ac_config_files version-script"

 
 fi
 
 fi

-ac_config_files="$ac_config_files Makefile"
+          ac_config_files="$ac_config_files Makefile"

 
 
 
 

-ac_config_commands="$ac_config_commands wx-config"
+          ac_config_commands="$ac_config_commands wx-config"

 
 
 
 
 
 


@@ -52997,21 +53103,21 @@ fi
 
 
 
 
 
 

-# Check whether --with-cppunit-prefix was given.
+# Check whether --with-cppunit-prefix or --without-cppunit-prefix was given.

 if test "${with_cppunit_prefix+set}" = set; then
 if test "${with_cppunit_prefix+set}" = set; then

-  withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
+  withval="$with_cppunit_prefix"
+  cppunit_config_prefix="$withval"

 else
   cppunit_config_prefix=""
 else
   cppunit_config_prefix=""

-fi
+fi;

 
 

-
-# Check whether --with-cppunit-exec-prefix was given.
+# Check whether --with-cppunit-exec-prefix or --without-cppunit-exec-prefix was given.

 if test "${with_cppunit_exec_prefix+set}" = set; then
 if test "${with_cppunit_exec_prefix+set}" = set; then

-  withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
+  withval="$with_cppunit_exec_prefix"
+  cppunit_config_exec_prefix="$withval"

 else
   cppunit_config_exec_prefix=""
 else
   cppunit_config_exec_prefix=""

-fi
-
+fi;

 
   if test x$cppunit_config_exec_prefix != x ; then
      cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
 
   if test x$cppunit_config_exec_prefix != x ; then
      cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"


@@ -53028,8 +53134,8 @@ fi
 
   # Extract the first word of "cppunit-config", so it can be a program name with args.
 set dummy cppunit-config; ac_word=$2
 
   # Extract the first word of "cppunit-config", so it can be a program name with args.
 set dummy cppunit-config; ac_word=$2

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

 if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else


@@ -53044,37 +53150,36 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

     ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
     ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done

-IFS=$as_save_IFS

 
   test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
   ;;
 esac
 fi
 CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
 
   test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
   ;;
 esac
 fi
 CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG

+

 if test -n "$CPPUNIT_CONFIG"; then
 if test -n "$CPPUNIT_CONFIG"; then

-  { echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5
-echo "${ECHO_T}$CPPUNIT_CONFIG" >&6; }
+  echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5
+echo "${ECHO_T}$CPPUNIT_CONFIG" >&6

 else
 else

-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-

   cppunit_version_min=1.8.0
 
   cppunit_version_min=1.8.0
 

-  { echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5
-echo $ECHO_N "checking for Cppunit - version >= $cppunit_version_min... $ECHO_C" >&6; }
+  echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5
+echo $ECHO_N "checking for Cppunit - version >= $cppunit_version_min... $ECHO_C" >&6

   no_cppunit=""
   if test "$CPPUNIT_CONFIG" = "no" ; then
   no_cppunit=""
   if test "$CPPUNIT_CONFIG" = "no" ; then

-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

     no_cppunit=yes
   else
     CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
     no_cppunit=yes
   else
     CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`


@@ -53104,11 +53209,11 @@ echo "${ECHO_T}no" >&6; }
         $cppunit_micro_version \>= $cppunit_micro_min `
 
     if test "$cppunit_version_proper" = "1" ; then
         $cppunit_micro_version \>= $cppunit_micro_min `
 
     if test "$cppunit_version_proper" = "1" ; then

-      { echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
-echo "${ECHO_T}$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
+      echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
+echo "${ECHO_T}$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6

     else
     else

-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

       no_cppunit=yes
     fi
   fi
       no_cppunit=yes
     fi
   fi


@@ -53158,7 +53263,7 @@ for subdir in `echo $SUBDIRS`; do
 
         for mkin in $makefiles ; do
             mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'`
 
         for mkin in $makefiles ; do
             mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'`

-            ac_config_files="$ac_config_files $mk"
+                      ac_config_files="$ac_config_files $mk"

 
         done
     fi
 
         done
     fi


@@ -53182,58 +53287,39 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.

-# So, we kill variables containing newlines.
+# So, don't put newlines in cache variables' values.

 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.

-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
+{

   (set) 2>&1 |
   (set) 2>&1 |

-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)

       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"

-      ;; #(
+      ;;

     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.

-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+       "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"

       ;;
       ;;

-    esac |
-    sort
-) |
+    esac;
+} |

   sed '
   sed '

-     /^ac_cv_env_/b end

      t clear
      t clear

-     :clear
+     : clear

      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end

-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"

     cat confcache >$cache_file
   else
     cat confcache >$cache_file
   else

-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    echo "not updating unwritable cache $cache_file"

   fi
 fi
 rm -f confcache
   fi
 fi
 rm -f confcache


@@ -53242,18 +53328,32 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 

+# 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[        ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[    ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[      ]*$//;
+}'
+fi
+

 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 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$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  ac_i=`echo "$ac_i" |
+        sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'

 done
 LIBOBJS=$ac_libobjs
 
 done
 LIBOBJS=$ac_libobjs
 


@@ -53284,45 +53384,17 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
 ## M4sh Initialization.  ##
 ## --------------------- ##
 

-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'

-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix

 fi
 fi

+DUALCASE=1; export DUALCASE # for MKS sh

 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then


@@ -53332,43 +53404,8 @@ else
 fi
 
 
 fi
 
 

-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-

 # Work around bugs in pre-3.0 UWIN ksh.
 # Work around bugs in pre-3.0 UWIN ksh.

-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH

 PS1='$ '
 PS2='> '
 PS4='+ '
 PS1='$ '
 PS2='> '
 PS4='+ '


@@ -53382,19 +53419,18 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else

-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+    $as_unset $as_var

   fi
 done
 
 # Required to use basename.
   fi
 done
 
 # Required to use basename.

-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then

   as_expr=expr
 else
   as_expr=false
 fi
 
   as_expr=expr
 else
   as_expr=false
 fi
 

-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then

   as_basename=basename
 else
   as_basename=false
   as_basename=basename
 else
   as_basename=false


@@ -53402,120 +53438,159 @@ fi
 
 
 # Name of the executable.
 
 
 # Name of the executable.

-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||

 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
         X"$0" : 'X\(//\)$' \| \
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
         X"$0" : 'X\(//\)$' \| \

-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+        X"$0" : 'X\(/\)$' \| \
+        .     : '\(.\)' 2>/dev/null ||

 echo X/"$0" |
 echo X/"$0" |

-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+         /^X\/\(\/\/\)$/{ s//\1/; q; }
+         /^X\/\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`

 
 

-# CDPATH.
-$as_unset CDPATH

 
 

+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits

 
 

+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done

 
 

+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+        case $as_dir in
+        /*)
+          if ("$as_dir/$as_base" -c '

   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO

+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

   test "x$as_lineno_1" != "x$as_lineno_2" &&
   test "x$as_lineno_1" != "x$as_lineno_2" &&

-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+            $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+            $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+            CONFIG_SHELL=$as_dir/$as_base
+            export CONFIG_SHELL
+            exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+          fi;;
+        esac
+       done
+done
+;;
+  esac

 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
 
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a

-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.

   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |

     sed '
     sed '

-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno

       N
       N

-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,

       t loop
       t loop

-      s/-\n.*//
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,

     ' >$as_me.lineno &&
     ' >$as_me.lineno &&

-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}

    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the

-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno

   # Exit status is that of the last command.
   exit
 }
 
 
   # Exit status is that of the last command.
   exit
 }
 
 

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='     ' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;

 esac
 
 esac
 

-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then

   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file

-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi

 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then

-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links

     as_ln_s='cp -p'
     as_ln_s='cp -p'

+  else
+    as_ln_s='ln -s'
+  fi

 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi

-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file

 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:


@@ -53524,28 +53599,7 @@ else
   as_mkdir_p=false
 fi
 
   as_mkdir_p=false
 fi
 

-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-       case $1 in
-        -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"

 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"


@@ -53554,14 +53608,31 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 

+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS="  $as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+

 exec 6>&1
 
 exec 6>&1
 

-# Save the log message, to keep $[0] and so on meaningful, and to
+# Open the log real soon, to keep \$[0] and so on meaningful, and to

 # report actual input values of CONFIG_FILES etc. instead of their
 # report actual input values of CONFIG_FILES etc. instead of their

-# values after options handling.
-ac_log="
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+

 This file was extended by wxWidgets $as_me 2.9.0, which was
 This file was extended by wxWidgets $as_me 2.9.0, which was

-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was

 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS


@@ -53569,20 +53640,30 @@ generated by GNU Autoconf 2.61.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 

-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5

 _ACEOF
 
 _ACEOF
 

-cat >>$CONFIG_STATUS <<_ACEOF

 # Files that config.status was made for.
 # Files that config.status was made for.

-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi

 
 

-_ACEOF
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi

 
 cat >>$CONFIG_STATUS <<\_ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF

+

 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.


@@ -53590,7 +53671,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit

-  -V, --version    print version number and configuration settings, then exit
+  -V, --version    print version number, then exit

   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions


@@ -53609,21 +53690,19 @@ Configuration commands:
 $config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."
 $config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."

-

 _ACEOF
 _ACEOF

+

 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 wxWidgets config.status 2.9.0
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 wxWidgets config.status 2.9.0

-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.59,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

 
 

-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.

 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."

-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
+srcdir=$srcdir
+INSTALL="$INSTALL"

 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF


@@ -53634,24 +53713,39 @@ while test $# != 0
 do
   case $1 in
   --*=*)
 do
   case $1 in
   --*=*)

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

     ac_shift=:
     ;;
     ac_shift=:
     ;;

-  *)
+  -*)

     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;

+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_option=$1
+     ac_need_defaults=false;;

   esac
 
   case $ac_option in
   # Handling of the options.
   esac
 
   case $ac_option in
   # Handling of the options.

+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF

   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;

-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )

     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift


@@ -53661,24 +53755,18 @@ do
     $ac_shift
     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
     $ac_shift
     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;

-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;

   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.

-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}

    { (exit 1); exit 1; }; } ;;
 
    { (exit 1); exit 1; }; } ;;
 

-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
+  *) ac_config_targets="$ac_config_targets $1" ;;

 
   esac
   shift
 
   esac
   shift


@@ -53694,29 +53782,18 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then

-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

 fi
 
 _ACEOF
 fi
 
 _ACEOF

-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5

 
 

-_ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF
 #
 cat >>$CONFIG_STATUS <<_ACEOF
 #

-# INIT-COMMANDS
+# INIT-COMMANDS section.

 #
 
 #
 

+

             CPP="$CPP"
             infile="$srcdir/include/wx/msw/genrcdefs.h"
             outdir="lib/wx/include/$TOOLCHAIN_FULLNAME/wx/msw"
             CPP="$CPP"
             infile="$srcdir/include/wx/msw/genrcdefs.h"
             outdir="lib/wx/include/$TOOLCHAIN_FULLNAME/wx/msw"


@@ -53730,28 +53807,27 @@ cat >>$CONFIG_STATUS <<_ACEOF
 
 _ACEOF
 
 
 _ACEOF
 

-cat >>$CONFIG_STATUS <<\_ACEOF

 
 

-# Handling of arguments.
+
+cat >>$CONFIG_STATUS <<\_ACEOF

 for ac_config_target in $ac_config_targets
 do
 for ac_config_target in $ac_config_targets
 do

-  case $ac_config_target in
-    "lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in" ;;
-    "rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;;
-    "lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;;
-    "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;;
-    "version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
-    "$mk") CONFIG_FILES="$CONFIG_FILES $mk" ;;
-
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "lib/wx/config/${TOOLCHAIN_FULLNAME}" ) CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;;
+  "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}" ) CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;;
+  "version-script" ) CONFIG_FILES="$CONFIG_FILES version-script" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "$mk" ) CONFIG_FILES="$CONFIG_FILES $mk" ;;
+  "rcdefs.h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;;
+  "wx-config" ) CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
+  "lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in" ;;

   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
 

-

 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely


@@ -53763,883 +53839,659 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree

-# simply because there is no reason against having it here, and in addition,
+# simply because there is no reason to put it here, and in addition,

 # creating and moving files from /tmp can sometimes cause problems.
 # creating and moving files from /tmp can sometimes cause problems.

-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# Create a temporary directory, and hook for its removal unless debugging.

 $debug ||
 {
 $debug ||
 {

-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0

   trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
   trap '{ (exit 1); exit 1; }' 1 2 13 15
 }

+

 # Create a (secure) tmp directory for tmp files.
 
 {
 # Create a (secure) tmp directory for tmp files.
 
 {

-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&

   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {

-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
+  tmp=./confstat$$-$RANDOM
+  (umask 077 && mkdir $tmp)

 } ||
 {
    echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
 } ||
 {
    echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 

-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-wx_top_builddir!$wx_top_builddir$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-AR!$AR$ac_delim
-subdirs!$subdirs$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-GTK_CFLAGS!$GTK_CFLAGS$ac_delim
-GTK_LIBS!$GTK_LIBS$ac_delim
-GTK_CONFIG!$GTK_CONFIG$ac_delim
-DIRECTFB_CFLAGS!$DIRECTFB_CFLAGS$ac_delim
-DIRECTFB_LIBS!$DIRECTFB_LIBS$ac_delim
-XMKMF!$XMKMF$ac_delim
-X_CFLAGS!$X_CFLAGS$ac_delim
-X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-X_LIBS!$X_LIBS$ac_delim
-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-PANGOX_CFLAGS!$PANGOX_CFLAGS$ac_delim
-PANGOX_LIBS!$PANGOX_LIBS$ac_delim
-PANGOFT2_CFLAGS!$PANGOFT2_CFLAGS$ac_delim
-PANGOFT2_LIBS!$PANGOFT2_LIBS$ac_delim
-PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim
-PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim
-CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
-CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
-REZ!$REZ$ac_delim
-DEREZ!$DEREZ$ac_delim
-SETFILE!$SETFILE$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-SDL_CONFIG!$SDL_CONFIG$ac_delim
-SDL_CFLAGS!$SDL_CFLAGS$ac_delim
-SDL_LIBS!$SDL_LIBS$ac_delim
-LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
-LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
-GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
-GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
-HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
-HILDON_LIBS!$HILDON_LIBS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

 _ACEOF
 _ACEOF

-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
-CAIRO_LIBS!$CAIRO_LIBS$ac_delim
-GST_CFLAGS!$GST_CFLAGS$ac_delim
-GST_LIBS!$GST_LIBS$ac_delim
-ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
-BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
-STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
-STD_GUI_LIBS!$STD_GUI_LIBS$ac_delim
-wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim
-wxUSE_REGEX!$wxUSE_REGEX$ac_delim
-wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim
-wxUSE_ODBC!$wxUSE_ODBC$ac_delim
-wxUSE_LIBJPEG!$wxUSE_LIBJPEG$ac_delim
-wxUSE_LIBPNG!$wxUSE_LIBPNG$ac_delim
-wxUSE_LIBTIFF!$wxUSE_LIBTIFF$ac_delim
-VENDOR!$VENDOR$ac_delim
-OFFICIAL_BUILD!$OFFICIAL_BUILD$ac_delim
-WX_FLAVOUR!$WX_FLAVOUR$ac_delim
-WX_LIB_FLAVOUR!$WX_LIB_FLAVOUR$ac_delim
-WXUNIV!$WXUNIV$ac_delim
-MONOLITHIC!$MONOLITHIC$ac_delim
-USE_PLUGINS!$USE_PLUGINS$ac_delim
-CXXWARNINGS!$CXXWARNINGS$ac_delim
-EXTRALIBS!$EXTRALIBS$ac_delim
-EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
-EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
-EXTRALIBS_ODBC!$EXTRALIBS_ODBC$ac_delim
-EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
-EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
-EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
-WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
-EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
-EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
-EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
-UNICODE!$UNICODE$ac_delim
-BUILD!$BUILD$ac_delim
-DEBUG_INFO!$DEBUG_INFO$ac_delim
-DEBUG_FLAG!$DEBUG_FLAG$ac_delim
-TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
-TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim
-SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim
-SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim
-HOST_SUFFIX!$HOST_SUFFIX$ac_delim
-CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
-CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
-RANLIB!$RANLIB$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-LN_S!$LN_S$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-MAKE_SET!$MAKE_SET$ac_delim
-AROPTIONS!$AROPTIONS$ac_delim
-STRIP!$STRIP$ac_delim
-NM!$NM$ac_delim
-INSTALL_DIR!$INSTALL_DIR$ac_delim
-LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim
-IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
-PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim
-PLATFORM_WIN32!$PLATFORM_WIN32$ac_delim
-PLATFORM_MSDOS!$PLATFORM_MSDOS$ac_delim
-PLATFORM_MAC!$PLATFORM_MAC$ac_delim
-PLATFORM_MACOS!$PLATFORM_MACOS$ac_delim
-PLATFORM_MACOSX!$PLATFORM_MACOSX$ac_delim
-PLATFORM_OS2!$PLATFORM_OS2$ac_delim
-PLATFORM_BEOS!$PLATFORM_BEOS$ac_delim
-SO_SUFFIX!$SO_SUFFIX$ac_delim
-SO_SUFFIX_MODULE!$SO_SUFFIX_MODULE$ac_delim
-DLLIMP_SUFFIX!$DLLIMP_SUFFIX$ac_delim
-LIBPREFIX!$LIBPREFIX$ac_delim
-LIBEXT!$LIBEXT$ac_delim
-DLLPREFIX!$DLLPREFIX$ac_delim
-DLLPREFIX_MODULE!$DLLPREFIX_MODULE$ac_delim
-dlldir!$dlldir$ac_delim
-AIX_CXX_LD!$AIX_CXX_LD$ac_delim
-SHARED_LD_CC!$SHARED_LD_CC$ac_delim
-SHARED_LD_CXX!$SHARED_LD_CXX$ac_delim
-SHARED_LD_MODULE_CC!$SHARED_LD_MODULE_CC$ac_delim
-SHARED_LD_MODULE_CXX!$SHARED_LD_MODULE_CXX$ac_delim
-PIC_FLAG!$PIC_FLAG$ac_delim
-WINDOWS_IMPLIB!$WINDOWS_IMPLIB$ac_delim
-USE_SOVERSION!$USE_SOVERSION$ac_delim
-USE_SOVERLINUX!$USE_SOVERLINUX$ac_delim
-USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim
-USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim
-USE_MACVERSION!$USE_MACVERSION$ac_delim
-USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim
-SONAME_FLAG!$SONAME_FLAG$ac_delim
-DEPS_TRACKING!$DEPS_TRACKING$ac_delim
-BK_DEPS!$BK_DEPS$ac_delim
-WINDRES!$WINDRES$ac_delim
-GCC_PCH!$GCC_PCH$ac_delim
-ICC_PCH!$ICC_PCH$ac_delim
-BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
-COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
-COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi

 
 cat >>$CONFIG_STATUS <<_ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF

-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
-COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
-COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
-COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
-COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
-COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
-COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
-COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
-COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
-COND_DEPS_TRACKING_0!$COND_DEPS_TRACKING_0$ac_delim
-COND_DEPS_TRACKING_1!$COND_DEPS_TRACKING_1$ac_delim
-COND_GCC_PCH_1!$COND_GCC_PCH_1$ac_delim
-COND_ICC_PCH_1!$COND_ICC_PCH_1$ac_delim
-COND_MONOLITHIC_0!$COND_MONOLITHIC_0$ac_delim
-COND_MONOLITHIC_0_SHARED_0!$COND_MONOLITHIC_0_SHARED_0$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_AUI_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1!$COND_MONOLITHIC_0_SHARED_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
-COND_MONOLITHIC_0_USE_AUI_1!$COND_MONOLITHIC_0_USE_AUI_1$ac_delim
-COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim
-COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1$ac_delim
-COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
-COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_USE_ODBC_1!$COND_MONOLITHIC_0_USE_ODBC_1$ac_delim
-COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
-COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
-COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim
-COND_MONOLITHIC_1!$COND_MONOLITHIC_1$ac_delim
-COND_MONOLITHIC_1_SHARED_0!$COND_MONOLITHIC_1_SHARED_0$ac_delim
-COND_MONOLITHIC_1_SHARED_1!$COND_MONOLITHIC_1_SHARED_1$ac_delim
-COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1!$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1$ac_delim
-COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1!$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1$ac_delim
-COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim
-COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
-COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF!$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
-COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
-COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
-COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
-COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
-COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim
-COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
-COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
-COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
-COND_PLATFORM_UNIX_1!$COND_PLATFORM_UNIX_1$ac_delim
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL$ac_delim
-COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1$ac_delim
-COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim
-COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
-COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
-COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
-COND_SHARED_0!$COND_SHARED_0$ac_delim
-COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
-COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
-COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
-COND_SHARED_0_USE_XRC_1!$COND_SHARED_0_USE_XRC_1$ac_delim
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_ODBC_BUILTIN!$COND_SHARED_0_WXUSE_ODBC_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
-COND_SHARED_1!$COND_SHARED_1$ac_delim
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
-COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
-COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
-COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
-COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
-COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
-COND_TOOLKIT_MOTIF_USE_GUI_1!$COND_TOOLKIT_MOTIF_USE_GUI_1$ac_delim
-COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_MSW!$COND_TOOLKIT_MSW$ac_delim
-COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim
-COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
-COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
-COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
-COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_WINCE!$COND_TOOLKIT_WINCE$ac_delim
-COND_TOOLKIT_WINCE_USE_GUI_1!$COND_TOOLKIT_WINCE_USE_GUI_1$ac_delim
-COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_WINCE_WXUNIV_0!$COND_TOOLKIT_WINCE_WXUNIV_0$ac_delim
-COND_TOOLKIT_X11!$COND_TOOLKIT_X11$ac_delim
-COND_TOOLKIT_X11_USE_GUI_1!$COND_TOOLKIT_X11_USE_GUI_1$ac_delim
-COND_UNICODE_1!$COND_UNICODE_1$ac_delim
-COND_USE_EXCEPTIONS_0!$COND_USE_EXCEPTIONS_0$ac_delim
-COND_USE_EXCEPTIONS_1!$COND_USE_EXCEPTIONS_1$ac_delim
-COND_USE_GUI_0!$COND_USE_GUI_0$ac_delim
-COND_USE_GUI_1!$COND_USE_GUI_1$ac_delim
-COND_USE_GUI_1_USE_OPENGL_1!$COND_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_USE_GUI_1_WXUNIV_0!$COND_USE_GUI_1_WXUNIV_0$ac_delim
-COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim
-COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
-COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
-COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
-COND_USE_ODBC_1!$COND_USE_ODBC_1$ac_delim
-COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
-COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
-COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
-COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
-COND_USE_RTTI_1!$COND_USE_RTTI_1$ac_delim
-COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim
-COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
-COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
-COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
-COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
-COND_USE_STC_1!$COND_USE_STC_1$ac_delim
-COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
-COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim
-COND_USE_XRC_1!$COND_USE_XRC_1$ac_delim
-COND_WINDOWS_IMPLIB_1!$COND_WINDOWS_IMPLIB_1$ac_delim
-COND_WITH_PLUGIN_SDL_1!$COND_WITH_PLUGIN_SDL_1$ac_delim
-COND_WXUNIV_0!$COND_WXUNIV_0$ac_delim
-COND_WXUNIV_1!$COND_WXUNIV_1$ac_delim
-COND_WXUSE_EXPAT_BUILTIN!$COND_WXUSE_EXPAT_BUILTIN$ac_delim
-COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim
-COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim
-COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
-COND_WXUSE_ODBC_BUILTIN!$COND_WXUSE_ODBC_BUILTIN$ac_delim
-COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
-COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
-SHARED!$SHARED$ac_delim
-WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
-WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
-USE_GUI!$USE_GUI$ac_delim
-AFMINSTALL!$AFMINSTALL$ac_delim
-WIN32INSTALL!$WIN32INSTALL$ac_delim
-TOOLKIT!$TOOLKIT$ac_delim
-TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
-TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
-TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
-cross_compiling!$cross_compiling$ac_delim
-WIDGET_SET!$WIDGET_SET$ac_delim
-WX_RELEASE!$WX_RELEASE$ac_delim
-WX_VERSION!$WX_VERSION$ac_delim
-WX_SUBVERSION!$WX_SUBVERSION$ac_delim
-WX_CHARTYPE!$WX_CHARTYPE$ac_delim
-WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
-WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
-WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
-WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
-WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
-WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
-WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
-WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
-EXE_LINKER!$EXE_LINKER$ac_delim
-GUIDIST!$GUIDIST$ac_delim
-DISTDIR!$DISTDIR$ac_delim
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done

 
 

-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+#
+# CONFIG_FILES section.
+#

 
 

-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-LDFLAGS_GL!$LDFLAGS_GL$ac_delim
-OPENGL_LIBS!$OPENGL_LIBS$ac_delim
-DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
-WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
-RESCOMP!$RESCOMP$ac_delim
-RESFLAGS!$RESFLAGS$ac_delim
-RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
-WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
-WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
-LIBWXMACRES!$LIBWXMACRES$ac_delim
-POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
-MACSETFILE!$MACSETFILE$ac_delim
-GCC!$GCC$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@target@,$target,;t t
+s,@target_cpu@,$target_cpu,;t t
+s,@target_vendor@,$target_vendor,;t t
+s,@target_os@,$target_os,;t t
+s,@wx_top_builddir@,$wx_top_builddir,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@AR@,$AR,;t t
+s,@ac_ct_AR@,$ac_ct_AR,;t t
+s,@subdirs@,$subdirs,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
+s,@GTK_LIBS@,$GTK_LIBS,;t t
+s,@GTK_CONFIG@,$GTK_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
+s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t
+s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t
+s,@X_CFLAGS@,$X_CFLAGS,;t t
+s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
+s,@X_LIBS@,$X_LIBS,;t t
+s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+s,@PANGOX_CFLAGS@,$PANGOX_CFLAGS,;t t
+s,@PANGOX_LIBS@,$PANGOX_LIBS,;t t
+s,@PANGOFT2_CFLAGS@,$PANGOFT2_CFLAGS,;t t
+s,@PANGOFT2_LIBS@,$PANGOFT2_LIBS,;t t
+s,@PANGOXFT_CFLAGS@,$PANGOXFT_CFLAGS,;t t
+s,@PANGOXFT_LIBS@,$PANGOXFT_LIBS,;t t
+s,@CFLAGS_VISIBILITY@,$CFLAGS_VISIBILITY,;t t
+s,@CXXFLAGS_VISIBILITY@,$CXXFLAGS_VISIBILITY,;t t
+s,@LIBICONV@,$LIBICONV,;t t
+s,@SDL_CONFIG@,$SDL_CONFIG,;t t
+s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t
+s,@SDL_LIBS@,$SDL_LIBS,;t t
+s,@GTKPRINT_CFLAGS@,$GTKPRINT_CFLAGS,;t t
+s,@GTKPRINT_LIBS@,$GTKPRINT_LIBS,;t t
+s,@LIBGNOMEPRINTUI_CFLAGS@,$LIBGNOMEPRINTUI_CFLAGS,;t t
+s,@LIBGNOMEPRINTUI_LIBS@,$LIBGNOMEPRINTUI_LIBS,;t t
+s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t
+s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t
+s,@HILDON_CFLAGS@,$HILDON_CFLAGS,;t t
+s,@HILDON_LIBS@,$HILDON_LIBS,;t t
+s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t
+s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
+s,@GST_CFLAGS@,$GST_CFLAGS,;t t
+s,@GST_LIBS@,$GST_LIBS,;t t
+s,@ALL_WX_LIBS@,$ALL_WX_LIBS,;t t
+s,@BUILT_WX_LIBS@,$BUILT_WX_LIBS,;t t
+s,@STD_BASE_LIBS@,$STD_BASE_LIBS,;t t
+s,@STD_GUI_LIBS@,$STD_GUI_LIBS,;t t
+s,@wxUSE_ZLIB@,$wxUSE_ZLIB,;t t
+s,@wxUSE_REGEX@,$wxUSE_REGEX,;t t
+s,@wxUSE_EXPAT@,$wxUSE_EXPAT,;t t
+s,@wxUSE_ODBC@,$wxUSE_ODBC,;t t
+s,@wxUSE_LIBJPEG@,$wxUSE_LIBJPEG,;t t
+s,@wxUSE_LIBPNG@,$wxUSE_LIBPNG,;t t
+s,@wxUSE_LIBTIFF@,$wxUSE_LIBTIFF,;t t
+s,@VENDOR@,$VENDOR,;t t
+s,@OFFICIAL_BUILD@,$OFFICIAL_BUILD,;t t
+s,@WX_FLAVOUR@,$WX_FLAVOUR,;t t
+s,@WX_LIB_FLAVOUR@,$WX_LIB_FLAVOUR,;t t
+s,@WXUNIV@,$WXUNIV,;t t
+s,@MONOLITHIC@,$MONOLITHIC,;t t
+s,@USE_PLUGINS@,$USE_PLUGINS,;t t
+s,@CXXWARNINGS@,$CXXWARNINGS,;t t
+s,@EXTRALIBS@,$EXTRALIBS,;t t
+s,@EXTRALIBS_XML@,$EXTRALIBS_XML,;t t
+s,@EXTRALIBS_HTML@,$EXTRALIBS_HTML,;t t
+s,@EXTRALIBS_ODBC@,$EXTRALIBS_ODBC,;t t
+s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t
+s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t
+s,@EXTRALIBS_SDL@,$EXTRALIBS_SDL,;t t
+s,@WITH_PLUGIN_SDL@,$WITH_PLUGIN_SDL,;t t
+s,@EXTRALIBS_GTKPRINT@,$EXTRALIBS_GTKPRINT,;t t
+s,@EXTRALIBS_GNOMEPRINT@,$EXTRALIBS_GNOMEPRINT,;t t
+s,@EXTRALIBS_GNOMEVFS@,$EXTRALIBS_GNOMEVFS,;t t
+s,@EXTRALIBS_HILDON@,$EXTRALIBS_HILDON,;t t
+s,@UNICODE@,$UNICODE,;t t
+s,@BUILD@,$BUILD,;t t
+s,@DEBUG_INFO@,$DEBUG_INFO,;t t
+s,@DEBUG_FLAG@,$DEBUG_FLAG,;t t
+s,@TOOLKIT_LOWERCASE@,$TOOLKIT_LOWERCASE,;t t
+s,@TOOLKIT_VERSION@,$TOOLKIT_VERSION,;t t
+s,@SAMPLES_RPATH_FLAG@,$SAMPLES_RPATH_FLAG,;t t
+s,@SAMPLES_RPATH_POSTLINK@,$SAMPLES_RPATH_POSTLINK,;t t
+s,@HOST_SUFFIX@,$HOST_SUFFIX,;t t
+s,@CPPUNIT_CFLAGS@,$CPPUNIT_CFLAGS,;t t
+s,@CPPUNIT_LIBS@,$CPPUNIT_LIBS,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@LN_S@,$LN_S,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@MAKE_SET@,$MAKE_SET,;t t
+s,@AROPTIONS@,$AROPTIONS,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@NM@,$NM,;t t
+s,@ac_ct_NM@,$ac_ct_NM,;t t
+s,@INSTALL_DIR@,$INSTALL_DIR,;t t
+s,@LDFLAGS_GUI@,$LDFLAGS_GUI,;t t
+s,@IF_GNU_MAKE@,$IF_GNU_MAKE,;t t
+s,@PLATFORM_UNIX@,$PLATFORM_UNIX,;t t
+s,@PLATFORM_WIN32@,$PLATFORM_WIN32,;t t
+s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t
+s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t
+s,@PLATFORM_MACOS@,$PLATFORM_MACOS,;t t
+s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
+s,@PLATFORM_OS2@,$PLATFORM_OS2,;t t
+s,@PLATFORM_BEOS@,$PLATFORM_BEOS,;t t
+s,@SO_SUFFIX@,$SO_SUFFIX,;t t
+s,@SO_SUFFIX_MODULE@,$SO_SUFFIX_MODULE,;t t
+s,@DLLIMP_SUFFIX@,$DLLIMP_SUFFIX,;t t
+s,@LIBPREFIX@,$LIBPREFIX,;t t
+s,@LIBEXT@,$LIBEXT,;t t
+s,@DLLPREFIX@,$DLLPREFIX,;t t
+s,@DLLPREFIX_MODULE@,$DLLPREFIX_MODULE,;t t
+s,@dlldir@,$dlldir,;t t
+s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
+s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
+s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
+s,@SHARED_LD_MODULE_CC@,$SHARED_LD_MODULE_CC,;t t
+s,@SHARED_LD_MODULE_CXX@,$SHARED_LD_MODULE_CXX,;t t
+s,@PIC_FLAG@,$PIC_FLAG,;t t
+s,@WINDOWS_IMPLIB@,$WINDOWS_IMPLIB,;t t
+s,@USE_SOVERSION@,$USE_SOVERSION,;t t
+s,@USE_SOVERLINUX@,$USE_SOVERLINUX,;t t
+s,@USE_SOVERSOLARIS@,$USE_SOVERSOLARIS,;t t
+s,@USE_SOVERCYGWIN@,$USE_SOVERCYGWIN,;t t
+s,@USE_MACVERSION@,$USE_MACVERSION,;t t
+s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t
+s,@SONAME_FLAG@,$SONAME_FLAG,;t t
+s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t
+s,@BK_DEPS@,$BK_DEPS,;t t
+s,@WINDRES@,$WINDRES,;t t
+s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
+s,@REZ@,$REZ,;t t
+s,@SETFILE@,$SETFILE,;t t
+s,@GCC_PCH@,$GCC_PCH,;t t
+s,@ICC_PCH@,$ICC_PCH,;t t
+s,@BK_MAKE_PCH@,$BK_MAKE_PCH,;t t
+s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
+s,@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT,;t t
+s,@COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT,;t t
+s,@COND_BUILD_DEBUG_UNICODE_0@,$COND_BUILD_DEBUG_UNICODE_0,;t t
+s,@COND_BUILD_DEBUG_UNICODE_1@,$COND_BUILD_DEBUG_UNICODE_1,;t t
+s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t
+s,@COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT@,$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT,;t t
+s,@COND_BUILD_RELEASE_UNICODE_0@,$COND_BUILD_RELEASE_UNICODE_0,;t t
+s,@COND_BUILD_RELEASE_UNICODE_1@,$COND_BUILD_RELEASE_UNICODE_1,;t t
+s,@COND_DEBUG_FLAG_1@,$COND_DEBUG_FLAG_1,;t t
+s,@COND_DEBUG_INFO_0@,$COND_DEBUG_INFO_0,;t t
+s,@COND_DEBUG_INFO_1@,$COND_DEBUG_INFO_1,;t t
+s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
+s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
+s,@COND_GCC_PCH_1@,$COND_GCC_PCH_1,;t t
+s,@COND_ICC_PCH_1@,$COND_ICC_PCH_1,;t t
+s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t
+s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_AUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@,$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_STC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@,$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_STC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1,;t t
+s,@COND_MONOLITHIC_0_USE_AUI_1@,$COND_MONOLITHIC_0_USE_AUI_1,;t t
+s,@COND_MONOLITHIC_0_USE_GUI_1@,$COND_MONOLITHIC_0_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1@,$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1,;t t
+s,@COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_USE_HTML_1@,$COND_MONOLITHIC_0_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_0_USE_MEDIA_1@,$COND_MONOLITHIC_0_USE_MEDIA_1,;t t
+s,@COND_MONOLITHIC_0_USE_ODBC_1@,$COND_MONOLITHIC_0_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_USE_QA_1@,$COND_MONOLITHIC_0_USE_QA_1,;t t
+s,@COND_MONOLITHIC_0_USE_RICHTEXT_1@,$COND_MONOLITHIC_0_USE_RICHTEXT_1,;t t
+s,@COND_MONOLITHIC_0_USE_STC_1@,$COND_MONOLITHIC_0_USE_STC_1,;t t
+s,@COND_MONOLITHIC_0_USE_XRC_1@,$COND_MONOLITHIC_0_USE_XRC_1,;t t
+s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t
+s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t
+s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_1,;t t
+s,@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1,;t t
+s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t
+s,@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1,;t t
+s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t
+s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_@,$COND_PLATFORM_MACOSX_1_TOOLKIT_,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@,$COND_PLATFORM_MACOSX_1_TOOLKIT_X11,;t t
+s,@COND_PLATFORM_MACOSX_1_USE_GUI_1@,$COND_PLATFORM_MACOSX_1_USE_GUI_1,;t t
+s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t
+s,@COND_PLATFORM_MACOS_1@,$COND_PLATFORM_MACOS_1,;t t
+s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
+s,@COND_PLATFORM_MSDOS_0@,$COND_PLATFORM_MSDOS_0,;t t
+s,@COND_PLATFORM_MSDOS_1@,$COND_PLATFORM_MSDOS_1,;t t
+s,@COND_PLATFORM_OS2_1@,$COND_PLATFORM_OS2_1,;t t
+s,@COND_PLATFORM_UNIX_0@,$COND_PLATFORM_UNIX_0,;t t
+s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t
+s,@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@,$COND_PLATFORM_UNIX_1_TOOLKIT_MGL,;t t
+s,@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@,$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1,;t t
+s,@COND_PLATFORM_UNIX_1_USE_GUI_1@,$COND_PLATFORM_UNIX_1_USE_GUI_1,;t t
+s,@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@,$COND_PLATFORM_UNIX_1_USE_PLUGINS_0,;t t
+s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t
+s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t
+s,@COND_SHARED_0@,$COND_SHARED_0,;t t
+s,@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@,$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0,;t t
+s,@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@,$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0,;t t
+s,@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@,$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0,;t t
+s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t
+s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_SHARED_0_USE_STC_1@,$COND_SHARED_0_USE_STC_1,;t t
+s,@COND_SHARED_0_USE_XRC_1@,$COND_SHARED_0_USE_XRC_1,;t t
+s,@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@,$COND_SHARED_0_WXUSE_EXPAT_BUILTIN,;t t
+s,@COND_SHARED_0_WXUSE_ODBC_BUILTIN@,$COND_SHARED_0_WXUSE_ODBC_BUILTIN,;t t
+s,@COND_SHARED_0_WXUSE_REGEX_BUILTIN@,$COND_SHARED_0_WXUSE_REGEX_BUILTIN,;t t
+s,@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@,$COND_SHARED_0_WXUSE_ZLIB_BUILTIN,;t t
+s,@COND_SHARED_1@,$COND_SHARED_1,;t t
+s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t
+s,@COND_SHARED_1_USE_XRC_1@,$COND_SHARED_1_USE_XRC_1,;t t
+s,@COND_TOOLKIT_@,$COND_TOOLKIT_,;t t
+s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t
+s,@COND_TOOLKIT_COCOA_USE_GUI_1@,$COND_TOOLKIT_COCOA_USE_GUI_1,;t t
+s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_DFB@,$COND_TOOLKIT_DFB,;t t
+s,@COND_TOOLKIT_DFB_USE_GUI_1@,$COND_TOOLKIT_DFB_USE_GUI_1,;t t
+s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t
+s,@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@,$COND_TOOLKIT_GTK_TOOLKIT_VERSION_,;t t
+s,@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@,$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2,;t t
+s,@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@,$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1,;t t
+s,@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@,$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1,;t t
+s,@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
+s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MSW_WXUNIV_0@,$COND_TOOLKIT_MSW_WXUNIV_0,;t t
+s,@COND_TOOLKIT_PM@,$COND_TOOLKIT_PM,;t t
+s,@COND_TOOLKIT_PM_USE_GUI_1@,$COND_TOOLKIT_PM_USE_GUI_1,;t t
+s,@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_WINCE@,$COND_TOOLKIT_WINCE,;t t
+s,@COND_TOOLKIT_WINCE_USE_GUI_1@,$COND_TOOLKIT_WINCE_USE_GUI_1,;t t
+s,@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_WINCE_WXUNIV_0@,$COND_TOOLKIT_WINCE_WXUNIV_0,;t t
+s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
+s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
+s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
+s,@COND_USE_EXCEPTIONS_0@,$COND_USE_EXCEPTIONS_0,;t t
+s,@COND_USE_EXCEPTIONS_1@,$COND_USE_EXCEPTIONS_1,;t t
+s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
+s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
+s,@COND_USE_GUI_1_USE_OPENGL_1@,$COND_USE_GUI_1_USE_OPENGL_1,;t t
+s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_USE_ODBC_1@,$COND_USE_ODBC_1,;t t
+s,@COND_USE_OPENGL_1@,$COND_USE_OPENGL_1,;t t
+s,@COND_USE_PCH_1@,$COND_USE_PCH_1,;t t
+s,@COND_USE_PLUGINS_0@,$COND_USE_PLUGINS_0,;t t
+s,@COND_USE_RTTI_0@,$COND_USE_RTTI_0,;t t
+s,@COND_USE_RTTI_1@,$COND_USE_RTTI_1,;t t
+s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
+s,@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@,$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1,;t t
+s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
+s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
+s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
+s,@COND_USE_STC_1@,$COND_USE_STC_1,;t t
+s,@COND_USE_THREADS_0@,$COND_USE_THREADS_0,;t t
+s,@COND_USE_THREADS_1@,$COND_USE_THREADS_1,;t t
+s,@COND_USE_XRC_1@,$COND_USE_XRC_1,;t t
+s,@COND_WINDOWS_IMPLIB_1@,$COND_WINDOWS_IMPLIB_1,;t t
+s,@COND_WITH_PLUGIN_SDL_1@,$COND_WITH_PLUGIN_SDL_1,;t t
+s,@COND_WXUNIV_0@,$COND_WXUNIV_0,;t t
+s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
+s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t
+s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
+s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
+s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
+s,@DEREZ@,$DEREZ,;t t
+s,@SHARED@,$SHARED,;t t
+s,@WX_LIBRARY_BASENAME_NOGUI@,$WX_LIBRARY_BASENAME_NOGUI,;t t
+s,@WX_LIBRARY_BASENAME_GUI@,$WX_LIBRARY_BASENAME_GUI,;t t
+s,@USE_GUI@,$USE_GUI,;t t
+s,@AFMINSTALL@,$AFMINSTALL,;t t
+s,@WIN32INSTALL@,$WIN32INSTALL,;t t
+s,@TOOLKIT@,$TOOLKIT,;t t
+s,@TOOLKIT_DIR@,$TOOLKIT_DIR,;t t
+s,@TOOLCHAIN_NAME@,$TOOLCHAIN_NAME,;t t
+s,@TOOLCHAIN_FULLNAME@,$TOOLCHAIN_FULLNAME,;t t
+s,@cross_compiling@,$cross_compiling,;t t
+s,@WIDGET_SET@,$WIDGET_SET,;t t
+s,@WX_RELEASE@,$WX_RELEASE,;t t
+s,@WX_VERSION@,$WX_VERSION,;t t
+s,@WX_SUBVERSION@,$WX_SUBVERSION,;t t
+s,@WX_CHARTYPE@,$WX_CHARTYPE,;t t
+s,@WX_DEBUGTYPE@,$WX_DEBUGTYPE,;t t
+s,@WXCONFIG_CPPFLAGS@,$WXCONFIG_CPPFLAGS,;t t
+s,@WXCONFIG_CFLAGS@,$WXCONFIG_CFLAGS,;t t
+s,@WXCONFIG_CXXFLAGS@,$WXCONFIG_CXXFLAGS,;t t
+s,@WXCONFIG_LIBS@,$WXCONFIG_LIBS,;t t
+s,@WXCONFIG_RPATH@,$WXCONFIG_RPATH,;t t
+s,@WXCONFIG_LDFLAGS_GUI@,$WXCONFIG_LDFLAGS_GUI,;t t
+s,@WXCONFIG_RESFLAGS@,$WXCONFIG_RESFLAGS,;t t
+s,@EXE_LINKER@,$EXE_LINKER,;t t
+s,@GUIDIST@,$GUIDIST,;t t
+s,@DISTDIR@,$DISTDIR,;t t
+s,@SAMPLES_SUBDIRS@,$SAMPLES_SUBDIRS,;t t
+s,@LDFLAGS_GL@,$LDFLAGS_GL,;t t
+s,@OPENGL_LIBS@,$OPENGL_LIBS,;t t
+s,@DMALLOC_LIBS@,$DMALLOC_LIBS,;t t
+s,@WX_VERSION_TAG@,$WX_VERSION_TAG,;t t
+s,@RESCOMP@,$RESCOMP,;t t
+s,@RESFLAGS@,$RESFLAGS,;t t
+s,@RESPROGRAMOBJ@,$RESPROGRAMOBJ,;t t
+s,@WX_RESOURCES_MACOSX_ASCII@,$WX_RESOURCES_MACOSX_ASCII,;t t
+s,@WX_RESOURCES_MACOSX_DATA@,$WX_RESOURCES_MACOSX_DATA,;t t
+s,@LIBWXMACRES@,$LIBWXMACRES,;t t
+s,@POSTLINK_COMMAND@,$POSTLINK_COMMAND,;t t
+s,@MACSETFILE@,$MACSETFILE,;t t
+s,@GCC@,$GCC,;t t
+s,@DLLTOOL@,$DLLTOOL,;t t
+s,@CPPUNIT_CONFIG@,$CPPUNIT_CONFIG,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+       ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+       ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat

   fi
   fi

-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+fi # test -n "$CONFIG_FILES"

 
 

-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof

 _ACEOF
 _ACEOF

-
-
-# 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[        ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[    ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[      ]*$//
-}'
-fi
-

 cat >>$CONFIG_STATUS <<\_ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF

-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) 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 `:'.
-        test -f "$ac_f" ||
-          case $ac_f in
-          [\\/$]*) false;;
-          *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-          esac ||
-          { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-         echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+       cat >$tmp/stdin
+       ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;

   esac
 
   esac
 

-  ac_dir=`$as_dirname -- "$ac_file" ||
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||

 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$ac_file" : 'X\(//\)[^/]' \| \
         X"$ac_file" : 'X\(//\)$' \| \
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$ac_file" : 'X\(//\)[^/]' \| \
         X"$ac_file" : 'X\(//\)$' \| \

-        X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+        X"$ac_file" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||

 echo X"$ac_file" |
 echo X"$ac_file" |

-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"

     as_dirs=
     as_dirs=

-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||

 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$as_dir" : 'X\(//\)[^/]' \| \
         X"$as_dir" : 'X\(//\)$' \| \
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$as_dir" : 'X\(//\)[^/]' \| \
         X"$as_dir" : 'X\(//\)$' \| \

-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||

 echo X"$as_dir" |
 echo X"$as_dir" |

-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`

     done
     done

-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

    { (exit 1); exit 1; }; }; }
    { (exit 1); exit 1; }; }; }

+

   ac_builddir=.
 
   ac_builddir=.
 

-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
+if test "$ac_dir" != .; then

   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi

 
 case $srcdir in
 
 case $srcdir in

-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.

     ac_srcdir=.
     ac_srcdir=.

-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.

     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_srcdir=$srcdir$ac_dir_suffix;

-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;

 esac
 esac

-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

 
 

+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac

 
 

-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #

 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;

-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;

   esac
   esac

-_ACEOF

 
 

-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                    sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+        # Absolute (can't be DOS-style, as IFS=:)
+        test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+        echo "$f";;
+      *) # Relative
+        if test -f "$f"; then
+          # Build tree
+          echo "$f"
+        elif test -f "$srcdir/$f"; then
+          # Source tree
+          echo "$srcdir/$f"
+        else
+          # /dev/null tree
+          { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+        fi;;
+      esac
+    done` || { (exit 1); exit 1; }

 _ACEOF
 _ACEOF

-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?

 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
 $extrasub
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
 $extrasub


@@ -54647,152 +54499,381 @@ _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b

-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+  # Run the commands associated with the file.

   case $ac_file in
   case $ac_file in

-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+    lib/wx/config/${TOOLCHAIN_FULLNAME} )  chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME}  ;;
+    lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} )  chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}  ;;

   esac
   esac

- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([  #]*\\)[^        ]*\\([  ]*'
-ac_dB='\\)[     (].*,\\1define\\2'
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_HEADER section.
+#
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s,^\([   ]*\)#\([        ]*define[       ][      ]*\)'
+ac_dB='[        ].*$,\1#\2'

 ac_dC=' '
 ac_dC=' '

-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-       t rset
-       :rset
-       s/^[     ]*#[    ]*define[       ][      ]*//
-       t ok
-       d
-       :ok
-       s/[\\&,]/\\&/g
-       s/^\('"$ac_word_re"'\)\(([^()]*)\)[      ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-       s/^\('"$ac_word_re"'\)[  ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
+ac_dD=',;t'
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_uA='s,^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
+ac_uB='$,\1#\2define\3'
+ac_uC=' '
+ac_uD=',;t'
+
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+       cat >$tmp/stdin
+       ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
+  esac
+
+  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+        # Absolute (can't be DOS-style, as IFS=:)
+        test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+        # Do quote $f, to prevent DOS paths from being IFS'd.
+        echo "$f";;
+      *) # Relative
+        if test -f "$f"; then
+          # Build tree
+          echo "$f"
+        elif test -f "$srcdir/$f"; then
+          # Source tree
+          echo "$srcdir/$f"
+        else
+          # /dev/null tree
+          { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+        fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+  # Remove the trailing spaces.
+  sed 's/[      ]*$//' $ac_file_inputs >$tmp/in
+
+_ACEOF
+
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
+# `conftest.undefs', that substitutes the proper values into
+# config.h.in to produce config.h.  The first handles `#define'
+# templates, and the second `#undef' templates.
+# And first: Protect against being on the right side of a sed subst in
+# config.status.  Protect against being in an unquoted here document
+# in config.status.
+rm -f conftest.defines conftest.undefs
+# Using a here document instead of a string reduces the quoting nightmare.
+# Putting comments in sed scripts is not portable.
+#
+# `end' is used to avoid that the second main sed command (meant for
+# 0-ary CPP macros) applies to n-ary macro definitions.
+# See the Autoconf documentation for `clear'.
+cat >confdef2sed.sed <<\_ACEOF
+s/[\\&,]/\\&/g
+s,[\\$`],\\&,g
+t clear
+: clear
+s,^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+t end
+s,^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+: end
+_ACEOF
+# If some macros were called several times there might be several times
+# the same #defines, which is useless.  Nevertheless, we may not want to
+# sort them, since we want the *last* AC-DEFINE to be honored.
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+rm -f confdef2sed.sed
+
+# This sed command replaces #undef with comments.  This is necessary, for

 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.

-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[    #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:         sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:        sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:    sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
+cat >>conftest.undefs <<\_ACEOF
+s,^[    ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+_ACEOF
+
+# Break up conftest.defines because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+echo '  if grep "^[     ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo '  :' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.defines >/dev/null

 do
 do

-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[     ]*#[    ]*undef[        ][      ]*$ac_word_re[  ]*\$/b def
-/^[     ]*#[    ]*define[       ][      ]*$ac_word_re[(         ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
+  echo '/^[     ]*#[    ]*define/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS

   echo 'CEOF
   echo 'CEOF

-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail

   rm -f conftest.defines
   mv conftest.tail conftest.defines
 done
   rm -f conftest.defines
   mv conftest.tail conftest.defines
 done

-rm -f conftest.defines conftest.tail
+rm -f conftest.defines
+echo '  fi # grep' >>$CONFIG_STATUS
+echo >>$CONFIG_STATUS
+
+# Break up conftest.undefs because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.undefs >/dev/null
+do
+  # Write a limited-size here document to $tmp/undefs.sed.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#undef'
+  echo '/^[     ]*#[    ]*undef/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+  rm -f conftest.undefs
+  mv conftest.tail conftest.undefs
+done
+rm -f conftest.undefs

 
 

-echo "ac_result=$ac_in" >>$CONFIG_STATUS

 cat >>$CONFIG_STATUS <<\_ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF

+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    echo "/* Generated by configure.  */" >$tmp/config.h
+  else
+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+  fi
+  cat $tmp/in >>$tmp/config.h
+  rm -f $tmp/in

   if test x"$ac_file" != x-; then
   if test x"$ac_file" != x-; then

-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then

       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else

+      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$ac_file" : 'X\(//\)[^/]' \| \
+        X"$ac_file" : 'X\(//\)$' \| \
+        X"$ac_file" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+      { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+

       rm -f $ac_file
       rm -f $ac_file

-      mv "$tmp/config.h" $ac_file
+      mv $tmp/config.h $ac_file

     fi
   else
     fi
   else

-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    cat $tmp/config.h
+    rm -f $tmp/config.h

   fi
   fi

-  rm -f "$tmp/out12"
- ;;
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF

 
 

-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$ac_dest" : 'X\(//\)[^/]' \| \
+        X"$ac_dest" : 'X\(//\)$' \| \
+        X"$ac_dest" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }

 
 

+  ac_builddir=.

 
 

-  case $ac_file$ac_mode in
-    "rcdefs.h":C)
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    rcdefs.h )

             mkdir -p $outdir &&
             $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
          ;;
             mkdir -p $outdir &&
             $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
          ;;

-    "lib/wx/config/${TOOLCHAIN_FULLNAME}":F)  chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME}  ;;
-    "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F)  chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}  ;;
-    "wx-config":C)  rm -f wx-config
+    wx-config )  rm -f wx-config

                      ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
                     ;;
                      ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
                     ;;

-

   esac
   esac

-done # for ac_tag
+done
+_ACEOF

 
 

+cat >>$CONFIG_STATUS <<\_ACEOF

 
 { (exit 0); exit 0; }
 _ACEOF
 
 { (exit 0); exit 0; }
 _ACEOF


@@ -54829,10 +54910,7 @@ if test "$no_recursion" != yes; then
   # Remove --cache-file and --srcdir arguments so they do not pile up.
   ac_sub_configure_args=
   ac_prev=
   # Remove --cache-file and --srcdir arguments so they do not pile up.
   ac_sub_configure_args=
   ac_prev=

-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
+  for ac_arg in $ac_configure_args; do

     if test -n "$ac_prev"; then
       ac_prev=
       continue
     if test -n "$ac_prev"; then
       ac_prev=
       continue


@@ -54855,123 +54933,123 @@ if test "$no_recursion" != yes; then
       ac_prev=prefix ;;
     -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
       ;;
       ac_prev=prefix ;;
     -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
       ;;

-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
+    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;

     esac
   done
 
   # Always prepend --prefix to ensure using the same prefix
   # in subdir configurations.
     esac
   done
 
   # Always prepend --prefix to ensure using the same prefix
   # in subdir configurations.

-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
+  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"

 
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
 
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.

-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    echo "$as_me:$LINENO: $ac_msg" >&5
-    echo "$ac_msg" >&6
-    { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    test -d $srcdir/$ac_dir || continue
+
+    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
+echo "$as_me: configuring in $ac_dir" >&6;}
+    { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"

     as_dirs=
     as_dirs=

-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||

 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$as_dir" : 'X\(//\)[^/]' \| \
         X"$as_dir" : 'X\(//\)$' \| \
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$as_dir" : 'X\(//\)[^/]' \| \
         X"$as_dir" : 'X\(//\)$' \| \

-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||

 echo X"$as_dir" |
 echo X"$as_dir" |

-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`

     done
     done

-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

    { (exit 1); exit 1; }; }; }
    { (exit 1); exit 1; }; }; }

+

     ac_builddir=.
 
     ac_builddir=.
 

-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
+if test "$ac_dir" != .; then

   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi

 
 case $srcdir in
 
 case $srcdir in

-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.

     ac_srcdir=.
     ac_srcdir=.

-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.

     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_srcdir=$srcdir$ac_dir_suffix;

-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;

 esac
 esac

-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

 
 
 
 

-    cd "$ac_dir"
+    cd $ac_dir

 
     # Check for guested configure; otherwise get Cygnus style configure.
 
     # Check for guested configure; otherwise get Cygnus style configure.

-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
+    if test -f $ac_srcdir/configure.gnu; then
+      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
+    elif test -f $ac_srcdir/configure; then
+      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
+    elif test -f $ac_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure

     else
       { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
     else
       { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}


@@ -54983,21 +55061,21 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       # Make the cache file name correct relative to the subdirectory.
       case $cache_file in
       [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
       # Make the cache file name correct relative to the subdirectory.
       case $cache_file in
       [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;

-      *) # Relative name.
-       ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
+      *) # Relative path.
+       ac_sub_cache_file=$ac_top_builddir$cache_file ;;

       esac
 
       esac
 

-      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}

       # The eval makes quoting arguments work.
       # The eval makes quoting arguments work.

-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-          --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
+      eval $ac_sub_configure $ac_sub_configure_args \
+          --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||

        { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
        { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
    { (exit 1); exit 1; }; }
     fi
 

-    cd "$ac_popdir"
+    cd $ac_popdir

   done
 fi
 
   done
 fi