]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
using WX_ATTRIBUTE_NORETURN for asserts
[wxWidgets.git] / configure
diff --git a/configure b/configure
index b72fffcca33fb7270e472863a0bfadd91328c0a1..80f2f30f3abb8537b57b74aa203bb4e561260d70 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,63 +1,86 @@
 #! /bin/sh
 #! /bin/sh
-# From configure.in Id: configure.in 47467 2007-07-14 19:17:21Z PC .
+# From configure.in Id.
 # 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.67 for wxWidgets 2.9.4.
 #
 # 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,
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
   # 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 ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
 esac
-
 fi
 
 
 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=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+       expr "X$arg" : "X\\(.*\\)$as_nl";
+       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
 fi
 
 
@@ -66,20 +89,18 @@ fi
 # 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.)
 # 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.
 IFS=" ""       $as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+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=.
   *[\\/]* ) 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
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
 IFS=$as_save_IFS
 
      ;;
@@ -90,354 +111,322 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; 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; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
 fi
 
-# 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
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  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
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # CDPATH.
 
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
 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
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
 
 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
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
 
-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; }
-") 2> /dev/null; then
-  :
 else
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 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_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
+  as_found=:
+  case $as_dir in #(
         /*)
           for as_base in sh bash ksh sh5; do
         /*)
           for as_base in sh bash ksh sh5; do
-            as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+            # Try only shells that exist, to save several forks.
+            as_shell=$as_dir/$as_base
+            if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+                   { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+                  if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
           done;;
        esac
           done;;
        esac
+  as_found=false
 done
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+             { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
 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.
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+       # neutralization value for shells without unset; and this also
+       # works around shells that cannot unset nonexistent variables.
+       BASH_ENV=/dev/null
+       ENV=/dev/null
+       (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+       export CONFIG_SHELL
+       exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 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
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: wx-dev@lists.wxwidgets.org about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
+  fi
+  exit 1
 fi
 fi
-
 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
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
 
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
 
-    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
-
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
 
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
 
 
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_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
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
 
 
 
-(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
-}
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
 
-exitcode=0
-if as_func_success; then
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
+  as_expr=false
 fi
 
 fi
 
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+  as_basename=false
 fi
 
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
 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
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+        X"$0" : 'X\(//\)$' \| \
+        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
 
 
+# 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
 
 
-  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" || {
 
 
-  # 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.
-  # (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.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
   sed -n '
     p
     /[$]LINENO/=
@@ -454,8 +443,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
       s/-\n.*//
     ' >$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; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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
 
   # 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
@@ -465,49 +453,40 @@ test \$exitcode = 0") || {
   exit
 }
 
   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=
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
   *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='        ';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  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
 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
-  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 ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  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 ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
 else
   as_ln_s='cp -p'
 fi
@@ -515,7 +494,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -532,12 +511,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+       test -d "$1/.";
       else
       else
-       case $1 in
-        -*)set "./$1";;
+       case $1 in #(
+       -*)set "./$1";;
        esac;
        esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
        ???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
        ???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -551,11 +530,11 @@ 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'"
 
 
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -570,14 +549,14 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
 
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.9.0'
-PACKAGE_STRING='wxWidgets 2.9.0'
+PACKAGE_VERSION='2.9.4'
+PACKAGE_STRING='wxWidgets 2.9.4'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
+PACKAGE_URL=''
 
 ac_unique_file="wx-config.in"
 # Factoring default headers for most tests.
 
 ac_unique_file="wx-config.in"
 # Factoring default headers for most tests.
@@ -616,412 +595,766 @@ ac_includes_default="\
 # 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
-RANLIB
-AR
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-STRIP
-WINDRES
+enable_option_checking=no
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+CPPUNIT_CONFIG
 DLLTOOL
 DLLTOOL
-IF_GNU_MAKE
-LN_S
-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
+GCC
+MACSETFILE
+POSTLINK_COMMAND
+LIBWXMACRES
+WX_RESOURCES_MACOSX_DATA
+WX_RESOURCES_MACOSX_ASCII
+RESPROGRAMOBJ
+RESFLAGS
+RESCOMP
+WX_VERSION_TAG
+DMALLOC_LIBS
+OPENGL_LIBS
+LDFLAGS_GL
+SAMPLES_SUBDIRS
+DISTDIR
+GUIDIST
+WXCONFIG_RESFLAGS
+WXCONFIG_LDFLAGS_GUI
+WXCONFIG_LDFLAGS
+WXCONFIG_RPATH
+WXCONFIG_LIBS
+WXCONFIG_CXXFLAGS
+WXCONFIG_CFLAGS
+WXCONFIG_CPPFLAGS
+WX_CHARTYPE
+WX_SUBVERSION
+WX_VERSION
+WX_RELEASE
+WIDGET_SET
+cross_compiling
+TOOLCHAIN_FULLNAME
+TOOLCHAIN_NAME
+TOOLKIT_DIR
+TOOLKIT
+WIN32INSTALL
+AFMINSTALL
+USE_GUI
+WX_LIBRARY_BASENAME_GUI
+WX_LIBRARY_BASENAME_NOGUI
+SHARED
 DEREZ
 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
-SET_MAKE
-MAKE_SET
-AROPTIONS
-NM
-INSTALL_DIR
-LDFLAGS_GUI
-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
-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
+COND_wxUSE_REGEX_builtin
+COND_wxUSE_LIBTIFF_builtin
+COND_wxUSE_LIBPNG_builtin
+COND_wxUSE_LIBJPEG_builtin
+COND_wxUSE_EXPAT_builtin
 COND_WXUSE_ZLIB_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
-CPPUNIT_CONFIG
-LIBOBJS
-LTLIBOBJS'
+COND_WXUSE_REGEX_BUILTIN
+COND_WXUSE_LIBTIFF_BUILTIN
+COND_WXUSE_LIBPNG_BUILTIN
+COND_WXUSE_LIBJPEG_BUILTIN
+COND_WXUSE_EXPAT_BUILTIN
+COND_WXUNIV_1
+COND_WXUNIV_0
+COND_WITH_PLUGIN_SDL_1
+COND_WINDOWS_IMPLIB_1
+COND_USE_XRC_1
+COND_USE_THREADS_1
+COND_USE_THREADS_0
+COND_USE_STC_1
+COND_USE_SOVERSOLARIS_1
+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1
+COND_USE_SOVERSION_0
+COND_USE_SOVERLINUX_1
+COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1
+COND_USE_SOTWOSYMLINKS_1
+COND_USE_RTTI_1
+COND_USE_RTTI_0
+COND_USE_PLUGINS_0
+COND_USE_PCH_1
+COND_USE_OPENGL_1
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
+COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
+COND_USE_GUI_1_WXUNIV_1
+COND_USE_GUI_1_WXUNIV_0
+COND_USE_GUI_1_USE_OPENGL_1
+COND_USE_GUI_1
+COND_USE_GUI_0
+COND_USE_EXCEPTIONS_1
+COND_USE_EXCEPTIONS_0
+COND_USE_CAIRO_1
+COND_UNICODE_1
+COND_TOOLKIT_X11_USE_GUI_1
+COND_TOOLKIT_X11
+COND_TOOLKIT_WINCE_WXUNIV_0
+COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_WINCE_USE_GUI_1
+COND_TOOLKIT_WINCE
+COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_PM_USE_GUI_1
+COND_TOOLKIT_PM
+COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_OSX_IPHONE_USE_GUI_1
+COND_TOOLKIT_OSX_IPHONE
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_TOOLKIT_OSX_COCOA
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_TOOLKIT_OSX_CARBON
+COND_TOOLKIT_MSW_WXUNIV_0
+COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_MSW_USE_GUI_1
+COND_TOOLKIT_MSW
+COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_MOTIF_USE_GUI_1
+COND_TOOLKIT_MOTIF
+COND_TOOLKIT_MAC
+COND_TOOLKIT_GTK_USE_GUI_1
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_
+COND_TOOLKIT_GTK
+COND_TOOLKIT_DFB_USE_GUI_1
+COND_TOOLKIT_DFB
+COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_COCOA_USE_GUI_1
+COND_TOOLKIT_COCOA
+COND_TOOLKIT_
+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
+COND_SHARED_1
+COND_SHARED_0_wxUSE_ZLIB_builtin
+COND_SHARED_0_wxUSE_REGEX_builtin
+COND_SHARED_0_wxUSE_EXPAT_builtin
+COND_SHARED_0_USE_STC_1
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
+COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
+COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
+COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
+COND_SHARED_0
+COND_PLATFORM_WIN32_1_SHARED_0
+COND_PLATFORM_WIN32_1
+COND_PLATFORM_WIN32_0
+COND_PLATFORM_UNIX_1_USE_PLUGINS_0
+COND_PLATFORM_UNIX_1_USE_GUI_1
+COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
+COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
+COND_PLATFORM_UNIX_1
+COND_PLATFORM_UNIX_0
+COND_PLATFORM_OS2_1
+COND_PLATFORM_MSDOS_1
+COND_PLATFORM_MSDOS_0
+COND_PLATFORM_MAC_1
+COND_PLATFORM_MAC_0
+COND_PLATFORM_MACOS_1
+COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
+COND_PLATFORM_MACOSX_1_USE_OPENGL_1
+COND_PLATFORM_MACOSX_1_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
+COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
+COND_PLATFORM_MACOSX_1
+COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
+COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
+COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1
+COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1
+COND_MONOLITHIC_1_SHARED_1
+COND_MONOLITHIC_1_SHARED_0
+COND_MONOLITHIC_1
+COND_MONOLITHIC_0_USE_XRC_1
+COND_MONOLITHIC_0_USE_WEBVIEW_1
+COND_MONOLITHIC_0_USE_STC_1
+COND_MONOLITHIC_0_USE_RICHTEXT_1
+COND_MONOLITHIC_0_USE_RIBBON_1
+COND_MONOLITHIC_0_USE_QA_1
+COND_MONOLITHIC_0_USE_PROPGRID_1
+COND_MONOLITHIC_0_USE_MEDIA_1
+COND_MONOLITHIC_0_USE_HTML_1
+COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
+COND_MONOLITHIC_0_USE_GUI_1
+COND_MONOLITHIC_0_USE_AUI_1
+COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
+COND_MONOLITHIC_0_SHARED_1_USE_STC_1
+COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1
+COND_MONOLITHIC_0_SHARED_1_USE_AUI_1
+COND_MONOLITHIC_0_SHARED_1
+COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
+COND_MONOLITHIC_0_SHARED_0_USE_STC_1
+COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1
+COND_MONOLITHIC_0_SHARED_0_USE_AUI_1
+COND_MONOLITHIC_0_SHARED_0
+COND_MONOLITHIC_0
+COND_ICC_PCH_1
+COND_GCC_PCH_1
+COND_DEPS_TRACKING_1
+COND_DEPS_TRACKING_0
+COND_DEBUG_INFO_1
+COND_DEBUG_INFO_0
+COND_DEBUG_FLAG_1
+COND_DEBUG_FLAG_0
+COND_BUILD_release_UNICODE_1
+COND_BUILD_release_UNICODE_0
+COND_BUILD_release_DEBUG_INFO_default
+COND_BUILD_release
+COND_BUILD_debug_UNICODE_1
+COND_BUILD_debug_UNICODE_0
+COND_BUILD_debug_DEBUG_INFO_default
+COND_BUILD_debug_DEBUG_FLAG_default
+COND_BUILD_debug
+COND_BUILD_RELEASE_UNICODE_1
+COND_BUILD_RELEASE_UNICODE_0
+COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
+COND_BUILD_RELEASE
+COND_BUILD_DEBUG_UNICODE_1
+COND_BUILD_DEBUG_UNICODE_0
+COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT
+COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
+COND_BUILD_DEBUG
+BK_MAKE_PCH
+ICC_PCH_USE_SWITCH
+ICC_PCH_CREATE_SWITCH
+ICC_PCH
+GCC_PCH
+OBJCXXFLAGS
+SETFILE
+REZ
+WINDRES
+BK_DEPS
+DEPS_TRACKING
+SONAME_FLAG
+USE_SOTWOSYMLINKS
+USE_MACVERSION
+USE_SOVERCYGWIN
+USE_SOVERSOLARIS
+USE_SOVERLINUX
+USE_SOVERSION
+WINDOWS_IMPLIB
+PIC_FLAG
+SHARED_LD_MODULE_CXX
+SHARED_LD_MODULE_CC
+SHARED_LD_CXX
+SHARED_LD_CC
+AIX_CXX_LD
+dlldir
+DLLPREFIX_MODULE
+DLLPREFIX
+LIBEXT
+LIBPREFIX
+DLLIMP_SUFFIX
+SO_SUFFIX_MODULE
+SO_SUFFIX
+PLATFORM_BEOS
+PLATFORM_OS2
+PLATFORM_MACOSX
+PLATFORM_MACOS
+PLATFORM_MAC
+PLATFORM_MSDOS
+PLATFORM_WIN32
+PLATFORM_UNIX
+IF_GNU_MAKE
+LDFLAGS_GUI
+INSTALL_DIR
+NM
+STRIP
+AROPTIONS
+MAKE_SET
+SET_MAKE
+LN_S
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+RANLIB
+CPPUNIT_LIBS
+CPPUNIT_CFLAGS
+HOST_SUFFIX
+HEADER_PAD_OPTION
+SAMPLES_RPATH_FLAG
+DYLIB_RPATH_POSTLINK
+DYLIB_RPATH_INSTALL
+TOOLKIT_VERSION
+TOOLKIT_LOWERCASE
+DEBUG_FLAG
+DEBUG_INFO
+UNICODE
+EXTRALIBS_HILDON
+EXTRALIBS_GNOMEVFS
+EXTRALIBS_GNOMEPRINT
+EXTRALIBS_GTKPRINT
+WITH_PLUGIN_SDL
+EXTRALIBS_STC
+EXTRALIBS_SDL
+EXTRALIBS_OPENGL
+EXTRALIBS_GUI
+EXTRALIBS_MEDIA
+EXTRALIBS_HTML
+EXTRALIBS_XML
+EXTRALIBS
+CXXWARNINGS
+USE_PLUGINS
+MONOLITHIC
+WXUNIV
+WX_LIB_FLAVOUR
+WX_FLAVOUR
+OFFICIAL_BUILD
+VENDOR
+wxUSE_LIBTIFF
+wxUSE_LIBPNG
+wxUSE_LIBJPEG
+wxUSE_EXPAT
+wxUSE_REGEX
+wxUSE_ZLIB
+STD_GUI_LIBS
+STD_BASE_LIBS
+BUILT_WX_LIBS
+ALL_WX_LIBS
+GST_LIBS
+GST_CFLAGS
+CAIRO_LIBS
+CAIRO_CFLAGS
+WEBKIT_LIBS
+WEBKIT_CFLAGS
+COND_PYTHON
+PYTHON
+HILDON2_LIBS
+HILDON2_CFLAGS
+HILDON_LIBS
+HILDON_CFLAGS
+GNOMEVFS_LIBS
+GNOMEVFS_CFLAGS
+LIBGNOMEPRINTUI_LIBS
+LIBGNOMEPRINTUI_CFLAGS
+GTKPRINT_LIBS
+GTKPRINT_CFLAGS
+SDL_LIBS
+SDL_CFLAGS
+SDL_CONFIG
+GXX_VERSION
+LIBICONV
+CXXFLAGS_VISIBILITY
+CFLAGS_VISIBILITY
+MesaGL_LIBS
+MesaGL_CFLAGS
+GLU_LIBS
+GLU_CFLAGS
+GL_LIBS
+GL_CFLAGS
+SM_LIBS
+SM_CFLAGS
+Xxf86vm_LIBS
+Xxf86vm_CFLAGS
+Xinerama_LIBS
+Xinerama_CFLAGS
+PANGOXFT_LIBS
+PANGOXFT_CFLAGS
+PANGOFT2_LIBS
+PANGOFT2_CFLAGS
+PANGOX_LIBS
+PANGOX_CFLAGS
+X_EXTRA_LIBS
+X_LIBS
+X_PRE_LIBS
+X_CFLAGS
+XMKMF
+DIRECTFB_LIBS
+DIRECTFB_CFLAGS
+GTK_CONFIG
+GTK_LIBS
+GTK_CFLAGS
+PKG_CONFIG
+subdirs
+CXXCPP
+OSX_SW_VERS
+AR
+ac_ct_CXX
+CXXFLAGS
+CXX
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+wx_top_builddir
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_gui
+enable_monolithic
+enable_plugins
+with_subdirs
+with_flavour
+enable_official_build
+enable_vendor
+enable_all_features
+enable_universal
+with_themes
+with_gtk
+with_motif
+with_osx_carbon
+with_osx_cocoa
+with_osx_iphone
+with_osx
+with_carbon
+with_cocoa
+with_iphone
+with_mac
+with_old_cocoa
+with_wine
+with_msw
+with_pm
+with_directfb
+with_microwin
+with_x11
+enable_nanox
+enable_gtk2
+enable_gpe
+with_libpng
+with_libjpeg
+with_libtiff
+with_libxpm
+with_libiconv
+with_libmspack
+with_gtkprint
+with_gnomeprint
+with_gnomevfs
+with_hildon
+with_opengl
+with_dmalloc
+with_sdl
+with_regex
+with_zlib
+with_expat
+with_macosx_sdk
+with_macosx_version_min
+enable_debug
+enable_debug_flag
+enable_debug_info
+enable_debug_gdb
+enable_debug_cntxt
+enable_mem_tracing
+enable_shared
+enable_stl
+enable_std_containers
+enable_std_iostreams
+enable_std_string
+enable_std_string_conv_in_wxstring
+enable_unicode
+enable_mslu
+enable_utf8
+enable_utf8only
+enable_extended_rtti
+enable_omf
+enable_optimise
+enable_profile
+enable_no_rtti
+enable_no_exceptions
+enable_permissive
+enable_no_deps
+enable_vararg_macros
+enable_universal_binary
+enable_macosx_arch
+enable_compat26
+enable_compat28
+enable_rpath
+enable_objc_uniquifying
+enable_visibility
+enable_tls
+enable_intl
+enable_xlocale
+enable_config
+enable_protocols
+enable_ftp
+enable_http
+enable_fileproto
+enable_sockets
+enable_ipv6
+enable_ole
+enable_dataobj
+enable_ipc
+enable_baseevtloop
+enable_epollloop
+enable_selectloop
+enable_any
+enable_apple_ieee
+enable_arcstream
+enable_base64
+enable_backtrace
+enable_catch_segvs
+enable_cmdline
+enable_datetime
+enable_debugreport
+enable_dialupman
+enable_dynlib
+enable_dynamicloader
+enable_exceptions
+enable_ffile
+enable_file
+enable_filehistory
+enable_filesystem
+enable_fontenum
+enable_fontmap
+enable_fs_archive
+enable_fs_inet
+enable_fs_zip
+enable_fswatcher
+enable_geometry
+enable_log
+enable_longlong
+enable_mimetype
+enable_printfposparam
+enable_snglinst
+enable_sound
+enable_stdpaths
+enable_stopwatch
+enable_streams
+enable_sysoptions
+enable_tarstream
+enable_textbuf
+enable_textfile
+enable_timer
+enable_variant
+enable_zipstream
+enable_url
+enable_protocol
+enable_protocol_http
+enable_protocol_ftp
+enable_protocol_file
+enable_threads
+enable_iniconf
+enable_regkey
+enable_docview
+enable_help
+enable_mshtmlhelp
+enable_html
+enable_htmlhelp
+enable_xrc
+enable_aui
+enable_propgrid
+enable_ribbon
+enable_stc
+enable_constraints
+enable_loggui
+enable_logwin
+enable_logdialog
+enable_mdi
+enable_mdidoc
+enable_mediactrl
+enable_gstreamer8
+enable_richtext
+enable_postscript
+enable_printarch
+enable_svg
+enable_webkit
+enable_webview
+enable_graphics_ctx
+enable_clipboard
+enable_dnd
+enable_controls
+enable_markup
+enable_accel
+enable_animatectrl
+enable_bannerwindow
+enable_artstd
+enable_arttango
+enable_bmpbutton
+enable_bmpcombobox
+enable_button
+enable_calendar
+enable_caret
+enable_checkbox
+enable_checklst
+enable_choice
+enable_choicebook
+enable_collpane
+enable_colourpicker
+enable_combobox
+enable_comboctrl
+enable_commandlinkbutton
+enable_dataviewctrl
+enable_datepick
+enable_detect_sm
+enable_dirpicker
+enable_display
+enable_editablebox
+enable_filectrl
+enable_filepicker
+enable_fontpicker
+enable_gauge
+enable_grid
+enable_headerctrl
+enable_hyperlink
+enable_imaglist
+enable_infobar
+enable_listbook
+enable_listbox
+enable_listctrl
+enable_notebook
+enable_notifmsg
+enable_odcombobox
+enable_popupwin
+enable_radiobox
+enable_radiobtn
+enable_richmsgdlg
+enable_richtooltip
+enable_rearrangectrl
+enable_sash
+enable_scrollbar
+enable_searchctrl
+enable_slider
+enable_spinbtn
+enable_spinctrl
+enable_splitter
+enable_statbmp
+enable_statbox
+enable_statline
+enable_stattext
+enable_statusbar
+enable_taskbaricon
+enable_tbarnative
+enable_textctrl
+enable_tipwindow
+enable_togglebtn
+enable_toolbar
+enable_toolbook
+enable_treebook
+enable_treectrl
+enable_treelist
+enable_commondlg
+enable_aboutdlg
+enable_choicedlg
+enable_coldlg
+enable_filedlg
+enable_finddlg
+enable_fontdlg
+enable_dirdlg
+enable_msgdlg
+enable_numberdlg
+enable_splash
+enable_textdlg
+enable_tipdlg
+enable_progressdlg
+enable_wizarddlg
+enable_menus
+enable_miniframe
+enable_tooltips
+enable_splines
+enable_mousewheel
+enable_validators
+enable_busyinfo
+enable_hotkey
+enable_joystick
+enable_metafile
+enable_dragimage
+enable_accessibility
+enable_uiactionsim
+enable_dctransform
+enable_webviewwebkit
+enable_palette
+enable_image
+enable_gif
+enable_pcx
+enable_tga
+enable_iff
+enable_pnm
+enable_xpm
+enable_ico_cur
+enable_dccache
+enable_ps_in_msw
+enable_ownerdrawn
+enable_uxtheme
+enable_wxdib
+enable_webviewie
+enable_autoidman
+enable_largefile
+enable_gtktest
+with_gtk_prefix
+with_gtk_exec_prefix
+with_x
+with_libiconv_prefix
+with_sdl_prefix
+with_sdl_exec_prefix
+enable_sdltest
+enable_dependency_tracking
+enable_precomp_headers
+with_cppunit_prefix
+with_cppunit_exec_prefix
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -1034,6 +1367,7 @@ CPP
 CXX
 CXXFLAGS
 CCC
 CXX
 CXXFLAGS
 CCC
+CXXCPP
 PKG_CONFIG
 DIRECTFB_CFLAGS
 DIRECTFB_LIBS
 PKG_CONFIG
 DIRECTFB_CFLAGS
 DIRECTFB_LIBS
@@ -1044,21 +1378,42 @@ PANGOFT2_CFLAGS
 PANGOFT2_LIBS
 PANGOXFT_CFLAGS
 PANGOXFT_LIBS
 PANGOFT2_LIBS
 PANGOXFT_CFLAGS
 PANGOXFT_LIBS
+Xinerama_CFLAGS
+Xinerama_LIBS
+Xxf86vm_CFLAGS
+Xxf86vm_LIBS
+SM_CFLAGS
+SM_LIBS
+GL_CFLAGS
+GL_LIBS
+GLU_CFLAGS
+GLU_LIBS
+MesaGL_CFLAGS
+MesaGL_LIBS
+GTKPRINT_CFLAGS
+GTKPRINT_LIBS
 LIBGNOMEPRINTUI_CFLAGS
 LIBGNOMEPRINTUI_LIBS
 GNOMEVFS_CFLAGS
 GNOMEVFS_LIBS
 HILDON_CFLAGS
 HILDON_LIBS
 LIBGNOMEPRINTUI_CFLAGS
 LIBGNOMEPRINTUI_LIBS
 GNOMEVFS_CFLAGS
 GNOMEVFS_LIBS
 HILDON_CFLAGS
 HILDON_LIBS
+HILDON2_CFLAGS
+HILDON2_LIBS
+WEBKIT_CFLAGS
+WEBKIT_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
 GST_CFLAGS
 GST_LIBS'
 CAIRO_CFLAGS
 CAIRO_LIBS
 GST_CFLAGS
 GST_LIBS'
-ac_subdirs_all='src/expat'
+ac_subdirs_all='src/tiff
+src/expat'
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1114,8 +1469,9 @@ do
   fi
 
   case $ac_option in
   fi
 
   case $ac_option in
-  *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)   ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1157,13 +1513,20 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { 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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1176,13 +1539,20 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { 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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$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- \
@@ -1373,22 +1743,36 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { 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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { 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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
 
   --x)
     # Obsolete; use --with-x.
@@ -1408,25 +1792,25 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1435,23 +1819,36 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
 fi
 
 fi
 
-# Be sure to have absolute directory names.
+# Check all directory arguments for consistency.
 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
 do
   eval ac_val=\$$ac_var
 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
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1465,8 +1862,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1481,23 +1878,21 @@ 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 .` ||
 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; }; }
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 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; }; }
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # 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.
 
 
 # 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" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$0" : 'X\(//\)[^/]' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_myself" : 'X\(//\)[^/]' \| \
+        X"$as_myself" : 'X\(//\)$' \| \
+        X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
            s//\1/
            q
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
            s//\1/
            q
@@ -1524,13 +1919,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 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
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
 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
-   { (exit 1); exit 1; }; }
+       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
        pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
        pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1556,7 +1949,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures wxWidgets 2.9.0 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.9.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1570,7 +1963,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1578,9 +1971,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                         [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                         [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1590,25 +1983,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
 For better control, use the options below.
 
 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]
-  --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]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --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]
 _ACEOF
 
   cat <<\_ACEOF
 _ACEOF
 
   cat <<\_ACEOF
@@ -1620,17 +2013,17 @@ X features:
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.9.0:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.9.4:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-gui           don't build GUI parts of the library
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-gui           don't build GUI parts of the library
@@ -1643,48 +2036,55 @@ Optional Features:
   --enable-nanox          use NanoX
   --disable-gtk2          use GTK+ 1.2 instead of 2.0
   --enable-gpe            use GNOME PDA Environment features if possible
   --enable-nanox          use NanoX
   --disable-gtk2          use GTK+ 1.2 instead of 2.0
   --enable-gpe            use GNOME PDA Environment features if possible
+  --enable-debug          build library for debugging
+  --disable-debug_flag    disable all debugging support
+  --enable-debug_info     generate debug information
+  --enable-debug_gdb      create code with extra GDB debugging information
+  --enable-debug_cntxt    obsolete, don't use: use wxDebugContext
+  --enable-mem_tracing    obsolete, don't use: create code with memory tracing
   --disable-shared        create static library instead of shared
   --disable-shared        create static library instead of shared
-  --disable-optimise      create optimised code
-  --enable-debug          same as debug_flag and debug_info
-  --enable-stl            use STL for containers
+  --enable-stl            use standard C++ classes for everything
+  --enable-std_containers use standard C++ container classes
   --enable-std_iostreams  use standard C++ stream classes
   --enable-std_string     use standard C++ string classes
   --enable-std_iostreams  use standard C++ stream classes
   --enable-std_string     use standard C++ string classes
+ --enable-std_string_conv_in_wxstring     provide implicit conversion to std::string in wxString
   --disable-unicode       compile without Unicode support
   --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)
   --enable-utf8           use UTF-8 representation for strings (Unix only)
   --disable-unicode       compile without Unicode support
   --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)
   --enable-utf8           use UTF-8 representation for strings (Unix only)
-  --enable-utf8only      only support UTF-8 locales in UTF-8 build (Unix only)
+  --enable-utf8only       only support UTF-8 locales in UTF-8 build (Unix only)
   --enable-extended_rtti  use extended RTTI (XTI)
   --enable-omf            use OMF object format
   --enable-extended_rtti  use extended RTTI (XTI)
   --enable-omf            use OMF object format
-  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
-  --enable-debug_info     create code with debugging information
-  --enable-debug_gdb      create code with extra GDB debugging information
-  --enable-debug_cntxt    use wxDebugContext
-  --enable-mem_tracing    create code with memory tracing
+  --disable-optimise      compile without optimisations
   --enable-profile        create code with profiling information
   --enable-no_rtti        create code without RTTI information
   --enable-no_exceptions  create code without C++ exceptions handling
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information
   --disable-vararg_macros don't use vararg macros, even if they are supported
   --enable-profile        create code with profiling information
   --enable-no_rtti        create code without RTTI information
   --enable-no_exceptions  create code without C++ exceptions handling
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information
   --disable-vararg_macros don't use vararg macros, even if they are supported
-  --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)
+  --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures
+  --enable-macosx_arch=ARCH  build for just the specified architecture
   --enable-compat26       enable wxWidgets 2.6 compatibility
   --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-objc_uniquifying enable Objective-C class name uniquifying
   --disable-visibility    disable use of ELF symbols visibility even if supported
   --enable-compat26       enable wxWidgets 2.6 compatibility
   --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-objc_uniquifying enable Objective-C class name uniquifying
   --disable-visibility    disable use of ELF symbols visibility even if supported
+  --disable-tls           disable use of compiler TLS support
   --enable-intl           use internationalization system
   --enable-intl           use internationalization system
+  --enable-xlocale        use x-locale support (requires wxLocale)
   --enable-config         use wxConfig (and derived) classes
   --enable-protocols      use wxProtocol and derived classes
   --enable-ftp            use wxFTP (requires wxProtocol
   --enable-http           use wxHTTP (requires wxProtocol
   --enable-fileproto      use wxFileProto class (requires wxProtocol
   --enable-sockets        use socket/network classes
   --enable-config         use wxConfig (and derived) classes
   --enable-protocols      use wxProtocol and derived classes
   --enable-ftp            use wxFTP (requires wxProtocol
   --enable-http           use wxHTTP (requires wxProtocol
   --enable-fileproto      use wxFileProto class (requires wxProtocol
   --enable-sockets        use socket/network classes
+  --enable-ipv6           enable IPv6 support in wxSocket
   --enable-ole            use OLE classes (Win32 only)
   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)
   --enable-ole            use OLE classes (Win32 only)
   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)
-  --enable-base-evtloop   use event loop in console programs too
-  --enable-epool-loop     use wxEpollDispatcher class (Linux only)
-  --enable-select-loop    use wxSelectDispatcher class
+  --enable-baseevtloop    use event loop in console programs too
+  --enable-epollloop      use wxEpollDispatcher class (Linux only)
+  --enable-selectloop     use wxSelectDispatcher class
+  --enable-any            use wxAny class
   --enable-apple_ieee     use the Apple IEEE codec
   --enable-arcstream      use wxArchive streams
   --enable-base64         use base64 encoding/decoding functions
   --enable-apple_ieee     use the Apple IEEE codec
   --enable-arcstream      use wxArchive streams
   --enable-base64         use base64 encoding/decoding functions
@@ -1699,16 +2099,21 @@ Optional Features:
   --enable-exceptions     build exception-safe library
   --enable-ffile          use wxFFile class
   --enable-file           use wxFile class
   --enable-exceptions     build exception-safe library
   --enable-ffile          use wxFFile class
   --enable-file           use wxFile class
+  --enable-filehistory    use wxFileHistory class
   --enable-filesystem     use virtual file systems classes
   --enable-filesystem     use virtual file systems classes
+  --enable-fontenum       use wxFontEnumerator class
   --enable-fontmap        use font encodings conversion classes
   --enable-fs_archive     use virtual archive filesystems
   --enable-fs_inet        use virtual HTTP/FTP filesystems
   --enable-fs_zip         now replaced by fs_archive
   --enable-fontmap        use font encodings conversion classes
   --enable-fs_archive     use virtual archive filesystems
   --enable-fs_inet        use virtual HTTP/FTP filesystems
   --enable-fs_zip         now replaced by fs_archive
+  --enable-fswatcher      use wxFileSystemWatcher class
   --enable-geometry       use geometry class
   --enable-log            use logging system
   --enable-longlong       use wxLongLong class
   --enable-mimetype       use wxMimeTypesManager
   --enable-geometry       use geometry class
   --enable-log            use logging system
   --enable-longlong       use wxLongLong class
   --enable-mimetype       use wxMimeTypesManager
+  --enable-printfposparam use wxVsnprintf() which supports positional parameters
   --enable-snglinst       use wxSingleInstanceChecker class
   --enable-snglinst       use wxSingleInstanceChecker class
+  --enable-sound          use wxSound class
   --enable-stdpaths       use wxStandardPaths class
   --enable-stopwatch      use wxStopWatch class
   --enable-streams        use wxStream etc classes
   --enable-stdpaths       use wxStandardPaths class
   --enable-stopwatch      use wxStopWatch class
   --enable-streams        use wxStream etc classes
@@ -1717,18 +2122,16 @@ Optional Features:
   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class
   --enable-timer          use wxTimer class
   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class
   --enable-timer          use wxTimer class
-  --enable-sound          use wxSound class
-  --enable-mediactrl      use wxMediaCtrl class
-  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
-  --enable-printfposparam use wxVsnprintf() which supports positional parameters
+  --enable-variant        use wxVariant class
   --enable-zipstream      use wxZip streams
   --enable-url            use wxURL class
   --enable-zipstream      use wxZip streams
   --enable-url            use wxURL class
-  --enable-variant        use wxVariant class
   --enable-protocol       use wxProtocol class
   --enable-protocol-http  HTTP support in wxProtocol
   --enable-protocol-ftp   FTP support in wxProtocol
   --enable-protocol-file  FILE support in wxProtocol
   --enable-threads        use threads
   --enable-protocol       use wxProtocol class
   --enable-protocol-http  HTTP support in wxProtocol
   --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)
@@ -1736,28 +2139,36 @@ Optional Features:
   --enable-htmlhelp       use wxHTML-based help
   --enable-xrc            use XRC resources sub-library
   --enable-aui            use AUI docking library
   --enable-htmlhelp       use wxHTML-based help
   --enable-xrc            use XRC resources sub-library
   --enable-aui            use AUI docking library
+  --enable-propgrid       use wxPropertyGrid library
+  --enable-ribbon         use wxRibbon library
   --enable-stc            use wxStyledTextCtrl library
   --enable-constraints    use layout-constraints system
   --enable-stc            use wxStyledTextCtrl library
   --enable-constraints    use layout-constraints system
-  --enable-printarch      use printing architecture
-  --enable-mdi            use multiple document interface architecture
-  --enable-mdidoc         use docview architecture with MDI
   --enable-loggui         use standard GUI logger
   --enable-logwin         use wxLogWindow
   --enable-logdialog      use wxLogDialog
   --enable-loggui         use standard GUI logger
   --enable-logwin         use wxLogWindow
   --enable-logdialog      use wxLogDialog
-  --enable-webkit         use wxWebKitCtrl (Mac)
-  --enable-richtext       use wxRichTextCtrl
-  --enable-graphics_ctx   use graphics context 2D drawing API
+  --enable-mdi            use multiple document interface architecture
+  --enable-mdidoc         use docview architecture with MDI
+  --enable-mediactrl      use wxMediaCtrl class
+  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
+  --enable-richtext       use wxRichTextCtrl
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)
+  --enable-printarch      use printing architecture
   --enable-svg            use wxSVGFileDC device context
   --enable-svg            use wxSVGFileDC device context
+  --enable-webkit         use wxWebKitCtrl (Mac-only, use wxWebView instead)
+  --enable-webview        use wxWebView library
+  --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
-  --enable-metafile       use win32 metafiles
   --disable-controls      disable compilation of all standard controls
   --disable-controls      disable compilation of all standard controls
+  --enable-markup         support wxControl::SetLabelMarkup
   --enable-accel          use accelerators
   --enable-animatectrl    use wxAnimationCtrl class
   --enable-accel          use accelerators
   --enable-animatectrl    use wxAnimationCtrl class
-  --enable-button         use wxButton class
+  --enable-bannerwindow   use wxBannerWindow class
+  --enable-artstd         use standard XPM icons in wxArtProvider
+  --enable-arttango       use Tango icons in wxArtProvider
   --enable-bmpbutton      use wxBitmapButton class
   --enable-bmpcombobox    use wxBitmapComboBox class
   --enable-bmpbutton      use wxBitmapButton class
   --enable-bmpcombobox    use wxBitmapComboBox class
+  --enable-button         use wxButton class
   --enable-calendar       use wxCalendarCtrl class
   --enable-caret          use wxCaret class
   --enable-checkbox       use wxCheckBox class
   --enable-calendar       use wxCalendarCtrl class
   --enable-caret          use wxCaret class
   --enable-checkbox       use wxCheckBox class
@@ -1768,25 +2179,34 @@ Optional Features:
   --enable-colourpicker   use wxColourPickerCtrl class
   --enable-combobox       use wxComboBox class
   --enable-comboctrl      use wxComboCtrl class
   --enable-colourpicker   use wxColourPickerCtrl class
   --enable-combobox       use wxComboBox class
   --enable-comboctrl      use wxComboCtrl class
+  --enable-commandlinkbutton      use wxCommmandLinkButton class
+  --enable-dataviewctrl   use wxDataViewCtrl class
   --enable-datepick       use wxDatePickerCtrl class
   --enable-datepick       use wxDatePickerCtrl class
+  --enable-detect_sm      use code to detect X11 session manager
   --enable-dirpicker      use wxDirPickerCtrl class
   --enable-display        use wxDisplay class
   --enable-dirpicker      use wxDirPickerCtrl class
   --enable-display        use wxDisplay class
-  --enable-detect_sm      use code to detect X11 session manager
   --enable-editablebox    use wxEditableListBox class
   --enable-editablebox    use wxEditableListBox class
+  --enable-filectrl       use wxFileCtrl class
   --enable-filepicker     use wxFilePickerCtrl class
   --enable-fontpicker     use wxFontPickerCtrl class
   --enable-gauge          use wxGauge class
   --enable-grid           use wxGrid class
   --enable-filepicker     use wxFilePickerCtrl class
   --enable-fontpicker     use wxFontPickerCtrl class
   --enable-gauge          use wxGauge class
   --enable-grid           use wxGrid class
-  --enable-dataviewctrl   use wxDataViewCtrl class
+  --enable-headerctrl     use wxHeaderCtrl class
   --enable-hyperlink      use wxHyperlinkCtrl class
   --enable-imaglist       use wxImageList class
   --enable-hyperlink      use wxHyperlinkCtrl class
   --enable-imaglist       use wxImageList class
+  --enable-infobar        use wxInfoBar class
   --enable-listbook       use wxListbook class
   --enable-listbox        use wxListBox class
   --enable-listctrl       use wxListCtrl class
   --enable-notebook       use wxNotebook class
   --enable-listbook       use wxListbook class
   --enable-listbox        use wxListBox class
   --enable-listctrl       use wxListCtrl class
   --enable-notebook       use wxNotebook class
+  --enable-notifmsg       use wxNotificationMessage class
   --enable-odcombobox     use wxOwnerDrawnComboBox class
   --enable-odcombobox     use wxOwnerDrawnComboBox class
+  --enable-popupwin       use wxPopUpWindow class
   --enable-radiobox       use wxRadioBox class
   --enable-radiobtn       use wxRadioButton class
   --enable-radiobox       use wxRadioBox class
   --enable-radiobtn       use wxRadioButton class
+  --enable-richmsgdlg     use wxRichMessageDialog class
+  --enable-richtooltip    use wxRichToolTip class
+  --enable-rearrangectrl  use wxRearrangeList/Ctrl/Dialog
   --enable-sash           use wxSashWindow class
   --enable-scrollbar      use wxScrollBar class and scrollable windows
   --enable-searchctrl     use wxSearchCtrl class
   --enable-sash           use wxSashWindow class
   --enable-scrollbar      use wxScrollBar class and scrollable windows
   --enable-searchctrl     use wxSearchCtrl class
@@ -1799,16 +2219,17 @@ Optional Features:
   --enable-statline       use wxStaticLine class
   --enable-stattext       use wxStaticText class
   --enable-statusbar      use wxStatusBar class
   --enable-statline       use wxStaticLine class
   --enable-stattext       use wxStaticText class
   --enable-statusbar      use wxStatusBar class
-  --enable-tabdialog      use wxTabControl class
+  --enable-taskbaricon    use wxTaskBarIcon class
+  --enable-tbarnative     use native wxToolBar class
   --enable-textctrl       use wxTextCtrl class
   --enable-textctrl       use wxTextCtrl class
+  --enable-timepick       use wxTimePickerCtrl class
+  --enable-tipwindow      use wxTipWindow class
   --enable-togglebtn      use wxToggleButton class
   --enable-toolbar        use wxToolBar class
   --enable-togglebtn      use wxToggleButton class
   --enable-toolbar        use wxToolBar class
-  --enable-tbarnative     use native wxToolBar class
-  --enable-treebook       use wxTreebook class
   --enable-toolbook       use wxToolbook class
   --enable-toolbook       use wxToolbook class
+  --enable-treebook       use wxTreebook class
   --enable-treectrl       use wxTreeCtrl class
   --enable-treectrl       use wxTreeCtrl class
-  --enable-tipwindow      use wxTipWindow class
-  --enable-popupwin       use wxPopUpWindow class
+  --enable-treelist       use wxTreeListCtrl class
   --enable-commondlg      use all common dialogs
   --enable-aboutdlg       use wxAboutBox
   --enable-choicedlg      use wxChoiceDialog
   --enable-commondlg      use all common dialogs
   --enable-aboutdlg       use wxAboutBox
   --enable-choicedlg      use wxChoiceDialog
@@ -1831,11 +2252,14 @@ Optional Features:
   --enable-mousewheel     use mousewheel
   --enable-validators     use wxValidator and derived classes
   --enable-busyinfo       use wxBusyInfo
   --enable-mousewheel     use mousewheel
   --enable-validators     use wxValidator and derived classes
   --enable-busyinfo       use wxBusyInfo
+  --enable-hotkey         use wxWindow::RegisterHotKey()
   --enable-joystick       use wxJoystick
   --enable-joystick       use wxJoystick
-  --enable-metafiles      use wxMetaFile (Win32 only)
+  --enable-metafiles      use wxMetaFile
   --enable-dragimage      use wxDragImage
   --enable-accessibility  enable accessibility support
   --enable-dragimage      use wxDragImage
   --enable-accessibility  enable accessibility support
-  --enable-dccache        cache temporary wxDC objects (Win32 only)
+  --enable-uiactionsim    use wxUIActionSimulator (experimental)
+  --enable-dctransform    use wxDC::SetTransformMatrix and related
+  --enable-webview-webkit use wxWebView WebKit backend
   --enable-palette        use wxPalette class
   --enable-image          use wxImage class
   --enable-gif            use gif images (GIF file format)
   --enable-palette        use wxPalette class
   --enable-image          use wxImage class
   --enable-gif            use gif images (GIF file format)
@@ -1844,7 +2268,14 @@ Optional Features:
   --enable-iff            use iff images (IFF file format)
   --enable-pnm            use pnm images (PNM file format)
   --enable-xpm            use xpm images (XPM file format)
   --enable-iff            use iff images (IFF file format)
   --enable-pnm            use pnm images (PNM file format)
   --enable-xpm            use xpm images (XPM file format)
-  --enable-icocur         use Windows ICO and CUR formats
+  --enable-ico_cur        use Windows ICO and CUR formats
+  --enable-dccache        cache temporary wxDC objects (Win32 only)
+  --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
+  --enable-ownerdrawn     use owner drawn controls (Win32 and OS/2 only)
+  --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
+  --enable-wxdib          use wxDIB class (Win32 only)
+  --enable-webview-ie     use wxWebView IE backend (Win32 only)
+  --enable-autoidman      use automatic ids management
   --disable-largefile     omit support for large files
   --disable-gtktest       do not try to compile and run a test GTK+ program
   --disable-gtktest       Do not try to compile and run a test GTK program
   --disable-largefile     omit support for large files
   --disable-gtktest       do not try to compile and run a test GTK+ program
   --disable-gtktest       Do not try to compile and run a test GTK program
@@ -1864,12 +2295,18 @@ Optional Packages:
   --with-themes=all|list  use only the specified comma-separated list of wxUniversal themes
   --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"
   --with-motif            use Motif/Lesstif
   --with-themes=all|list  use only the specified comma-separated list of wxUniversal themes
   --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"
   --with-motif            use Motif/Lesstif
-  --with-mac              use Mac OS X
-  --with-cocoa            use Cocoa
+  --with-osx_carbon       use Mac OS X (Carbon)
+  --with-osx_cocoa        use Mac OS X (Cocoa)
+  --with-osx_iphone       use iPhone OS X port
+  --with-osx              use Mac OS X (default port, currently Carbon)
+  --with-carbon           same as --with-osx_carbon
+  --with-cocoa            same as --with-osx_cocoa
+  --with-iphone           same as --with-osx_iphone
+  --with-mac              same as --with-osx
+  --with-old_cocoa        use old, deprecated, Cocoa port
   --with-wine             use Wine
   --with-msw              use MS-Windows
   --with-pm               use OS/2 Presentation Manager
   --with-wine             use Wine
   --with-msw              use MS-Windows
   --with-pm               use OS/2 Presentation Manager
-  --with-mgl              use SciTech MGL
   --with-directfb         use DirectFB
   --with-microwin         use MicroWindows
   --with-x11              use X11
   --with-directfb         use DirectFB
   --with-microwin         use MicroWindows
   --with-x11              use X11
@@ -1877,17 +2314,20 @@ Optional Packages:
   --with-libjpeg          use libjpeg (JPEG file format)
   --with-libtiff          use libtiff (TIFF file format)
   --with-libxpm           use libxpm (XPM file format)
   --with-libjpeg          use libjpeg (JPEG file format)
   --with-libtiff          use libtiff (TIFF file format)
   --with-libxpm           use libxpm (XPM file format)
+  --with-libiconv         use libiconv (character conversion)
   --with-libmspack        use libmspack (CHM help files loading)
   --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
   --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
+  --with-hildon           use Hildon framework for Nokia 770/800/810
   --with-opengl           use OpenGL (or Mesa)
   --with-dmalloc          use dmalloc library (http://dmalloc.com/)
   --with-sdl              use SDL for audio on Unix
   --with-regex            enable support for wxRegEx class
   --with-zlib             use zlib for LZW compression
   --with-opengl           use OpenGL (or Mesa)
   --with-dmalloc          use dmalloc library (http://dmalloc.com/)
   --with-sdl              use SDL for audio on Unix
   --with-regex            enable support for wxRegEx class
   --with-zlib             use zlib for LZW compression
-  --with-odbc             use the IODBC and wxODBC classes
   --with-expat            enable XML support using expat parser
   --with-expat            enable XML support using expat parser
+  --with-macosx-sdk=PATH  use an OS X SDK at PATH
+  --with-macosx-version-min=VER   build binaries which require at least this OS X version
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
   --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
   --with-x                use the X Window System
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
   --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
   --with-x                use the X Window System
@@ -1903,11 +2343,12 @@ Some influential environment variables:
   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>
   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
+  CPPFLAGS    (Objective) 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
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
   PKG_CONFIG  path to pkg-config utility
   DIRECTFB_CFLAGS
               C compiler flags for DIRECTFB, overriding pkg-config
   PKG_CONFIG  path to pkg-config utility
   DIRECTFB_CFLAGS
               C compiler flags for DIRECTFB, overriding pkg-config
@@ -1925,6 +2366,27 @@ 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
+  Xinerama_CFLAGS
+              C compiler flags for Xinerama, overriding pkg-config
+  Xinerama_LIBS
+              linker flags for Xinerama, overriding pkg-config
+  Xxf86vm_CFLAGS
+              C compiler flags for Xxf86vm, overriding pkg-config
+  Xxf86vm_LIBS
+              linker flags for Xxf86vm, overriding pkg-config
+  SM_CFLAGS   C compiler flags for SM, overriding pkg-config
+  SM_LIBS     linker flags for SM, overriding pkg-config
+  GL_CFLAGS   C compiler flags for GL, overriding pkg-config
+  GL_LIBS     linker flags for GL, overriding pkg-config
+  GLU_CFLAGS  C compiler flags for GLU, overriding pkg-config
+  GLU_LIBS    linker flags for GLU, overriding pkg-config
+  MesaGL_CFLAGS
+              C compiler flags for MesaGL, overriding pkg-config
+  MesaGL_LIBS linker flags for MesaGL, 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
@@ -1936,6 +2398,13 @@ Some influential environment variables:
   HILDON_CFLAGS
               C compiler flags for HILDON, overriding pkg-config
   HILDON_LIBS linker flags for HILDON, overriding pkg-config
   HILDON_CFLAGS
               C compiler flags for HILDON, overriding pkg-config
   HILDON_LIBS linker flags for HILDON, overriding pkg-config
+  HILDON2_CFLAGS
+              C compiler flags for HILDON2, overriding pkg-config
+  HILDON2_LIBS
+              linker flags for HILDON2, overriding pkg-config
+  WEBKIT_CFLAGS
+              C compiler flags for WEBKIT, overriding pkg-config
+  WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config
   CAIRO_CFLAGS
               C compiler flags for CAIRO, overriding pkg-config
   CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
   CAIRO_CFLAGS
               C compiler flags for CAIRO, overriding pkg-config
   CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
@@ -1953,15 +2422,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_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/ ;;
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1997,7 +2468,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2006,22 +2477,857 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWidgets configure 2.9.0
-generated by GNU Autoconf 2.61
+wxWidgets configure 2.9.4
+generated by GNU Autoconf 2.67
 
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+                       if test $ac_lo -le $ac_mid; then
+                         ac_lo= ac_hi=
+                         break
+                       fi
+                       as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+                       if test $ac_mid -le $ac_hi; then
+                         ac_lo= ac_hi=
+                         break
+                       fi
+                       as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+       return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+       return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_cxx_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_header_compile
+
+# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
+# ---------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_cxx_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+        return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+           return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+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
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_type
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+        test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_cxx_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval "test \"\${$3+set}\"" = set; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ----------------------------------------- ##
+## Report this to wx-dev@lists.wxwidgets.org ##
+## ----------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_cxx_check_header_mongrel
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); 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 $2
+
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval "test \"\${$3+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+        return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+           return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+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
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 cat >config.log <<_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
-generated by GNU Autoconf 2.61.  Invocation command line was
+It was created by wxWidgets $as_me 2.9.4, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
 
   $ $0 $@
 
@@ -2057,8 +3363,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
 IFS=$as_save_IFS
 
 } >&5
@@ -2092,12 +3398,12 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
        ac_must_keep_next=false # Got value, back to normal.
       else
       if test $ac_must_keep_next = true; then
        ac_must_keep_next=false # Got value, back to normal.
       else
@@ -2113,13 +3419,13 @@ do
          -* ) ac_must_keep_next=true ;;
        esac
       fi
          -* ) ac_must_keep_next=true ;;
        esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -2131,11 +3437,9 @@ trap 'exit_status=$?
   {
     echo
 
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2144,12 +3448,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
     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;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
       esac ;;
     esac
   done
@@ -2168,128 +3473,136 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 )
     echo
 
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
       eval ac_val=\$$ac_var
       case $ac_val in
     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"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
        eval ac_val=\$$ac_var
        case $ac_val in
       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"`;;
+       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
        esac
        esac
-       echo "$ac_var='\''$ac_val'\''"
+       $as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo
       cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_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
 
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
 else
-  set x "$ac_default_prefix/share/config.site" \
-       "$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
 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;}
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
 if test -r "$cache_file"; then
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
   >$cache_file
 fi
 
@@ -2303,68 +3616,56 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
   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
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-       { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-       { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-       { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-       ac_cache_corrupted=:
+       # differences in whitespace do not lead to failure.
+       ac_old_val_w=`echo x $ac_old_val`
+       ac_new_val_w=`echo x $ac_new_val`
+       if test "$ac_old_val_w" != "$ac_new_val_w"; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+         ac_cache_corrupted=:
+       else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+         eval $ac_var=\$ac_old_val
+       fi
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
       fi;;
   esac
   # 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=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2393,9 +3694,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
   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;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2409,35 +3708,27 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 
 # 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;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&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 &&
 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 &&
-  { { 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; }; }
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
 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;}
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 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; }; };;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2453,28 +3744,24 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
 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; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&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` ||
 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;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 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; }; };;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2490,55 +3777,19 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 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; }
-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;}
-   { (exit 1); exit 1; }; }
-fi
 
 
+if test "$cross_compiling" != "no"; then
+    HOST_PREFIX="${host_alias}-"
+    HOST_SUFFIX="-$host_alias"
+else
+    HOST_PREFIX=
+    HOST_SUFFIX=
 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
-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
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 wx_major_version_number=2
 wx_minor_version_number=9
 
 
 wx_major_version_number=2
 wx_minor_version_number=9
-wx_release_number=0
+wx_release_number=4
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -2575,12 +3826,13 @@ USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB"
 
 
-DEFAULT_wxUSE_COCOA=0
+DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_GTK=0
-DEFAULT_wxUSE_MAC=0
-DEFAULT_wxUSE_MGL=0
+DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
@@ -2588,10 +3840,11 @@ DEFAULT_wxUSE_PM=0
 DEFAULT_wxUSE_X11=0
 DEFAULT_wxUSE_DFB=0
 
 DEFAULT_wxUSE_X11=0
 DEFAULT_wxUSE_DFB=0
 
-DEFAULT_DEFAULT_wxUSE_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
-DEFAULT_DEFAULT_wxUSE_MGL=0
+DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
@@ -2600,9 +3853,9 @@ DEFAULT_DEFAULT_wxUSE_X11=0
 DEFAULT_DEFAULT_wxUSE_DFB=0
 
 PROGRAM_EXT=
 DEFAULT_DEFAULT_wxUSE_DFB=0
 
 PROGRAM_EXT=
-SO_SUFFIX=so
 SAMPLES_RPATH_FLAG=
 SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
 
 DEFAULT_STD_FLAG=yes
 
 
 DEFAULT_STD_FLAG=yes
 
@@ -2611,26 +3864,19 @@ case "${host}" in
     USE_HPUX=1
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
     USE_HPUX=1
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
-    SO_SUFFIX=sl
-    cat >>confdefs.h <<\_ACEOF
-#define __HPUX__ 1
-_ACEOF
+    $as_echo "#define __HPUX__ 1" >>confdefs.h
 
 
             CPPFLAGS="-D_HPUX_SOURCE $CPPFLAGS"
   ;;
   *-*-linux* )
     USE_LINUX=1
 
 
             CPPFLAGS="-D_HPUX_SOURCE $CPPFLAGS"
   ;;
   *-*-linux* )
     USE_LINUX=1
-    cat >>confdefs.h <<\_ACEOF
-#define __LINUX__ 1
-_ACEOF
+    $as_echo "#define __LINUX__ 1" >>confdefs.h
 
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
 
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
-      cat >>confdefs.h <<\_ACEOF
-#define __ALPHA__ 1
-_ACEOF
+      $as_echo "#define __ALPHA__ 1" >>confdefs.h
 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
@@ -2640,9 +3886,7 @@ _ACEOF
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
-      cat >>confdefs.h <<\_ACEOF
-#define __ALPHA__ 1
-_ACEOF
+      $as_echo "#define __ALPHA__ 1" >>confdefs.h
 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
@@ -2650,31 +3894,27 @@ _ACEOF
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
     USE_SVR4=1
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
     USE_SVR4=1
-    cat >>confdefs.h <<\_ACEOF
-#define __SGI__ 1
-_ACEOF
+    $as_echo "#define __SGI__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SVR4__ 1
-_ACEOF
+    $as_echo "#define __SVR4__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
+  *-*-qnx*)
+    USE_QNX=1
+    $as_echo "#define __QNX__ 1" >>confdefs.h
+
+    DEFAULT_DEFAULT_wxUSE_X11=1
+  ;;
   *-*-solaris2* )
     USE_SUN=1
     USE_SOLARIS=1
     USE_SVR4=1
   *-*-solaris2* )
     USE_SUN=1
     USE_SOLARIS=1
     USE_SVR4=1
-    cat >>confdefs.h <<\_ACEOF
-#define __SUN__ 1
-_ACEOF
+    $as_echo "#define __SUN__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SOLARIS__ 1
-_ACEOF
+    $as_echo "#define __SOLARIS__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SVR4__ 1
-_ACEOF
+    $as_echo "#define __SVR4__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
@@ -2683,56 +3923,38 @@ _ACEOF
     USE_SUN=1
     USE_SUNOS=1
     USE_BSD=1
     USE_SUN=1
     USE_SUNOS=1
     USE_BSD=1
-    cat >>confdefs.h <<\_ACEOF
-#define __SUN__ 1
-_ACEOF
+    $as_echo "#define __SUN__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SUNOS__ 1
-_ACEOF
+    $as_echo "#define __SUNOS__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __BSD__ 1
-_ACEOF
+    $as_echo "#define __BSD__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
   *-*-freebsd*)
     USE_BSD=1
     USE_FREEBSD=1
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
   *-*-freebsd*)
     USE_BSD=1
     USE_FREEBSD=1
-    cat >>confdefs.h <<\_ACEOF
-#define __FREEBSD__ 1
-_ACEOF
+    $as_echo "#define __FREEBSD__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __BSD__ 1
-_ACEOF
+    $as_echo "#define __BSD__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-openbsd*|*-*-mirbsd*)
     USE_BSD=1
     USE_OPENBSD=1
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-openbsd*|*-*-mirbsd*)
     USE_BSD=1
     USE_OPENBSD=1
-    cat >>confdefs.h <<\_ACEOF
-#define __OPENBSD__ 1
-_ACEOF
+    $as_echo "#define __OPENBSD__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __BSD__ 1
-_ACEOF
+    $as_echo "#define __BSD__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-netbsd*)
     USE_BSD=1
     USE_NETBSD=1
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-netbsd*)
     USE_BSD=1
     USE_NETBSD=1
-    cat >>confdefs.h <<\_ACEOF
-#define __NETBSD__ 1
-_ACEOF
+    $as_echo "#define __NETBSD__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __BSD__ 1
-_ACEOF
+    $as_echo "#define __BSD__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
@@ -2742,13 +3964,9 @@ _ACEOF
   *-*-osf* )
     USE_ALPHA=1
     USE_OSF=1
   *-*-osf* )
     USE_ALPHA=1
     USE_OSF=1
-    cat >>confdefs.h <<\_ACEOF
-#define __ALPHA__ 1
-_ACEOF
+    $as_echo "#define __ALPHA__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __OSF__ 1
-_ACEOF
+    $as_echo "#define __OSF__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
@@ -2756,26 +3974,18 @@ _ACEOF
   *-*-dgux5* )
     USE_ALPHA=1
     USE_SVR4=1
   *-*-dgux5* )
     USE_ALPHA=1
     USE_SVR4=1
-    cat >>confdefs.h <<\_ACEOF
-#define __ALPHA__ 1
-_ACEOF
+    $as_echo "#define __ALPHA__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SVR4__ 1
-_ACEOF
+    $as_echo "#define __SVR4__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
   *-*-sysv5* )
     USE_SYSV=1
     USE_SVR4=1
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
   *-*-sysv5* )
     USE_SYSV=1
     USE_SVR4=1
-    cat >>confdefs.h <<\_ACEOF
-#define __SYSV__ 1
-_ACEOF
+    $as_echo "#define __SYSV__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SVR4__ 1
-_ACEOF
+    $as_echo "#define __SVR4__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
@@ -2783,18 +3993,11 @@ _ACEOF
     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1
     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1
-                        SO_SUFFIX=a
-    cat >>confdefs.h <<\_ACEOF
-#define __AIX__ 1
-_ACEOF
+    $as_echo "#define __AIX__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SYSV__ 1
-_ACEOF
+    $as_echo "#define __SYSV__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __SVR4__ 1
-_ACEOF
+    $as_echo "#define __SVR4__ 1" >>confdefs.h
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
@@ -2803,38 +4006,28 @@ _ACEOF
     USE_SYSV=1
     USE_SVR4=1
     USE_UNIXWARE=1
     USE_SYSV=1
     USE_SVR4=1
     USE_UNIXWARE=1
-    cat >>confdefs.h <<\_ACEOF
-#define __UNIXWARE__ 1
-_ACEOF
+    $as_echo "#define __UNIXWARE__ 1" >>confdefs.h
 
   ;;
 
   *-*-cygwin* | *-*-mingw32* )
 
   ;;
 
   *-*-cygwin* | *-*-mingw32* )
-                SO_SUFFIX=dll
-    PROGRAM_EXT=".exe"
+                PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
   *-pc-msdosdjgpp )
     USE_UNIX=0
     USE_DOS=1
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
   *-pc-msdosdjgpp )
     USE_UNIX=0
     USE_DOS=1
-    cat >>confdefs.h <<\_ACEOF
-#define __DOS__ 1
-_ACEOF
+    $as_echo "#define __DOS__ 1" >>confdefs.h
 
     PROGRAM_EXT=".exe"
 
     PROGRAM_EXT=".exe"
-    DEFAULT_DEFAULT_wxUSE_MGL=1
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
-    cat >>confdefs.h <<\_ACEOF
-#define __EMX__ 1
-_ACEOF
+    $as_echo "#define __EMX__ 1" >>confdefs.h
 
     USE_OS2=1
 
     USE_OS2=1
-    cat >>confdefs.h <<\_ACEOF
-#define __OS2__ 1
-_ACEOF
+    $as_echo "#define __OS2__ 1" >>confdefs.h
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
@@ -2858,46 +4051,39 @@ _ACEOF
     DEFAULT_STD_FLAG=no
   ;;
 
     DEFAULT_STD_FLAG=no
   ;;
 
+  arm-apple-darwin*)
+        USE_BSD=1
+    USE_DARWIN=1
+    $as_echo "#define __BSD__ 1" >>confdefs.h
+
+    $as_echo "#define __DARWIN__ 1" >>confdefs.h
+
+    DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
+  ;;
+
   *-*-darwin* )
         USE_BSD=1
     USE_DARWIN=1
   *-*-darwin* )
         USE_BSD=1
     USE_DARWIN=1
-    SO_SUFFIX=dylib
-    cat >>confdefs.h <<\_ACEOF
-#define __BSD__ 1
-_ACEOF
+    $as_echo "#define __BSD__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __DARWIN__ 1
-_ACEOF
+    $as_echo "#define __DARWIN__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define TARGET_CARBON 1
-_ACEOF
+    $as_echo "#define TARGET_CARBON 1" >>confdefs.h
 
 
-    DEFAULT_DEFAULT_wxUSE_MAC=1
-    DEFAULT_STD_FLAG=no
-  ;;
-  powerpc-apple-macos* )
-        USE_UNIX=0
-            ac_cv_c_bigendian=yes
-    SO_SUFFIX=shlib
-            DEFAULT_DEFAULT_wxUSE_MAC=1
-    DEFAULT_STD_FLAG=no
+    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
   ;;
 
   *-*-beos* )
         USE_BEOS=1
   ;;
 
   *-*-beos* )
         USE_BEOS=1
-    cat >>confdefs.h <<\_ACEOF
-#define __BEOS__ 1
-_ACEOF
+    $as_echo "#define __BEOS__ 1" >>confdefs.h
 
   ;;
 
   *)
 
   ;;
 
   *)
-    { echo "$as_me:$LINENO: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&5
-echo "$as_me: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&2;}
-    { echo "$as_me:$LINENO: WARNING: *** Please report the build results to wx-dev@lists.wxwidgets.org." >&5
-echo "$as_me: WARNING: *** Please report the build results to wx-dev@lists.wxwidgets.org." >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&5
+$as_echo "$as_me: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Please report the build results to wx-dev@lists.wxwidgets.org." >&5
+$as_echo "$as_me: WARNING: *** Please report the build results to wx-dev@lists.wxwidgets.org." >&2;}
 
     DEFAULT_DEFAULT_wxUSE_X11=1
     DEFAULT_wxUSE_SHARED=no
 
     DEFAULT_DEFAULT_wxUSE_X11=1
     DEFAULT_wxUSE_SHARED=no
@@ -2905,36 +4091,35 @@ esac
 
 
 
 
 
 
-
-          wx_arg_cache_file="configarg.cache"
-          echo "loading argument cache $wx_arg_cache_file"
-          rm -f ${wx_arg_cache_file}.tmp
-          touch ${wx_arg_cache_file}.tmp
-          touch ${wx_arg_cache_file}
-
-
 DEFAULT_wxUSE_ALL_FEATURES=yes
 
 DEFAULT_wxUSE_ALL_FEATURES=yes
 
+DEFAULT_wxUSE_STD_CONTAINERS=no
 DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
 DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
 
 DEFAULT_wxUSE_DMALLOC=no
 DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBHILDON=no
 DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
 DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
 
 DEFAULT_wxUSE_DMALLOC=no
 DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBHILDON=no
+DEFAULT_wxUSE_LIBHILDON2=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_ODBC=no
-DEFAULT_wxUSE_OPENGL=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
-DEFAULT_wxUSE_DATAVIEWCTRL=no
-DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
-DEFAULT_wxUSE_MEDIACTRL=no
-DEFAULT_wxUSE_TAB_DIALOG=no
-
-DEFAULT_wxUSE_UNICODE_UTF8=auto
+DEFAULT_wxUSE_IPV6=no
+DEFAULT_wxUSE_GSTREAMER8=no
+DEFAULT_wxUSE_UNICODE_UTF8=no
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
+DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto
+DEFAULT_wxUSE_OPENGL=auto
+DEFAULT_wxUSE_MEDIACTRL=auto
+DEFAULT_wxUSE_COMPILER_TLS=auto
+DEFAULT_wxUSE_HOTKEY=auto
+DEFAULT_wxUSE_METAFILE=auto
+
+DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+DEFAULT_wxUSE_MAC_ARCH=no
+
 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 DEFAULT_wxUSE_GTK2=yes
 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 DEFAULT_wxUSE_GTK2=yes
@@ -2942,21 +4127,6 @@ DEFAULT_wxUSE_GTK2=yes
 DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
 
 
 DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
 
 
-for toolkit in `echo $ALL_TOOLKITS`; do
-  LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
-  if test "x$LINE" != "x" ; then
-    has_toolkit_in_cache=1
-    eval "DEFAULT_$LINE"
-    eval "CACHE_$toolkit=1"
-
-    LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
-    if test "x$LINE" != "x" ; then
-        eval "DEFAULT_$LINE"
-    fi
-  fi
-done
-
-
 
 
 
 
 
 
@@ -2970,11 +4140,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-gui" >&5
+$as_echo_n "checking for --${enablestring:-enable}-gui... " >&6; }
           # Check whether --enable-gui was given.
           # Check whether --enable-gui was given.
-if test "${enable_gui+set}" = set; then
+if test "${enable_gui+set}" = set; then :
   enableval=$enable_gui;
                           if test "$enableval" = yes; then
                             wx_cv_use_gui='wxUSE_GUI=yes'
   enableval=$enable_gui;
                           if test "$enableval" = yes; then
                             wx_cv_use_gui='wxUSE_GUI=yes'
@@ -2984,35 +4153,25 @@ if test "${enable_gui+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gui"
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gui"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gui >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GUI = yes; then
-              result=no
-            else
+            if test $wxUSE_GUI = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_GUI
           fi
 
             fi
           else
             result=$wxUSE_GUI
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -3025,11 +4184,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-monolithic" >&5
+$as_echo_n "checking for --${enablestring:-enable}-monolithic... " >&6; }
           # Check whether --enable-monolithic was given.
           # Check whether --enable-monolithic was given.
-if test "${enable_monolithic+set}" = set; then
+if test "${enable_monolithic+set}" = set; then :
   enableval=$enable_monolithic;
                           if test "$enableval" = yes; then
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
   enableval=$enable_monolithic;
                           if test "$enableval" = yes; then
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
@@ -3039,35 +4197,25 @@ if test "${enable_monolithic+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_monolithic"
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_monolithic"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_monolithic >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MONOLITHIC = yes; then
-              result=no
-            else
+            if test $wxUSE_MONOLITHIC = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_MONOLITHIC
           fi
 
             fi
           else
             result=$wxUSE_MONOLITHIC
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -3080,11 +4228,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-plugins" >&5
+$as_echo_n "checking for --${enablestring:-enable}-plugins... " >&6; }
           # Check whether --enable-plugins was given.
           # Check whether --enable-plugins was given.
-if test "${enable_plugins+set}" = set; then
+if test "${enable_plugins+set}" = set; then :
   enableval=$enable_plugins;
                           if test "$enableval" = yes; then
                             wx_cv_use_plugins='wxUSE_PLUGINS=yes'
   enableval=$enable_plugins;
                           if test "$enableval" = yes; then
                             wx_cv_use_plugins='wxUSE_PLUGINS=yes'
@@ -3094,44 +4241,41 @@ if test "${enable_plugins+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_plugins"
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_plugins"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_plugins >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PLUGINS = yes; then
-              result=no
-            else
+            if test $wxUSE_PLUGINS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PLUGINS
           fi
 
             fi
           else
             result=$wxUSE_PLUGINS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           withstring=without
 
 
           withstring=without
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5
-echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-subdirs" >&5
+$as_echo_n "checking for --${withstring:-with}-subdirs... " >&6; }
 
 # Check whether --with-subdirs was given.
 
 # Check whether --with-subdirs was given.
-if test "${with_subdirs+set}" = set; then
+if test "${with_subdirs+set}" = set; then :
   withval=$with_subdirs;
                         if test "$withval" = yes; then
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=yes'
   withval=$with_subdirs;
                         if test "$withval" = yes; then
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=yes'
@@ -3141,22 +4285,12 @@ if test "${with_subdirs+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_subdirs"
 
 fi
 
 
           eval "$wx_cv_use_subdirs"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_subdirs >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxWITH_SUBDIRS = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxWITH_SUBDIRS = yes; then
@@ -3168,12 +4302,12 @@ fi
             result=$wxWITH_SUBDIRS
           fi
 
             result=$wxWITH_SUBDIRS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 # Check whether --with-flavour was given.
 
 
 # Check whether --with-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
 
@@ -3188,11 +4322,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-official_build" >&5
+$as_echo_n "checking for --${enablestring:-enable}-official_build... " >&6; }
           # Check whether --enable-official_build was given.
           # Check whether --enable-official_build was given.
-if test "${enable_official_build+set}" = set; then
+if test "${enable_official_build+set}" = set; then :
   enableval=$enable_official_build;
                           if test "$enableval" = yes; then
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
   enableval=$enable_official_build;
                           if test "$enableval" = yes; then
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
@@ -3202,38 +4335,28 @@ if test "${enable_official_build+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_official_build"
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_official_build"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_official_build >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OFFICIAL_BUILD = yes; then
-              result=no
-            else
+            if test $wxUSE_OFFICIAL_BUILD = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_OFFICIAL_BUILD
           fi
 
             fi
           else
             result=$wxUSE_OFFICIAL_BUILD
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 # Check whether --enable-vendor was given.
 
 # Check whether --enable-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
 
@@ -3252,11 +4375,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-all-features" >&5
+$as_echo_n "checking for --${enablestring:-enable}-all-features... " >&6; }
           # Check whether --enable-all-features was given.
           # Check whether --enable-all-features was given.
-if test "${enable_all_features+set}" = set; then
+if test "${enable_all_features+set}" = set; then :
   enableval=$enable_all_features;
                           if test "$enableval" = yes; then
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
   enableval=$enable_all_features;
                           if test "$enableval" = yes; then
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
@@ -3266,36 +4388,31 @@ if test "${enable_all_features+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_all_features"
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_all_features"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_all_features >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ALL_FEATURES = yes; then
-              result=no
-            else
+            if test $wxUSE_ALL_FEATURES = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ALL_FEATURES
           fi
 
             fi
           else
             result=$wxUSE_ALL_FEATURES
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
 
 
+if test "$wxUSE_ALL_FEATURES" = "no"; then
+                    DEFAULT_wxUSE_ARTPROVIDER_TANGO=no
+    DEFAULT_wxUSE_MEDIACTRL=no
+fi
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -3311,11 +4428,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-universal" >&5
+$as_echo_n "checking for --${enablestring:-enable}-universal... " >&6; }
           # Check whether --enable-universal was given.
           # Check whether --enable-universal was given.
-if test "${enable_universal+set}" = set; then
+if test "${enable_universal+set}" = set; then :
   enableval=$enable_universal;
                           if test "$enableval" = yes; then
                             wx_cv_use_universal='wxUSE_UNIVERSAL=yes'
   enableval=$enable_universal;
                           if test "$enableval" = yes; then
                             wx_cv_use_universal='wxUSE_UNIVERSAL=yes'
@@ -3325,40 +4441,30 @@ if test "${enable_universal+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_universal"
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_universal"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_universal >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNIVERSAL = yes; then
-              result=no
-            else
+            if test $wxUSE_UNIVERSAL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_UNIVERSAL
           fi
 
             fi
           else
             result=$wxUSE_UNIVERSAL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 if test "$wxUSE_UNIVERSAL" = "yes"; then
 
 # Check whether --with-themes was given.
 
 if test "$wxUSE_UNIVERSAL" = "yes"; then
 
 # Check whether --with-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
 
@@ -3366,67 +4472,103 @@ fi
 
 
 # Check whether --with-gtk was given.
 
 
 # Check whether --with-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
 
 
 # Check whether --with-motif was given.
   withval=$with_gtk; wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
 fi
 
 
 # Check whether --with-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.
-if test "${with_mac+set}" = set; then
-  withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1
+# Check whether --with-osx_carbon was given.
+if test "${with_osx_carbon+set}" = set; then :
+  withval=$with_osx_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx_cocoa was given.
+if test "${with_osx_cocoa+set}" = set; then :
+  withval=$with_osx_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx_iphone was given.
+if test "${with_osx_iphone+set}" = set; then :
+  withval=$with_osx_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx was given.
+if test "${with_osx+set}" = set; then :
+  withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-carbon was given.
+if test "${with_carbon+set}" = set; then :
+  withval=$with_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
 fi
 
 
 # Check whether --with-cocoa was given.
 fi
 
 
 # Check whether --with-cocoa was given.
-if test "${with_cocoa+set}" = set; then
-  withval=$with_cocoa; wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1
+if test "${with_cocoa+set}" = set; then :
+  withval=$with_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-iphone was given.
+if test "${with_iphone+set}" = set; then :
+  withval=$with_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-mac was given.
+if test "${with_mac+set}" = set; then :
+  withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-old_cocoa was given.
+if test "${with_old_cocoa+set}" = set; then :
+  withval=$with_old_cocoa; wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1
 fi
 
 
 # Check whether --with-wine was given.
 fi
 
 
 # Check whether --with-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
 
 
 # Check whether --with-msw was given.
   withval=$with_wine; wxUSE_WINE="$withval" CACHE_WINE=1
 fi
 
 
 # Check whether --with-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
 
 
 # Check whether --with-pm was given.
   withval=$with_msw; wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1
 fi
 
 
 # Check whether --with-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.
-if test "${with_mgl+set}" = set; then
-  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 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
 
 
 # Check whether --with-microwin was given.
   withval=$with_directfb; wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1
 fi
 
 
 # Check whether --with-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
 
 
 # Check whether --with-x11 was given.
   withval=$with_microwin; wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1
 fi
 
 
 # Check whether --with-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
 
@@ -3441,11 +4583,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-nanox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-nanox... " >&6; }
           # Check whether --enable-nanox was given.
           # Check whether --enable-nanox was given.
-if test "${enable_nanox+set}" = set; then
+if test "${enable_nanox+set}" = set; then :
   enableval=$enable_nanox;
                           if test "$enableval" = yes; then
                             wx_cv_use_nanox='wxUSE_NANOX=yes'
   enableval=$enable_nanox;
                           if test "$enableval" = yes; then
                             wx_cv_use_nanox='wxUSE_NANOX=yes'
@@ -3455,39 +4596,29 @@ if test "${enable_nanox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_nanox"
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_nanox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_nanox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NANOX = yes; then
-              result=no
-            else
+            if test $wxUSE_NANOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_NANOX
           fi
 
             fi
           else
             result=$wxUSE_NANOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 # Check whether --enable-gtk2 was given.
 
 
 # Check whether --enable-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
 
@@ -3502,11 +4633,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-gpe" >&5
+$as_echo_n "checking for --${enablestring:-enable}-gpe... " >&6; }
           # Check whether --enable-gpe was given.
           # Check whether --enable-gpe was given.
-if test "${enable_gpe+set}" = set; then
+if test "${enable_gpe+set}" = set; then :
   enableval=$enable_gpe;
                           if test "$enableval" = yes; then
                             wx_cv_use_gpe='wxUSE_GPE=yes'
   enableval=$enable_gpe;
                           if test "$enableval" = yes; then
                             wx_cv_use_gpe='wxUSE_GPE=yes'
@@ -3516,45 +4646,132 @@ if test "${enable_gpe+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gpe"
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gpe"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gpe >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GPE = yes; then
-              result=no
-            else
+            if test $wxUSE_GPE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_GPE
           fi
 
             fi
           else
             result=$wxUSE_GPE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for toolkit" >&5
+$as_echo_n "checking for toolkit... " >&6; }
+
+
+
+# In Wine, we need to default to MSW, not GTK or MOTIF
+if test "$wxUSE_WINE" = "yes"; then
+    DEFAULT_DEFAULT_wxUSE_GTK=0
+    DEFAULT_DEFAULT_wxUSE_MOTIF=0
+    DEFAULT_DEFAULT_wxUSE_MSW=1
+    wxUSE_SHARED=no
+    CC=${CC:-winegcc}
+    CXX=${CXX:-wineg++}
+fi
+
+
+if test "$wxUSE_GUI" = "yes"; then
+
+    if test "$USE_BEOS" = 1; then
+        as_fn_error $? "BeOS GUI is not supported yet, use --disable-gui" "$LINENO" 5
+    fi
+
+    if test "$TOOLKIT_GIVEN" = 1; then
+            for toolkit in $ALL_TOOLKITS; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
+        if test "x$value" = "xno"; then
+          eval "$var=0"
+        elif test "x$value" != "x"; then
+          eval "$var=1"
+        fi
+
+        if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+          eval "wx${toolkit}_VERSION=$value"
+        fi
+      done
+    else
+            for toolkit in $ALL_TOOLKITS; do
+        var=DEFAULT_DEFAULT_wxUSE_$toolkit
+        eval "wxUSE_$toolkit=\$${var}"
+      done
+    fi
+
+            NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+
+        case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx )
+        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+    esac
+
+    case "$NUM_TOOLKITS" in
+      1)
+      ;;
+      0)
+        as_fn_error $? "Please specify a toolkit -- cannot determine the default for ${host}" "$LINENO" 5
+      ;;
+      *)
+        as_fn_error $? "Please specify at most one toolkit" "$LINENO" 5
+    esac
+
+    # to be removed when --disable-gtk2 isn't needed
+    if test "x$wxUSE_GTK2" = "xyes"; then
+        wxGTK_VERSION=2
+        wxUSE_GTK1=0
+    elif test "x$wxUSE_GTK2" = "xno"; then
+        wxGTK_VERSION=1
+        wxUSE_GTK1=1
+    fi
 
 
+    for toolkit in $ALL_TOOLKITS; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
+        if test "$value" = 1; then
+          toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'`
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $toolkit_echo" >&5
+$as_echo "$toolkit_echo" >&6; }
+        fi
+    done
+else
+    if test "x$host_alias" != "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: base ($host_alias hosted) only" >&5
+$as_echo "base ($host_alias hosted) only" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: base only" >&5
+$as_echo "base only" >&6; }
+    fi
+fi
+
+wxUSE_MAC=0
+if test "$wxUSE_OSX_CARBON" = 1 \
+       -o "$wxUSE_OSX_COCOA" = 1 \
+       -o "$wxUSE_OSX_IPHONE" = 1; then
+    wxUSE_MAC=1
+fi
 
 
 
 
 
 
-          { echo "$as_me:$LINENO: checking for --with-libpng" >&5
-echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libpng" >&5
+$as_echo_n "checking for --with-libpng... " >&6; }
 
 # Check whether --with-libpng was given.
 
 # Check whether --with-libpng was given.
-if test "${with_libpng+set}" = set; then
+if test "${with_libpng+set}" = set; then :
   withval=$with_libpng;
                         if test "$withval" = yes; then
                           wx_cv_use_libpng='wxUSE_LIBPNG=yes'
   withval=$with_libpng;
                         if test "$withval" = yes; then
                           wx_cv_use_libpng='wxUSE_LIBPNG=yes'
@@ -3565,55 +4782,40 @@ if test "${with_libpng+set}" = set; then
                         elif test "$withval" = builtin; then
                           wx_cv_use_libpng='wxUSE_LIBPNG=builtin'
                         else
                         elif test "$withval" = builtin; then
                           wx_cv_use_libpng='wxUSE_LIBPNG=builtin'
                         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;}
-   { (exit 1); exit 1; }; }
+                          as_fn_error $? "Invalid value for --with-libpng: should be yes, no, sys, or builtin" "$LINENO" 5
                         fi
 
 else
 
                         fi
 
 else
 
-                        LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libpng"
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libpng"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libpng >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBPNG" = yes; then
 
           if test "$wxUSE_LIBPNG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: system version" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin version" >&5
+$as_echo "builtin version" >&6; }
           else
           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;}
-   { (exit 1); exit 1; }; }
+            as_fn_error $? "Invalid value for --with-libpng: should be yes, no, sys, or builtin" "$LINENO" 5
           fi
 
 
           fi
 
 
-          { echo "$as_me:$LINENO: checking for --with-libjpeg" >&5
-echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libjpeg" >&5
+$as_echo_n "checking for --with-libjpeg... " >&6; }
 
 # Check whether --with-libjpeg was given.
 
 # Check whether --with-libjpeg was given.
-if test "${with_libjpeg+set}" = set; then
+if test "${with_libjpeg+set}" = set; then :
   withval=$with_libjpeg;
                         if test "$withval" = yes; then
                           wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
   withval=$with_libjpeg;
                         if test "$withval" = yes; then
                           wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
@@ -3624,55 +4826,40 @@ if test "${with_libjpeg+set}" = set; then
                         elif test "$withval" = builtin; then
                           wx_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
                         else
                         elif test "$withval" = builtin; then
                           wx_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
                         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;}
-   { (exit 1); exit 1; }; }
+                          as_fn_error $? "Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" "$LINENO" 5
                         fi
 
 else
 
                         fi
 
 else
 
-                        LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libjpeg"
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libjpeg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
 
           if test "$wxUSE_LIBJPEG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: system version" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin version" >&5
+$as_echo "builtin version" >&6; }
           else
           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;}
-   { (exit 1); exit 1; }; }
+            as_fn_error $? "Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" "$LINENO" 5
           fi
 
 
           fi
 
 
-          { echo "$as_me:$LINENO: checking for --with-libtiff" >&5
-echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libtiff" >&5
+$as_echo_n "checking for --with-libtiff... " >&6; }
 
 # Check whether --with-libtiff was given.
 
 # Check whether --with-libtiff was given.
-if test "${with_libtiff+set}" = set; then
+if test "${with_libtiff+set}" = set; then :
   withval=$with_libtiff;
                         if test "$withval" = yes; then
                           wx_cv_use_libtiff='wxUSE_LIBTIFF=yes'
   withval=$with_libtiff;
                         if test "$withval" = yes; then
                           wx_cv_use_libtiff='wxUSE_LIBTIFF=yes'
@@ -3683,55 +4870,40 @@ if test "${with_libtiff+set}" = set; then
                         elif test "$withval" = builtin; then
                           wx_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
                         else
                         elif test "$withval" = builtin; then
                           wx_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
                         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;}
-   { (exit 1); exit 1; }; }
+                          as_fn_error $? "Invalid value for --with-libtiff: should be yes, no, sys, or builtin" "$LINENO" 5
                         fi
 
 else
 
                         fi
 
 else
 
-                        LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libtiff"
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libtiff"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
 
           if test "$wxUSE_LIBTIFF" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: system version" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin version" >&5
+$as_echo "builtin version" >&6; }
           else
           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;}
-   { (exit 1); exit 1; }; }
+            as_fn_error $? "Invalid value for --with-libtiff: should be yes, no, sys, or builtin" "$LINENO" 5
           fi
 
 
           fi
 
 
-          { echo "$as_me:$LINENO: checking for --with-libxpm" >&5
-echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libxpm" >&5
+$as_echo_n "checking for --with-libxpm... " >&6; }
 
 # Check whether --with-libxpm was given.
 
 # Check whether --with-libxpm was given.
-if test "${with_libxpm+set}" = set; then
+if test "${with_libxpm+set}" = set; then :
   withval=$with_libxpm;
                         if test "$withval" = yes; then
                           wx_cv_use_libxpm='wxUSE_LIBXPM=yes'
   withval=$with_libxpm;
                         if test "$withval" = yes; then
                           wx_cv_use_libxpm='wxUSE_LIBXPM=yes'
@@ -3742,56 +4914,93 @@ if test "${with_libxpm+set}" = set; then
                         elif test "$withval" = builtin; then
                           wx_cv_use_libxpm='wxUSE_LIBXPM=builtin'
                         else
                         elif test "$withval" = builtin; then
                           wx_cv_use_libxpm='wxUSE_LIBXPM=builtin'
                         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;}
-   { (exit 1); exit 1; }; }
+                          as_fn_error $? "Invalid value for --with-libxpm: should be yes, no, sys, or builtin" "$LINENO" 5
                         fi
 
 else
 
                         fi
 
 else
 
-                        LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libxpm"
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libxpm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libxpm >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBXPM" = yes; then
 
           if test "$wxUSE_LIBXPM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: system version" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin version" >&5
+$as_echo "builtin version" >&6; }
           else
           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;}
-   { (exit 1); exit 1; }; }
+            as_fn_error $? "Invalid value for --with-libxpm: should be yes, no, sys, or builtin" "$LINENO" 5
           fi
 
 
           withstring=
           fi
 
 
           withstring=
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5
-echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libiconv" >&5
+$as_echo_n "checking for --${withstring:-with}-libiconv... " >&6; }
+
+# Check whether --with-libiconv was given.
+if test "${with_libiconv+set}" = set; then :
+  withval=$with_libiconv;
+                        if test "$withval" = yes; then
+                          wx_cv_use_libiconv='wxUSE_LIBICONV=yes'
+                        else
+                          wx_cv_use_libiconv='wxUSE_LIBICONV=no'
+                        fi
+
+else
+
+                        wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_libiconv"
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBICONV = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_LIBICONV
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+          withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libmspack" >&5
+$as_echo_n "checking for --${withstring:-with}-libmspack... " >&6; }
 
 # Check whether --with-libmspack was given.
 
 # Check whether --with-libmspack was given.
-if test "${with_libmspack+set}" = set; then
+if test "${with_libmspack+set}" = set; then :
   withval=$with_libmspack;
                         if test "$withval" = yes; then
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
   withval=$with_libmspack;
                         if test "$withval" = yes; then
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
@@ -3801,22 +5010,12 @@ if test "${with_libmspack+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_libmspack"
 
 fi
 
 
           eval "$wx_cv_use_libmspack"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libmspack >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBMSPACK = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBMSPACK = yes; then
@@ -3828,17 +5027,68 @@ fi
             result=$wxUSE_LIBMSPACK
           fi
 
             result=$wxUSE_LIBMSPACK
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-gtkprint" >&5
+$as_echo_n "checking for --${withstring:-with}-gtkprint... " >&6; }
+
+# Check whether --with-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
+
+else
+
+                        wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_gtkprint"
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_GTKPRINT = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_GTKPRINT
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           withstring=without
 
 
           withstring=without
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
-echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-gnomeprint" >&5
+$as_echo_n "checking for --${withstring:-with}-gnomeprint... " >&6; }
 
 # Check whether --with-gnomeprint was given.
 
 # Check whether --with-gnomeprint was given.
-if test "${with_gnomeprint+set}" = set; then
+if test "${with_gnomeprint+set}" = set; then :
   withval=$with_gnomeprint;
                         if test "$withval" = yes; then
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
   withval=$with_gnomeprint;
                         if test "$withval" = yes; then
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
@@ -3848,22 +5098,12 @@ if test "${with_gnomeprint+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gnomeprint"
 
 fi
 
 
           eval "$wx_cv_use_gnomeprint"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEPRINT = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEPRINT = yes; then
@@ -3875,17 +5115,24 @@ fi
             result=$wxUSE_LIBGNOMEPRINT
           fi
 
             result=$wxUSE_LIBGNOMEPRINT
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           withstring=
 
 
           withstring=
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5
-echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-gnomevfs" >&5
+$as_echo_n "checking for --${withstring:-with}-gnomevfs... " >&6; }
 
 # Check whether --with-gnomevfs was given.
 
 # Check whether --with-gnomevfs was given.
-if test "${with_gnomevfs+set}" = set; then
+if test "${with_gnomevfs+set}" = set; then :
   withval=$with_gnomevfs;
                         if test "$withval" = yes; then
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
   withval=$with_gnomevfs;
                         if test "$withval" = yes; then
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
@@ -3895,22 +5142,12 @@ if test "${with_gnomevfs+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gnomevfs"
 
 fi
 
 
           eval "$wx_cv_use_gnomevfs"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEVFS = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEVFS = yes; then
@@ -3922,17 +5159,24 @@ fi
             result=$wxUSE_LIBGNOMEVFS
           fi
 
             result=$wxUSE_LIBGNOMEVFS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           withstring=
 
 
           withstring=
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5
-echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-hildon" >&5
+$as_echo_n "checking for --${withstring:-with}-hildon... " >&6; }
 
 # Check whether --with-hildon was given.
 
 # Check whether --with-hildon was given.
-if test "${with_hildon+set}" = set; then
+if test "${with_hildon+set}" = set; then :
   withval=$with_hildon;
                         if test "$withval" = yes; then
                           wx_cv_use_hildon='wxUSE_LIBHILDON=yes'
   withval=$with_hildon;
                         if test "$withval" = yes; then
                           wx_cv_use_hildon='wxUSE_LIBHILDON=yes'
@@ -3942,22 +5186,12 @@ if test "${with_hildon+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_hildon"
 
 fi
 
 
           eval "$wx_cv_use_hildon"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_hildon >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBHILDON = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBHILDON = yes; then
@@ -3969,17 +5203,24 @@ fi
             result=$wxUSE_LIBHILDON
           fi
 
             result=$wxUSE_LIBHILDON
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           withstring=
 
 
           withstring=
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5
-echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-opengl" >&5
+$as_echo_n "checking for --${withstring:-with}-opengl... " >&6; }
 
 # Check whether --with-opengl was given.
 
 # Check whether --with-opengl was given.
-if test "${with_opengl+set}" = set; then
+if test "${with_opengl+set}" = set; then :
   withval=$with_opengl;
                         if test "$withval" = yes; then
                           wx_cv_use_opengl='wxUSE_OPENGL=yes'
   withval=$with_opengl;
                         if test "$withval" = yes; then
                           wx_cv_use_opengl='wxUSE_OPENGL=yes'
@@ -3989,22 +5230,12 @@ if test "${with_opengl+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_opengl"
 
 fi
 
 
           eval "$wx_cv_use_opengl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_opengl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_OPENGL = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_OPENGL = yes; then
@@ -4016,20 +5247,27 @@ fi
             result=$wxUSE_OPENGL
           fi
 
             result=$wxUSE_OPENGL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 fi
 
 
           withstring=
 
 
 fi
 
 
           withstring=
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5
-echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-dmalloc" >&5
+$as_echo_n "checking for --${withstring:-with}-dmalloc... " >&6; }
 
 # Check whether --with-dmalloc was given.
 
 # Check whether --with-dmalloc was given.
-if test "${with_dmalloc+set}" = set; then
+if test "${with_dmalloc+set}" = set; then :
   withval=$with_dmalloc;
                         if test "$withval" = yes; then
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=yes'
   withval=$with_dmalloc;
                         if test "$withval" = yes; then
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=yes'
@@ -4039,22 +5277,12 @@ if test "${with_dmalloc+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dmalloc"
 
 fi
 
 
           eval "$wx_cv_use_dmalloc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_DMALLOC = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_DMALLOC = yes; then
@@ -4066,17 +5294,24 @@ fi
             result=$wxUSE_DMALLOC
           fi
 
             result=$wxUSE_DMALLOC
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           withstring=
 
 
           withstring=
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5
-echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; }
-          no_cache=0
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-sdl" >&5
+$as_echo_n "checking for --${withstring:-with}-sdl... " >&6; }
 
 # Check whether --with-sdl was given.
 
 # Check whether --with-sdl was given.
-if test "${with_sdl+set}" = set; then
+if test "${with_sdl+set}" = set; then :
   withval=$with_sdl;
                         if test "$withval" = yes; then
                           wx_cv_use_sdl='wxUSE_LIBSDL=yes'
   withval=$with_sdl;
                         if test "$withval" = yes; then
                           wx_cv_use_sdl='wxUSE_LIBSDL=yes'
@@ -4086,22 +5321,12 @@ if test "${with_sdl+set}" = set; then
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sdl"
 
 fi
 
 
           eval "$wx_cv_use_sdl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sdl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBSDL = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBSDL = yes; then
@@ -4113,16 +5338,15 @@ fi
             result=$wxUSE_LIBSDL
           fi
 
             result=$wxUSE_LIBSDL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
-          { echo "$as_me:$LINENO: checking for --with-regex" >&5
-echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-regex" >&5
+$as_echo_n "checking for --with-regex... " >&6; }
 
 # Check whether --with-regex was given.
 
 # Check whether --with-regex was given.
-if test "${with_regex+set}" = set; then
+if test "${with_regex+set}" = set; then :
   withval=$with_regex;
                         if test "$withval" = yes; then
                           wx_cv_use_regex='wxUSE_REGEX=yes'
   withval=$with_regex;
                         if test "$withval" = yes; then
                           wx_cv_use_regex='wxUSE_REGEX=yes'
@@ -4133,55 +5357,40 @@ if test "${with_regex+set}" = set; then
                         elif test "$withval" = builtin; then
                           wx_cv_use_regex='wxUSE_REGEX=builtin'
                         else
                         elif test "$withval" = builtin; then
                           wx_cv_use_regex='wxUSE_REGEX=builtin'
                         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;}
-   { (exit 1); exit 1; }; }
+                          as_fn_error $? "Invalid value for --with-regex: should be yes, no, sys, or builtin" "$LINENO" 5
                         fi
 
 else
 
                         fi
 
 else
 
-                        LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_regex"
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_regex"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_regex >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_REGEX" = yes; then
 
           if test "$wxUSE_REGEX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: system version" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin version" >&5
+$as_echo "builtin version" >&6; }
           else
           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;}
-   { (exit 1); exit 1; }; }
+            as_fn_error $? "Invalid value for --with-regex: should be yes, no, sys, or builtin" "$LINENO" 5
           fi
 
 
           fi
 
 
-          { echo "$as_me:$LINENO: checking for --with-zlib" >&5
-echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-zlib" >&5
+$as_echo_n "checking for --with-zlib... " >&6; }
 
 # Check whether --with-zlib was given.
 
 # Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then
+if test "${with_zlib+set}" = set; then :
   withval=$with_zlib;
                         if test "$withval" = yes; then
                           wx_cv_use_zlib='wxUSE_ZLIB=yes'
   withval=$with_zlib;
                         if test "$withval" = yes; then
                           wx_cv_use_zlib='wxUSE_ZLIB=yes'
@@ -4192,114 +5401,40 @@ if test "${with_zlib+set}" = set; then
                         elif test "$withval" = builtin; then
                           wx_cv_use_zlib='wxUSE_ZLIB=builtin'
                         else
                         elif test "$withval" = builtin; then
                           wx_cv_use_zlib='wxUSE_ZLIB=builtin'
                         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;}
-   { (exit 1); exit 1; }; }
+                          as_fn_error $? "Invalid value for --with-zlib: should be yes, no, sys, or builtin" "$LINENO" 5
                         fi
 
 else
 
                         fi
 
 else
 
-                        LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_zlib"
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_zlib"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_zlib >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_ZLIB" = yes; then
 
           if test "$wxUSE_ZLIB" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: system version" >&5
+$as_echo "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; }
-          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;}
-   { (exit 1); exit 1; }; }
-          fi
-
-
-          { echo "$as_me:$LINENO: checking for --with-odbc" >&5
-echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
-          no_cache=0
-
-# Check whether --with-odbc was given.
-if test "${with_odbc+set}" = set; then
-  withval=$with_odbc;
-                        if test "$withval" = yes; then
-                          wx_cv_use_odbc='wxUSE_ODBC=yes'
-                        elif test "$withval" = no; then
-                          wx_cv_use_odbc='wxUSE_ODBC=no'
-                        elif test "$withval" = sys; then
-                          wx_cv_use_odbc='wxUSE_ODBC=sys'
-                        elif test "$withval" = builtin; then
-                          wx_cv_use_odbc='wxUSE_ODBC=builtin'
-                        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;}
-   { (exit 1); exit 1; }; }
-                        fi
-
-else
-
-                        LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
-
-fi
-
-
-          eval "$wx_cv_use_odbc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_odbc >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_ODBC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          elif test "$wxUSE_ODBC" = no; then
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          elif test "$wxUSE_ODBC" = sys; then
-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
-          elif test "$wxUSE_ODBC" = builtin; then
-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin version" >&5
+$as_echo "builtin version" >&6; }
           else
           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;}
-   { (exit 1); exit 1; }; }
+            as_fn_error $? "Invalid value for --with-zlib: should be yes, no, sys, or builtin" "$LINENO" 5
           fi
 
 
           fi
 
 
-          { echo "$as_me:$LINENO: checking for --with-expat" >&5
-echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-expat" >&5
+$as_echo_n "checking for --with-expat... " >&6; }
 
 # Check whether --with-expat was given.
 
 # Check whether --with-expat was given.
-if test "${with_expat+set}" = set; then
+if test "${with_expat+set}" = set; then :
   withval=$with_expat;
                         if test "$withval" = yes; then
                           wx_cv_use_expat='wxUSE_EXPAT=yes'
   withval=$with_expat;
                         if test "$withval" = yes; then
                           wx_cv_use_expat='wxUSE_EXPAT=yes'
@@ -4310,49 +5445,106 @@ if test "${with_expat+set}" = set; then
                         elif test "$withval" = builtin; then
                           wx_cv_use_expat='wxUSE_EXPAT=builtin'
                         else
                         elif test "$withval" = builtin; then
                           wx_cv_use_expat='wxUSE_EXPAT=builtin'
                         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;}
-   { (exit 1); exit 1; }; }
+                          as_fn_error $? "Invalid value for --with-expat: should be yes, no, sys, or builtin" "$LINENO" 5
                         fi
 
 else
 
                         fi
 
 else
 
-                        LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_expat"
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_expat"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_expat >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_EXPAT" = yes; then
 
           if test "$wxUSE_EXPAT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: system version" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: builtin version" >&5
+$as_echo "builtin version" >&6; }
           else
           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;}
-   { (exit 1); exit 1; }; }
+            as_fn_error $? "Invalid value for --with-expat: should be yes, no, sys, or builtin" "$LINENO" 5
           fi
 
 
           fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-macosx-sdk" >&5
+$as_echo_n "checking for --with-macosx-sdk... " >&6; }
+
+# Check whether --with-macosx-sdk was given.
+if test "${with_macosx_sdk+set}" = set; then :
+  withval=$with_macosx_sdk;
+        wxUSE_MACOSX_SDK=$withval
+        wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_MACOSX_SDK" >&5
+$as_echo "$wxUSE_MACOSX_SDK" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-macosx-version-min" >&5
+$as_echo_n "checking for --with-macosx-version-min... " >&6; }
+
+# Check whether --with-macosx-version-min was given.
+if test "${with_macosx_version_min+set}" = set; then :
+  withval=$with_macosx_version_min;
+        wxUSE_MACOSX_VERSION_MIN=$withval
+        wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+$as_echo "$wxUSE_MACOSX_VERSION_MIN" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-debug" >&5
+$as_echo_n "checking for --enable-debug... " >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+        if test "$enableval" = yes; then
+            wxUSE_DEBUG=yes
+        elif test "$enableval" = no; then
+            wxUSE_DEBUG=no
+        elif test "$enableval" = max; then
+            wxUSE_DEBUG=yes
+            WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
+        else
+            as_fn_error $? "Invalid --enable-debug value, must be yes, no or max" "$LINENO" 5
+        fi
+
+else
+  wxUSE_DEBUG=default
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_debug-default}" >&5
+$as_echo "${enable_debug-default}" >&6; }
+
+case "$wxUSE_DEBUG" in
+    yes)
+                        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=yes
+
+                        DEFAULT_wxUSE_OPTIMISE=no
+        ;;
+
+    no)
+                        DEFAULT_wxUSE_DEBUG_FLAG=no
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+
+    default)
+                        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+esac
 
 
           enablestring=disable
 
 
           enablestring=disable
@@ -4365,52 +5557,41 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
               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; }
-          no_cache=0
-          # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-debug_flag" >&5
+$as_echo_n "checking for --${enablestring:-enable}-debug_flag... " >&6; }
+          # Check whether --enable-debug_flag was given.
+if test "${enable_debug_flag+set}" = set; then :
+  enableval=$enable_debug_flag;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_shared='wxUSE_SHARED=yes'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                           else
                           else
-                            wx_cv_use_shared='wxUSE_SHARED=no'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
+                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_shared"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_shared >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_debug_flag"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SHARED = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_FLAG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_SHARED
+            result=$wxUSE_DEBUG_FLAG
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
-          enablestring=disable
+          enablestring=
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
@@ -4420,49 +5601,40 @@ 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; }
-          no_cache=0
-          # Check whether --enable-optimise was given.
-if test "${enable_optimise+set}" = set; then
-  enableval=$enable_optimise;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-debug_info" >&5
+$as_echo_n "checking for --${enablestring:-enable}-debug_info... " >&6; }
+          # Check whether --enable-debug_info was given.
+if test "${enable_debug_info+set}" = set; then :
+  enableval=$enable_debug_info;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                           else
                           else
-                            wx_cv_use_optimise='wxUSE_OPTIMISE=no'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
+                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_optimise"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_optimise >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_debug_info"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OPTIMISE = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_INFO = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_OPTIMISE
+            result=$wxUSE_DEBUG_INFO
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
 
 
           enablestring=
 
 
           enablestring=
@@ -4475,49 +5647,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-debug_gdb" >&5
+$as_echo_n "checking for --${enablestring:-enable}-debug_gdb... " >&6; }
+          # Check whether --enable-debug_gdb was given.
+if test "${enable_debug_gdb+set}" = set; then :
+  enableval=$enable_debug_gdb;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_debug='wxUSE_DEBUG=yes'
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
                           else
                           else
-                            wx_cv_use_debug='wxUSE_DEBUG=no'
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
+                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_debug"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_debug_gdb"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_GDB = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DEBUG
+            result=$wxUSE_DEBUG_GDB
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -4530,49 +5691,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-stl was given.
-if test "${enable_stl+set}" = set; then
-  enableval=$enable_stl;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-debug_cntxt" >&5
+$as_echo_n "checking for --${enablestring:-enable}-debug_cntxt... " >&6; }
+          # Check whether --enable-debug_cntxt was given.
+if test "${enable_debug_cntxt+set}" = set; then :
+  enableval=$enable_debug_cntxt;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_stl='wxUSE_STL=yes'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                           else
                           else
-                            wx_cv_use_stl='wxUSE_STL=no'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
+                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_stl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stl >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_debug_cntxt"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STL = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_CONTEXT = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_STL
+            result=$wxUSE_DEBUG_CONTEXT
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -4585,52 +5735,43 @@ 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; }
-          no_cache=0
-          # Check whether --enable-std_iostreams was given.
-if test "${enable_std_iostreams+set}" = set; then
-  enableval=$enable_std_iostreams;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mem_tracing" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mem_tracing... " >&6; }
+          # Check whether --enable-mem_tracing was given.
+if test "${enable_mem_tracing+set}" = set; then :
+  enableval=$enable_mem_tracing;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
                           else
                           else
-                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
+                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_std_iostreams"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_mem_tracing"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STD_IOSTREAM = yes; then
-              result=no
-            else
+            if test $wxUSE_MEM_TRACING = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_STD_IOSTREAM
+            result=$wxUSE_MEM_TRACING
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
-          enablestring=
+
+
+          enablestring=disable
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
@@ -4640,52 +5781,41 @@ 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; }
-          no_cache=0
-          # Check whether --enable-std_string was given.
-if test "${enable_std_string+set}" = set; then
-  enableval=$enable_std_string;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-shared" >&5
+$as_echo_n "checking for --${enablestring:-enable}-shared... " >&6; }
+          # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_std_string='wxUSE_STD_STRING=yes'
+                            wx_cv_use_shared='wxUSE_SHARED=yes'
                           else
                           else
-                            wx_cv_use_std_string='wxUSE_STD_STRING=no'
+                            wx_cv_use_shared='wxUSE_SHARED=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
+                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_std_string"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_std_string >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_shared"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STD_STRING = yes; then
-              result=no
-            else
+            if test $wxUSE_SHARED = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_STD_STRING
+            result=$wxUSE_SHARED
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
-          enablestring=disable
+          enablestring=
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
@@ -4695,50 +5825,44 @@ 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; }
-          no_cache=0
-          # Check whether --enable-unicode was given.
-if test "${enable_unicode+set}" = set; then
-  enableval=$enable_unicode;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-stl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-stl... " >&6; }
+          # Check whether --enable-stl was given.
+if test "${enable_stl+set}" = set; then :
+  enableval=$enable_stl;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_unicode='wxUSE_UNICODE=yes'
+                            wx_cv_use_stl='wxUSE_STL=yes'
                           else
                           else
-                            wx_cv_use_unicode='wxUSE_UNICODE=no'
+                            wx_cv_use_stl='wxUSE_STL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
+                          wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_unicode"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_unicode >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_stl"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNICODE = yes; then
-              result=no
-            else
+            if test $wxUSE_STL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_UNICODE
+            result=$wxUSE_STL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
+if test "$wxUSE_STL" = "yes"; then
+    DEFAULT_wxUSE_STD_CONTAINERS=yes
+    DEFAULT_wxUSE_STD_IOSTREAM=yes
+    DEFAULT_wxUSE_STD_STRING=yes
+fi
 
           enablestring=
           defaultval=
 
           enablestring=
           defaultval=
@@ -4750,81 +5874,82 @@ 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; }
-          no_cache=0
-          # Check whether --enable-mslu was given.
-if test "${enable_mslu+set}" = set; then
-  enableval=$enable_mslu;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-std_containers" >&5
+$as_echo_n "checking for --${enablestring:-enable}-std_containers... " >&6; }
+          # Check whether --enable-std_containers was given.
+if test "${enable_std_containers+set}" = set; then :
+  enableval=$enable_std_containers;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
+                            wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=yes'
                           else
                           else
-                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
+                            wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
+                          wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=${'DEFAULT_wxUSE_STD_CONTAINERS":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_mslu"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mslu >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_std_containers"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNICODE_MSLU = yes; then
-              result=no
-            else
+            if test $wxUSE_STD_CONTAINERS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_UNICODE_MSLU
+            result=$wxUSE_STD_CONTAINERS
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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; }
-          no_cache=0
-          # Check whether --enable-utf8 was given.
-if test "${enable_utf8+set}" = set; then
-  enableval=$enable_utf8;
-                          wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
-
-else
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
 
 
-                          LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-std_iostreams" >&5
+$as_echo_n "checking for --${enablestring:-enable}-std_iostreams... " >&6; }
+          # Check whether --enable-std_iostreams was given.
+if test "${enable_std_iostreams+set}" = set; then :
+  enableval=$enable_std_iostreams;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
                           else
                           else
-                            no_cache=1
+                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
 
                           fi
 
-                          wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
+else
+
+                          wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_utf8"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
+          eval "$wx_cv_use_std_iostreams"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STD_IOSTREAM = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_STD_IOSTREAM
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
-echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -4837,49 +5962,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-utf8only was given.
-if test "${enable_utf8only+set}" = set; then
-  enableval=$enable_utf8only;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-std_string" >&5
+$as_echo_n "checking for --${enablestring:-enable}-std_string... " >&6; }
+          # Check whether --enable-std_string was given.
+if test "${enable_std_string+set}" = set; then :
+  enableval=$enable_std_string;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
+                            wx_cv_use_std_string='wxUSE_STD_STRING=yes'
                           else
                           else
-                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
+                            wx_cv_use_std_string='wxUSE_STD_STRING=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
+                          wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_utf8only"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_utf8only >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_std_string"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then
-              result=no
-            else
+            if test $wxUSE_STD_STRING = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_UNICODE_UTF8_LOCALE
+            result=$wxUSE_STD_STRING
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -4892,54 +6006,41 @@ 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; }
-          no_cache=0
-          # Check whether --enable-extended_rtti was given.
-if test "${enable_extended_rtti+set}" = set; then
-  enableval=$enable_extended_rtti;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-std_string_conv_in_wxstring" >&5
+$as_echo_n "checking for --${enablestring:-enable}-std_string_conv_in_wxstring... " >&6; }
+          # Check whether --enable-std_string_conv_in_wxstring was given.
+if test "${enable_std_string_conv_in_wxstring+set}" = set; then :
+  enableval=$enable_std_string_conv_in_wxstring;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
+                            wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=yes'
                           else
                           else
-                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
+                            wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
+                          wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=${'DEFAULT_wxUSE_STD_STRING_CONV_IN_WXSTRING":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_extended_rtti"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_std_string_conv_in_wxstring"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EXTENDED_RTTI = yes; then
-              result=no
-            else
+            if test $wxUSE_STD_STRING_CONV_IN_WXSTRING = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_EXTENDED_RTTI
+            result=$wxUSE_STD_STRING_CONV_IN_WXSTRING
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
-if test "$USE_OS2" = "1"; then
-    DEFAULT_wxUSE_OMF=no
 
 
-          enablestring=
+          enablestring=disable
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
@@ -4949,61 +6050,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-omf was given.
-if test "${enable_omf+set}" = set; then
-  enableval=$enable_omf;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-unicode" >&5
+$as_echo_n "checking for --${enablestring:-enable}-unicode... " >&6; }
+          # Check whether --enable-unicode was given.
+if test "${enable_unicode+set}" = set; then :
+  enableval=$enable_unicode;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_omf='wxUSE_OMF=yes'
+                            wx_cv_use_unicode='wxUSE_UNICODE=yes'
                           else
                           else
-                            wx_cv_use_omf='wxUSE_OMF=no'
+                            wx_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
+                          wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_omf"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_omf >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_unicode"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OMF = yes; then
-              result=no
-            else
+            if test $wxUSE_UNICODE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_OMF
+            result=$wxUSE_UNICODE
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-fi
-
-if test "$wxUSE_DEBUG" = "yes"; then
-  DEFAULT_wxUSE_DEBUG_FLAG=yes
-  DEFAULT_wxUSE_DEBUG_INFO=yes
-  BUILD=debug
-elif test "$wxUSE_DEBUG" = "no"; then
-  DEFAULT_wxUSE_DEBUG_FLAG=no
-  DEFAULT_wxUSE_DEBUG_INFO=no
-  BUILD=release
-fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5016,49 +6094,59 @@ 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; }
-          no_cache=0
-          # Check whether --enable-debug_flag was given.
-if test "${enable_debug_flag+set}" = set; then
-  enableval=$enable_debug_flag;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mslu" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mslu... " >&6; }
+          # Check whether --enable-mslu was given.
+if test "${enable_mslu+set}" = set; then :
+  enableval=$enable_mslu;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
+                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
                           else
                           else
-                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
+                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
+                          wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_debug_flag"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_mslu"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_FLAG = yes; then
-              result=no
-            else
+            if test $wxUSE_UNICODE_MSLU = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DEBUG_FLAG
+            result=$wxUSE_UNICODE_MSLU
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+          enablestring=
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-utf8" >&5
+$as_echo_n "checking for --${enablestring:-enable}-utf8... " >&6; }
+          # Check whether --enable-utf8 was given.
+if test "${enable_utf8+set}" = set; then :
+  enableval=$enable_utf8;
+                          wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
+
+else
+
+                          wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
+
+fi
+
+
+          eval "$wx_cv_use_utf8"
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_UNICODE_UTF8" >&5
+$as_echo "$wxUSE_UNICODE_UTF8" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5071,49 +6159,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-debug_info was given.
-if test "${enable_debug_info+set}" = set; then
-  enableval=$enable_debug_info;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-utf8only" >&5
+$as_echo_n "checking for --${enablestring:-enable}-utf8only... " >&6; }
+          # Check whether --enable-utf8only was given.
+if test "${enable_utf8only+set}" = set; then :
+  enableval=$enable_utf8only;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
+                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
                           else
                           else
-                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
+                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
+                          wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_debug_info"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_info >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_utf8only"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_INFO = yes; then
-              result=no
-            else
+            if test $wxUSE_UNICODE_UTF8_LOCALE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DEBUG_INFO
+            result=$wxUSE_UNICODE_UTF8_LOCALE
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5126,50 +6203,41 @@ 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; }
-          no_cache=0
-          # Check whether --enable-debug_gdb was given.
-if test "${enable_debug_gdb+set}" = set; then
-  enableval=$enable_debug_gdb;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-extended_rtti" >&5
+$as_echo_n "checking for --${enablestring:-enable}-extended_rtti... " >&6; }
+          # Check whether --enable-extended_rtti was given.
+if test "${enable_extended_rtti+set}" = set; then :
+  enableval=$enable_extended_rtti;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
+                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
                           else
                           else
-                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
+                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
+                          wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_debug_gdb"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_extended_rtti"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_GDB = yes; then
-              result=no
-            else
+            if test $wxUSE_EXTENDED_RTTI = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DEBUG_GDB
+            result=$wxUSE_EXTENDED_RTTI
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
+if test "$USE_OS2" = 1; then
+    DEFAULT_wxUSE_OMF=no
 
           enablestring=
           defaultval=
 
           enablestring=
           defaultval=
@@ -5181,52 +6249,43 @@ 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; }
-          no_cache=0
-          # Check whether --enable-debug_cntxt was given.
-if test "${enable_debug_cntxt+set}" = set; then
-  enableval=$enable_debug_cntxt;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-omf" >&5
+$as_echo_n "checking for --${enablestring:-enable}-omf... " >&6; }
+          # Check whether --enable-omf was given.
+if test "${enable_omf+set}" = set; then :
+  enableval=$enable_omf;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
+                            wx_cv_use_omf='wxUSE_OMF=yes'
                           else
                           else
-                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
+                            wx_cv_use_omf='wxUSE_OMF=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
+                          wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_debug_cntxt"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_omf"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_CONTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_OMF = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DEBUG_CONTEXT
+            result=$wxUSE_OMF
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+fi
 
 
 
 
-          enablestring=
+          enablestring=disable
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
@@ -5236,49 +6295,39 @@ 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; }
-          no_cache=0
-          # Check whether --enable-mem_tracing was given.
-if test "${enable_mem_tracing+set}" = set; then
-  enableval=$enable_mem_tracing;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-optimise" >&5
+$as_echo_n "checking for --${enablestring:-enable}-optimise... " >&6; }
+          # Check whether --enable-optimise was given.
+if test "${enable_optimise+set}" = set; then :
+  enableval=$enable_optimise;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
                           else
                           else
-                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
+                          wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_mem_tracing"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_optimise"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MEM_TRACING = yes; then
-              result=no
-            else
+            if test $wxUSE_OPTIMISE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_MEM_TRACING
+            result=$wxUSE_OPTIMISE
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
 
 
           enablestring=
 
 
           enablestring=
@@ -5291,11 +6340,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-profile" >&5
+$as_echo_n "checking for --${enablestring:-enable}-profile... " >&6; }
           # Check whether --enable-profile was given.
           # Check whether --enable-profile was given.
-if test "${enable_profile+set}" = set; then
+if test "${enable_profile+set}" = set; then :
   enableval=$enable_profile;
                           if test "$enableval" = yes; then
                             wx_cv_use_profile='wxUSE_PROFILE=yes'
   enableval=$enable_profile;
                           if test "$enableval" = yes; then
                             wx_cv_use_profile='wxUSE_PROFILE=yes'
@@ -5305,35 +6353,25 @@ if test "${enable_profile+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_profile"
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_profile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_profile >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_PROFILE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PROFILE
           fi
 
             fi
           else
             result=$wxUSE_PROFILE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5346,11 +6384,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-no_rtti" >&5
+$as_echo_n "checking for --${enablestring:-enable}-no_rtti... " >&6; }
           # Check whether --enable-no_rtti was given.
           # Check whether --enable-no_rtti was given.
-if test "${enable_no_rtti+set}" = set; then
+if test "${enable_no_rtti+set}" = set; then :
   enableval=$enable_no_rtti;
                           if test "$enableval" = yes; then
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
   enableval=$enable_no_rtti;
                           if test "$enableval" = yes; then
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
@@ -5360,35 +6397,25 @@ if test "${enable_no_rtti+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_rtti"
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_rtti"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NO_RTTI = yes; then
-              result=no
-            else
+            if test $wxUSE_NO_RTTI = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_NO_RTTI
           fi
 
             fi
           else
             result=$wxUSE_NO_RTTI
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5401,11 +6428,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-no_exceptions" >&5
+$as_echo_n "checking for --${enablestring:-enable}-no_exceptions... " >&6; }
           # Check whether --enable-no_exceptions was given.
           # Check whether --enable-no_exceptions was given.
-if test "${enable_no_exceptions+set}" = set; then
+if test "${enable_no_exceptions+set}" = set; then :
   enableval=$enable_no_exceptions;
                           if test "$enableval" = yes; then
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
   enableval=$enable_no_exceptions;
                           if test "$enableval" = yes; then
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
@@ -5415,35 +6441,25 @@ if test "${enable_no_exceptions+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_exceptions"
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_exceptions"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NO_EXCEPTIONS = yes; then
-              result=no
-            else
+            if test $wxUSE_NO_EXCEPTIONS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_NO_EXCEPTIONS
           fi
 
             fi
           else
             result=$wxUSE_NO_EXCEPTIONS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5456,11 +6472,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-permissive" >&5
+$as_echo_n "checking for --${enablestring:-enable}-permissive... " >&6; }
           # Check whether --enable-permissive was given.
           # Check whether --enable-permissive was given.
-if test "${enable_permissive+set}" = set; then
+if test "${enable_permissive+set}" = set; then :
   enableval=$enable_permissive;
                           if test "$enableval" = yes; then
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=yes'
   enableval=$enable_permissive;
                           if test "$enableval" = yes; then
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=yes'
@@ -5470,35 +6485,25 @@ if test "${enable_permissive+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_permissive"
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_permissive"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_permissive >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PERMISSIVE = yes; then
-              result=no
-            else
+            if test $wxUSE_PERMISSIVE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PERMISSIVE
           fi
 
             fi
           else
             result=$wxUSE_PERMISSIVE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5511,11 +6516,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-no_deps" >&5
+$as_echo_n "checking for --${enablestring:-enable}-no_deps... " >&6; }
           # Check whether --enable-no_deps was given.
           # Check whether --enable-no_deps was given.
-if test "${enable_no_deps+set}" = set; then
+if test "${enable_no_deps+set}" = set; then :
   enableval=$enable_no_deps;
                           if test "$enableval" = yes; then
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=yes'
   enableval=$enable_no_deps;
                           if test "$enableval" = yes; then
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=yes'
@@ -5525,35 +6529,25 @@ if test "${enable_no_deps+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_deps"
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_deps"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_no_deps >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NO_DEPS = yes; then
-              result=no
-            else
+            if test $wxUSE_NO_DEPS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_NO_DEPS
           fi
 
             fi
           else
             result=$wxUSE_NO_DEPS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=disable
 
 
           enablestring=disable
@@ -5566,11 +6560,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-vararg_macros" >&5
+$as_echo_n "checking for --${enablestring:-enable}-vararg_macros... " >&6; }
           # Check whether --enable-vararg_macros was given.
           # Check whether --enable-vararg_macros was given.
-if test "${enable_vararg_macros+set}" = set; then
+if test "${enable_vararg_macros+set}" = set; then :
   enableval=$enable_vararg_macros;
                           if test "$enableval" = yes; then
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
   enableval=$enable_vararg_macros;
                           if test "$enableval" = yes; then
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
@@ -5580,67 +6573,68 @@ if test "${enable_vararg_macros+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_vararg_macros"
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_vararg_macros"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VARARG_MACROS = yes; then
-              result=no
-            else
+            if test $wxUSE_VARARG_MACROS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_VARARG_MACROS
           fi
 
             fi
           else
             result=$wxUSE_VARARG_MACROS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-universal_binary" >&5
+$as_echo_n "checking for --${enablestring:-enable}-universal_binary... " >&6; }
           # Check whether --enable-universal_binary was given.
           # Check whether --enable-universal_binary was given.
-if test "${enable_universal_binary+set}" = set; then
+if test "${enable_universal_binary+set}" = set; then :
   enableval=$enable_universal_binary;
                           wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
 
 else
 
   enableval=$enable_universal_binary;
                           wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
 
 else
 
-                          LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
 
 fi
 
 
           eval "$wx_cv_use_universal_binary"
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
 
 fi
 
 
           eval "$wx_cv_use_universal_binary"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_universal_binary >> ${wx_arg_cache_file}.tmp
-          fi
 
 
-          { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5
-echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_UNIVERSAL_BINARY" >&5
+$as_echo "$wxUSE_UNIVERSAL_BINARY" >&6; }
+
+
+          enablestring=
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-macosx_arch" >&5
+$as_echo_n "checking for --${enablestring:-enable}-macosx_arch... " >&6; }
+          # Check whether --enable-macosx_arch was given.
+if test "${enable_macosx_arch+set}" = set; then :
+  enableval=$enable_macosx_arch;
+                          wx_cv_use_macosx_arch="wxUSE_MAC_ARCH='$enableval'"
+
+else
+
+                          wx_cv_use_macosx_arch='wxUSE_MAC_ARCH='$DEFAULT_wxUSE_MAC_ARCH
+
+fi
+
+
+          eval "$wx_cv_use_macosx_arch"
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_MAC_ARCH" >&5
+$as_echo "$wxUSE_MAC_ARCH" >&6; }
 
 
 
 
 
 
@@ -5654,11 +6648,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-compat26" >&5
+$as_echo_n "checking for --${enablestring:-enable}-compat26... " >&6; }
           # Check whether --enable-compat26 was given.
           # Check whether --enable-compat26 was given.
-if test "${enable_compat26+set}" = set; then
+if test "${enable_compat26+set}" = set; then :
   enableval=$enable_compat26;
                           if test "$enableval" = yes; then
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
   enableval=$enable_compat26;
                           if test "$enableval" = yes; then
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
@@ -5668,35 +6661,25 @@ if test "${enable_compat26+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat26"
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat26"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_compat26 >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $WXWIN_COMPATIBILITY_2_6 = yes; then
-              result=no
-            else
+            if test $WXWIN_COMPATIBILITY_2_6 = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$WXWIN_COMPATIBILITY_2_6
           fi
 
             fi
           else
             result=$WXWIN_COMPATIBILITY_2_6
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=disable
 
 
           enablestring=disable
@@ -5709,11 +6692,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-compat28" >&5
+$as_echo_n "checking for --${enablestring:-enable}-compat28... " >&6; }
           # Check whether --enable-compat28 was given.
           # Check whether --enable-compat28 was given.
-if test "${enable_compat28+set}" = set; then
+if test "${enable_compat28+set}" = set; then :
   enableval=$enable_compat28;
                           if test "$enableval" = yes; then
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
   enableval=$enable_compat28;
                           if test "$enableval" = yes; then
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
@@ -5723,35 +6705,25 @@ if test "${enable_compat28+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat28"
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat28"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $WXWIN_COMPATIBILITY_2_8 = yes; then
-              result=no
-            else
+            if test $WXWIN_COMPATIBILITY_2_8 = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$WXWIN_COMPATIBILITY_2_8
           fi
 
             fi
           else
             result=$WXWIN_COMPATIBILITY_2_8
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -5765,11 +6737,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-rpath" >&5
+$as_echo_n "checking for --${enablestring:-enable}-rpath... " >&6; }
           # Check whether --enable-rpath was given.
           # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
+if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath;
                           if test "$enableval" = yes; then
                             wx_cv_use_rpath='wxUSE_RPATH=yes'
   enableval=$enable_rpath;
                           if test "$enableval" = yes; then
                             wx_cv_use_rpath='wxUSE_RPATH=yes'
@@ -5779,35 +6750,25 @@ if test "${enable_rpath+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_rpath"
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_rpath"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_rpath >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RPATH = yes; then
-              result=no
-            else
+            if test $wxUSE_RPATH = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_RPATH
           fi
 
             fi
           else
             result=$wxUSE_RPATH
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -5821,11 +6782,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-objc_uniquifying" >&5
+$as_echo_n "checking for --${enablestring:-enable}-objc_uniquifying... " >&6; }
           # Check whether --enable-objc_uniquifying was given.
           # Check whether --enable-objc_uniquifying was given.
-if test "${enable_objc_uniquifying+set}" = set; then
+if test "${enable_objc_uniquifying+set}" = set; then :
   enableval=$enable_objc_uniquifying;
                           if test "$enableval" = yes; then
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
   enableval=$enable_objc_uniquifying;
                           if test "$enableval" = yes; then
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
@@ -5835,35 +6795,25 @@ if test "${enable_objc_uniquifying+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_objc_uniquifying"
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_objc_uniquifying"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OBJC_UNIQUIFYING = yes; then
-              result=no
-            else
+            if test $wxUSE_OBJC_UNIQUIFYING = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_OBJC_UNIQUIFYING
           fi
 
             fi
           else
             result=$wxUSE_OBJC_UNIQUIFYING
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -5877,11 +6827,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-visibility" >&5
+$as_echo_n "checking for --${enablestring:-enable}-visibility... " >&6; }
           # Check whether --enable-visibility was given.
           # Check whether --enable-visibility was given.
-if test "${enable_visibility+set}" = set; then
+if test "${enable_visibility+set}" = set; then :
   enableval=$enable_visibility;
                           if test "$enableval" = yes; then
                             wx_cv_use_visibility='wxUSE_VISIBILITY=yes'
   enableval=$enable_visibility;
                           if test "$enableval" = yes; then
                             wx_cv_use_visibility='wxUSE_VISIBILITY=yes'
@@ -5891,35 +6840,69 @@ if test "${enable_visibility+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_visibility"
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_visibility"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_visibility >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VISIBILITY = yes; then
-              result=no
-            else
+            if test $wxUSE_VISIBILITY = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_VISIBILITY
           fi
 
             fi
           else
             result=$wxUSE_VISIBILITY
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+          enablestring=disable
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-tls" >&5
+$as_echo_n "checking for --${enablestring:-enable}-tls... " >&6; }
+          # Check whether --enable-tls was given.
+if test "${enable_tls+set}" = set; then :
+  enableval=$enable_tls;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_tls='wxUSE_COMPILER_TLS=yes'
+                          else
+                            wx_cv_use_tls='wxUSE_COMPILER_TLS=no'
+                          fi
+
+else
+
+                          wx_cv_use_tls='wxUSE_COMPILER_TLS=${'DEFAULT_wxUSE_COMPILER_TLS":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_tls"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COMPILER_TLS = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_COMPILER_TLS
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -5934,11 +6917,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-intl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-intl... " >&6; }
           # Check whether --enable-intl was given.
           # Check whether --enable-intl was given.
-if test "${enable_intl+set}" = set; then
+if test "${enable_intl+set}" = set; then :
   enableval=$enable_intl;
                           if test "$enableval" = yes; then
                             wx_cv_use_intl='wxUSE_INTL=yes'
   enableval=$enable_intl;
                           if test "$enableval" = yes; then
                             wx_cv_use_intl='wxUSE_INTL=yes'
@@ -5948,35 +6930,69 @@ if test "${enable_intl+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_intl"
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_intl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_intl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_INTL = yes; then
-              result=no
-            else
+            if test $wxUSE_INTL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_INTL
           fi
 
             fi
           else
             result=$wxUSE_INTL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-xlocale" >&5
+$as_echo_n "checking for --${enablestring:-enable}-xlocale... " >&6; }
+          # Check whether --enable-xlocale was given.
+if test "${enable_xlocale+set}" = set; then :
+  enableval=$enable_xlocale;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_xlocale='wxUSE_XLOCALE=yes'
+                          else
+                            wx_cv_use_xlocale='wxUSE_XLOCALE=no'
+                          fi
+
+else
+
+                          wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_xlocale"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_XLOCALE = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_XLOCALE
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -5989,11 +7005,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-config" >&5
+$as_echo_n "checking for --${enablestring:-enable}-config... " >&6; }
           # Check whether --enable-config was given.
           # Check whether --enable-config was given.
-if test "${enable_config+set}" = set; then
+if test "${enable_config+set}" = set; then :
   enableval=$enable_config;
                           if test "$enableval" = yes; then
                             wx_cv_use_config='wxUSE_CONFIG=yes'
   enableval=$enable_config;
                           if test "$enableval" = yes; then
                             wx_cv_use_config='wxUSE_CONFIG=yes'
@@ -6003,35 +7018,25 @@ if test "${enable_config+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_config"
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_config"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_config >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONFIG = yes; then
-              result=no
-            else
+            if test $wxUSE_CONFIG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CONFIG
           fi
 
             fi
           else
             result=$wxUSE_CONFIG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -6045,11 +7050,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-protocols" >&5
+$as_echo_n "checking for --${enablestring:-enable}-protocols... " >&6; }
           # Check whether --enable-protocols was given.
           # Check whether --enable-protocols was given.
-if test "${enable_protocols+set}" = set; then
+if test "${enable_protocols+set}" = set; then :
   enableval=$enable_protocols;
                           if test "$enableval" = yes; then
                             wx_cv_use_protocols='wxUSE_PROTOCOL=yes'
   enableval=$enable_protocols;
                           if test "$enableval" = yes; then
                             wx_cv_use_protocols='wxUSE_PROTOCOL=yes'
@@ -6059,35 +7063,25 @@ if test "${enable_protocols+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocols"
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocols"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocols >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PROTOCOL
           fi
 
             fi
           else
             result=$wxUSE_PROTOCOL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6100,11 +7094,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ftp" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ftp... " >&6; }
           # Check whether --enable-ftp was given.
           # Check whether --enable-ftp was given.
-if test "${enable_ftp+set}" = set; then
+if test "${enable_ftp+set}" = set; then :
   enableval=$enable_ftp;
                           if test "$enableval" = yes; then
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
   enableval=$enable_ftp;
                           if test "$enableval" = yes; then
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
@@ -6114,35 +7107,25 @@ if test "${enable_ftp+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ftp"
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ftp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ftp >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FTP = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FTP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PROTOCOL_FTP
           fi
 
             fi
           else
             result=$wxUSE_PROTOCOL_FTP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6155,11 +7138,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-http" >&5
+$as_echo_n "checking for --${enablestring:-enable}-http... " >&6; }
           # Check whether --enable-http was given.
           # Check whether --enable-http was given.
-if test "${enable_http+set}" = set; then
+if test "${enable_http+set}" = set; then :
   enableval=$enable_http;
                           if test "$enableval" = yes; then
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
   enableval=$enable_http;
                           if test "$enableval" = yes; then
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
@@ -6169,35 +7151,25 @@ if test "${enable_http+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_http"
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_http"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_http >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_HTTP = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_HTTP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PROTOCOL_HTTP
           fi
 
             fi
           else
             result=$wxUSE_PROTOCOL_HTTP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6210,11 +7182,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fileproto" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fileproto... " >&6; }
           # Check whether --enable-fileproto was given.
           # Check whether --enable-fileproto was given.
-if test "${enable_fileproto+set}" = set; then
+if test "${enable_fileproto+set}" = set; then :
   enableval=$enable_fileproto;
                           if test "$enableval" = yes; then
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
   enableval=$enable_fileproto;
                           if test "$enableval" = yes; then
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
@@ -6224,35 +7195,25 @@ if test "${enable_fileproto+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fileproto"
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fileproto"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fileproto >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FILE = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FILE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PROTOCOL_FILE
           fi
 
             fi
           else
             result=$wxUSE_PROTOCOL_FILE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6265,11 +7226,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-sockets" >&5
+$as_echo_n "checking for --${enablestring:-enable}-sockets... " >&6; }
           # Check whether --enable-sockets was given.
           # Check whether --enable-sockets was given.
-if test "${enable_sockets+set}" = set; then
+if test "${enable_sockets+set}" = set; then :
   enableval=$enable_sockets;
                           if test "$enableval" = yes; then
                             wx_cv_use_sockets='wxUSE_SOCKETS=yes'
   enableval=$enable_sockets;
                           if test "$enableval" = yes; then
                             wx_cv_use_sockets='wxUSE_SOCKETS=yes'
@@ -6279,35 +7239,69 @@ if test "${enable_sockets+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sockets"
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sockets"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sockets >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SOCKETS = yes; then
-              result=no
-            else
+            if test $wxUSE_SOCKETS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SOCKETS
           fi
 
             fi
           else
             result=$wxUSE_SOCKETS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ipv6" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ipv6... " >&6; }
+          # Check whether --enable-ipv6 was given.
+if test "${enable_ipv6+set}" = set; then :
+  enableval=$enable_ipv6;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ipv6='wxUSE_IPV6=yes'
+                          else
+                            wx_cv_use_ipv6='wxUSE_IPV6=no'
+                          fi
+
+else
+
+                          wx_cv_use_ipv6='wxUSE_IPV6=${'DEFAULT_wxUSE_IPV6":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ipv6"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_IPV6 = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_IPV6
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6320,11 +7314,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ole" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ole... " >&6; }
           # Check whether --enable-ole was given.
           # Check whether --enable-ole was given.
-if test "${enable_ole+set}" = set; then
+if test "${enable_ole+set}" = set; then :
   enableval=$enable_ole;
                           if test "$enableval" = yes; then
                             wx_cv_use_ole='wxUSE_OLE=yes'
   enableval=$enable_ole;
                           if test "$enableval" = yes; then
                             wx_cv_use_ole='wxUSE_OLE=yes'
@@ -6334,35 +7327,25 @@ if test "${enable_ole+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ole"
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ole"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ole >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OLE = yes; then
-              result=no
-            else
+            if test $wxUSE_OLE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_OLE
           fi
 
             fi
           else
             result=$wxUSE_OLE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6375,11 +7358,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dataobj" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dataobj... " >&6; }
           # Check whether --enable-dataobj was given.
           # Check whether --enable-dataobj was given.
-if test "${enable_dataobj+set}" = set; then
+if test "${enable_dataobj+set}" = set; then :
   enableval=$enable_dataobj;
                           if test "$enableval" = yes; then
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=yes'
   enableval=$enable_dataobj;
                           if test "$enableval" = yes; then
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=yes'
@@ -6389,35 +7371,25 @@ if test "${enable_dataobj+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dataobj"
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dataobj"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATAOBJ = yes; then
-              result=no
-            else
+            if test $wxUSE_DATAOBJ = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DATAOBJ
           fi
 
             fi
           else
             result=$wxUSE_DATAOBJ
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -6431,11 +7403,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ipc" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ipc... " >&6; }
           # Check whether --enable-ipc was given.
           # Check whether --enable-ipc was given.
-if test "${enable_ipc+set}" = set; then
+if test "${enable_ipc+set}" = set; then :
   enableval=$enable_ipc;
                           if test "$enableval" = yes; then
                             wx_cv_use_ipc='wxUSE_IPC=yes'
   enableval=$enable_ipc;
                           if test "$enableval" = yes; then
                             wx_cv_use_ipc='wxUSE_IPC=yes'
@@ -6445,35 +7416,25 @@ if test "${enable_ipc+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ipc"
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ipc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ipc >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IPC = yes; then
-              result=no
-            else
+            if test $wxUSE_IPC = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_IPC
           fi
 
             fi
           else
             result=$wxUSE_IPC
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -6487,11 +7448,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-baseevtloop" >&5
+$as_echo_n "checking for --${enablestring:-enable}-baseevtloop... " >&6; }
           # Check whether --enable-baseevtloop was given.
           # Check whether --enable-baseevtloop was given.
-if test "${enable_baseevtloop+set}" = set; then
+if test "${enable_baseevtloop+set}" = set; then :
   enableval=$enable_baseevtloop;
                           if test "$enableval" = yes; then
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes'
   enableval=$enable_baseevtloop;
                           if test "$enableval" = yes; then
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes'
@@ -6501,35 +7461,25 @@ if test "${enable_baseevtloop+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_baseevtloop"
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_baseevtloop"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_baseevtloop >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
-              result=no
-            else
+            if test $wxUSE_CONSOLE_EVENTLOOP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CONSOLE_EVENTLOOP
           fi
 
             fi
           else
             result=$wxUSE_CONSOLE_EVENTLOOP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6542,49 +7492,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-epoolloop was given.
-if test "${enable_epoolloop+set}" = set; then
-  enableval=$enable_epoolloop;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-epollloop" >&5
+$as_echo_n "checking for --${enablestring:-enable}-epollloop... " >&6; }
+          # Check whether --enable-epollloop was given.
+if test "${enable_epollloop+set}" = set; then :
+  enableval=$enable_epollloop;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes'
+                            wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes'
                           else
                           else
-                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no'
+                            wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
+                          wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_epoolloop"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_epoolloop >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_epollloop"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EPOLL_DISPATCHER = yes; then
-              result=no
-            else
+            if test $wxUSE_EPOLL_DISPATCHER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_EPOLL_DISPATCHER
           fi
 
             fi
           else
             result=$wxUSE_EPOLL_DISPATCHER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6597,11 +7536,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-selectloop" >&5
+$as_echo_n "checking for --${enablestring:-enable}-selectloop... " >&6; }
           # Check whether --enable-selectloop was given.
           # Check whether --enable-selectloop was given.
-if test "${enable_selectloop+set}" = set; then
+if test "${enable_selectloop+set}" = set; then :
   enableval=$enable_selectloop;
                           if test "$enableval" = yes; then
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes'
   enableval=$enable_selectloop;
                           if test "$enableval" = yes; then
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes'
@@ -6611,37 +7549,71 @@ if test "${enable_selectloop+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_selectloop"
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_selectloop"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_selectloop >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SELECT_DISPATCHER = yes; then
-              result=no
-            else
+            if test $wxUSE_SELECT_DISPATCHER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SELECT_DISPATCHER
           fi
 
             fi
           else
             result=$wxUSE_SELECT_DISPATCHER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-any" >&5
+$as_echo_n "checking for --${enablestring:-enable}-any... " >&6; }
+          # Check whether --enable-any was given.
+if test "${enable_any+set}" = set; then :
+  enableval=$enable_any;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_any='wxUSE_ANY=yes'
+                          else
+                            wx_cv_use_any='wxUSE_ANY=no'
+                          fi
+
+else
+
+                          wx_cv_use_any='wxUSE_ANY=${'DEFAULT_wxUSE_ANY":-$defaultval}"
+
+fi
 
 
 
 
+          eval "$wx_cv_use_any"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ANY = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_ANY
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
 
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
 
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
@@ -6653,11 +7625,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-apple_ieee" >&5
+$as_echo_n "checking for --${enablestring:-enable}-apple_ieee... " >&6; }
           # Check whether --enable-apple_ieee was given.
           # Check whether --enable-apple_ieee was given.
-if test "${enable_apple_ieee+set}" = set; then
+if test "${enable_apple_ieee+set}" = set; then :
   enableval=$enable_apple_ieee;
                           if test "$enableval" = yes; then
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
   enableval=$enable_apple_ieee;
                           if test "$enableval" = yes; then
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
@@ -6667,35 +7638,25 @@ if test "${enable_apple_ieee+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_apple_ieee"
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_apple_ieee"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_APPLE_IEEE = yes; then
-              result=no
-            else
+            if test $wxUSE_APPLE_IEEE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_APPLE_IEEE
           fi
 
             fi
           else
             result=$wxUSE_APPLE_IEEE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6708,11 +7669,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-arcstream" >&5
+$as_echo_n "checking for --${enablestring:-enable}-arcstream... " >&6; }
           # Check whether --enable-arcstream was given.
           # Check whether --enable-arcstream was given.
-if test "${enable_arcstream+set}" = set; then
+if test "${enable_arcstream+set}" = set; then :
   enableval=$enable_arcstream;
                           if test "$enableval" = yes; then
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
   enableval=$enable_arcstream;
                           if test "$enableval" = yes; then
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
@@ -6722,35 +7682,25 @@ if test "${enable_arcstream+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_arcstream"
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_arcstream"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ARCHIVE_STREAMS = yes; then
-              result=no
-            else
+            if test $wxUSE_ARCHIVE_STREAMS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ARCHIVE_STREAMS
           fi
 
             fi
           else
             result=$wxUSE_ARCHIVE_STREAMS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6763,11 +7713,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-base64" >&5
+$as_echo_n "checking for --${enablestring:-enable}-base64... " >&6; }
           # Check whether --enable-base64 was given.
           # Check whether --enable-base64 was given.
-if test "${enable_base64+set}" = set; then
+if test "${enable_base64+set}" = set; then :
   enableval=$enable_base64;
                           if test "$enableval" = yes; then
                             wx_cv_use_base64='wxUSE_BASE64=yes'
   enableval=$enable_base64;
                           if test "$enableval" = yes; then
                             wx_cv_use_base64='wxUSE_BASE64=yes'
@@ -6777,35 +7726,25 @@ if test "${enable_base64+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_base64"
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_base64"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_base64 >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BASE64 = yes; then
-              result=no
-            else
+            if test $wxUSE_BASE64 = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_BASE64
           fi
 
             fi
           else
             result=$wxUSE_BASE64
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6818,11 +7757,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-backtrace" >&5
+$as_echo_n "checking for --${enablestring:-enable}-backtrace... " >&6; }
           # Check whether --enable-backtrace was given.
           # Check whether --enable-backtrace was given.
-if test "${enable_backtrace+set}" = set; then
+if test "${enable_backtrace+set}" = set; then :
   enableval=$enable_backtrace;
                           if test "$enableval" = yes; then
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=yes'
   enableval=$enable_backtrace;
                           if test "$enableval" = yes; then
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=yes'
@@ -6832,35 +7770,25 @@ if test "${enable_backtrace+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_backtrace"
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_backtrace"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STACKWALKER = yes; then
-              result=no
-            else
+            if test $wxUSE_STACKWALKER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STACKWALKER
           fi
 
             fi
           else
             result=$wxUSE_STACKWALKER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6873,11 +7801,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-catch_segvs" >&5
+$as_echo_n "checking for --${enablestring:-enable}-catch_segvs... " >&6; }
           # Check whether --enable-catch_segvs was given.
           # Check whether --enable-catch_segvs was given.
-if test "${enable_catch_segvs+set}" = set; then
+if test "${enable_catch_segvs+set}" = set; then :
   enableval=$enable_catch_segvs;
                           if test "$enableval" = yes; then
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
   enableval=$enable_catch_segvs;
                           if test "$enableval" = yes; then
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
@@ -6887,35 +7814,25 @@ if test "${enable_catch_segvs+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_catch_segvs"
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_catch_segvs"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ON_FATAL_EXCEPTION = yes; then
-              result=no
-            else
+            if test $wxUSE_ON_FATAL_EXCEPTION = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ON_FATAL_EXCEPTION
           fi
 
             fi
           else
             result=$wxUSE_ON_FATAL_EXCEPTION
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6928,11 +7845,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-cmdline" >&5
+$as_echo_n "checking for --${enablestring:-enable}-cmdline... " >&6; }
           # Check whether --enable-cmdline was given.
           # Check whether --enable-cmdline was given.
-if test "${enable_cmdline+set}" = set; then
+if test "${enable_cmdline+set}" = set; then :
   enableval=$enable_cmdline;
                           if test "$enableval" = yes; then
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
   enableval=$enable_cmdline;
                           if test "$enableval" = yes; then
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
@@ -6942,35 +7858,25 @@ if test "${enable_cmdline+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_cmdline"
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_cmdline"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CMDLINE_PARSER = yes; then
-              result=no
-            else
+            if test $wxUSE_CMDLINE_PARSER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CMDLINE_PARSER
           fi
 
             fi
           else
             result=$wxUSE_CMDLINE_PARSER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -6983,11 +7889,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-datetime" >&5
+$as_echo_n "checking for --${enablestring:-enable}-datetime... " >&6; }
           # Check whether --enable-datetime was given.
           # Check whether --enable-datetime was given.
-if test "${enable_datetime+set}" = set; then
+if test "${enable_datetime+set}" = set; then :
   enableval=$enable_datetime;
                           if test "$enableval" = yes; then
                             wx_cv_use_datetime='wxUSE_DATETIME=yes'
   enableval=$enable_datetime;
                           if test "$enableval" = yes; then
                             wx_cv_use_datetime='wxUSE_DATETIME=yes'
@@ -6997,35 +7902,25 @@ if test "${enable_datetime+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datetime"
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datetime"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_datetime >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATETIME = yes; then
-              result=no
-            else
+            if test $wxUSE_DATETIME = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DATETIME
           fi
 
             fi
           else
             result=$wxUSE_DATETIME
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7038,11 +7933,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-debugreport" >&5
+$as_echo_n "checking for --${enablestring:-enable}-debugreport... " >&6; }
           # Check whether --enable-debugreport was given.
           # Check whether --enable-debugreport was given.
-if test "${enable_debugreport+set}" = set; then
+if test "${enable_debugreport+set}" = set; then :
   enableval=$enable_debugreport;
                           if test "$enableval" = yes; then
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
   enableval=$enable_debugreport;
                           if test "$enableval" = yes; then
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
@@ -7052,35 +7946,25 @@ if test "${enable_debugreport+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debugreport"
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debugreport"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debugreport >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUGREPORT = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUGREPORT = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DEBUGREPORT
           fi
 
             fi
           else
             result=$wxUSE_DEBUGREPORT
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7093,11 +7977,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dialupman" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dialupman... " >&6; }
           # Check whether --enable-dialupman was given.
           # Check whether --enable-dialupman was given.
-if test "${enable_dialupman+set}" = set; then
+if test "${enable_dialupman+set}" = set; then :
   enableval=$enable_dialupman;
                           if test "$enableval" = yes; then
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
   enableval=$enable_dialupman;
                           if test "$enableval" = yes; then
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
@@ -7107,35 +7990,25 @@ if test "${enable_dialupman+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dialupman"
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dialupman"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIALUP_MANAGER = yes; then
-              result=no
-            else
+            if test $wxUSE_DIALUP_MANAGER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DIALUP_MANAGER
           fi
 
             fi
           else
             result=$wxUSE_DIALUP_MANAGER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7148,11 +8021,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dynlib" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dynlib... " >&6; }
           # Check whether --enable-dynlib was given.
           # Check whether --enable-dynlib was given.
-if test "${enable_dynlib+set}" = set; then
+if test "${enable_dynlib+set}" = set; then :
   enableval=$enable_dynlib;
                           if test "$enableval" = yes; then
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
   enableval=$enable_dynlib;
                           if test "$enableval" = yes; then
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
@@ -7162,35 +8034,25 @@ if test "${enable_dynlib+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynlib"
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynlib"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DYNLIB_CLASS = yes; then
-              result=no
-            else
+            if test $wxUSE_DYNLIB_CLASS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DYNLIB_CLASS
           fi
 
             fi
           else
             result=$wxUSE_DYNLIB_CLASS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7203,11 +8065,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dynamicloader" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dynamicloader... " >&6; }
           # Check whether --enable-dynamicloader was given.
           # Check whether --enable-dynamicloader was given.
-if test "${enable_dynamicloader+set}" = set; then
+if test "${enable_dynamicloader+set}" = set; then :
   enableval=$enable_dynamicloader;
                           if test "$enableval" = yes; then
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
   enableval=$enable_dynamicloader;
                           if test "$enableval" = yes; then
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
@@ -7217,35 +8078,25 @@ if test "${enable_dynamicloader+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynamicloader"
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynamicloader"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DYNAMIC_LOADER = yes; then
-              result=no
-            else
+            if test $wxUSE_DYNAMIC_LOADER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DYNAMIC_LOADER
           fi
 
             fi
           else
             result=$wxUSE_DYNAMIC_LOADER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7258,11 +8109,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-exceptions" >&5
+$as_echo_n "checking for --${enablestring:-enable}-exceptions... " >&6; }
           # Check whether --enable-exceptions was given.
           # Check whether --enable-exceptions was given.
-if test "${enable_exceptions+set}" = set; then
+if test "${enable_exceptions+set}" = set; then :
   enableval=$enable_exceptions;
                           if test "$enableval" = yes; then
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
   enableval=$enable_exceptions;
                           if test "$enableval" = yes; then
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
@@ -7272,35 +8122,25 @@ if test "${enable_exceptions+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_exceptions"
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_exceptions"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EXCEPTIONS = yes; then
-              result=no
-            else
+            if test $wxUSE_EXCEPTIONS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_EXCEPTIONS
           fi
 
             fi
           else
             result=$wxUSE_EXCEPTIONS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7313,11 +8153,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ffile" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ffile... " >&6; }
           # Check whether --enable-ffile was given.
           # Check whether --enable-ffile was given.
-if test "${enable_ffile+set}" = set; then
+if test "${enable_ffile+set}" = set; then :
   enableval=$enable_ffile;
                           if test "$enableval" = yes; then
                             wx_cv_use_ffile='wxUSE_FFILE=yes'
   enableval=$enable_ffile;
                           if test "$enableval" = yes; then
                             wx_cv_use_ffile='wxUSE_FFILE=yes'
@@ -7327,35 +8166,25 @@ if test "${enable_ffile+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ffile"
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ffile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ffile >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_FFILE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FFILE
           fi
 
             fi
           else
             result=$wxUSE_FFILE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7368,11 +8197,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-file" >&5
+$as_echo_n "checking for --${enablestring:-enable}-file... " >&6; }
           # Check whether --enable-file was given.
           # Check whether --enable-file was given.
-if test "${enable_file+set}" = set; then
+if test "${enable_file+set}" = set; then :
   enableval=$enable_file;
                           if test "$enableval" = yes; then
                             wx_cv_use_file='wxUSE_FILE=yes'
   enableval=$enable_file;
                           if test "$enableval" = yes; then
                             wx_cv_use_file='wxUSE_FILE=yes'
@@ -7382,35 +8210,25 @@ if test "${enable_file+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_file"
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_file"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_file >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILE = yes; then
-              result=no
-            else
+            if test $wxUSE_FILE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FILE
           fi
 
             fi
           else
             result=$wxUSE_FILE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7423,11 +8241,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-filehistory" >&5
+$as_echo_n "checking for --${enablestring:-enable}-filehistory... " >&6; }
+          # Check whether --enable-filehistory was given.
+if test "${enable_filehistory+set}" = set; then :
+  enableval=$enable_filehistory;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_filehistory='wxUSE_FILE_HISTORY=yes'
+                          else
+                            wx_cv_use_filehistory='wxUSE_FILE_HISTORY=no'
+                          fi
+
+else
+
+                          wx_cv_use_filehistory='wxUSE_FILE_HISTORY=${'DEFAULT_wxUSE_FILE_HISTORY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_filehistory"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FILE_HISTORY = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_FILE_HISTORY
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-filesystem" >&5
+$as_echo_n "checking for --${enablestring:-enable}-filesystem... " >&6; }
           # Check whether --enable-filesystem was given.
           # Check whether --enable-filesystem was given.
-if test "${enable_filesystem+set}" = set; then
+if test "${enable_filesystem+set}" = set; then :
   enableval=$enable_filesystem;
                           if test "$enableval" = yes; then
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
   enableval=$enable_filesystem;
                           if test "$enableval" = yes; then
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
@@ -7437,35 +8298,25 @@ if test "${enable_filesystem+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filesystem"
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filesystem"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILESYSTEM = yes; then
-              result=no
-            else
+            if test $wxUSE_FILESYSTEM = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FILESYSTEM
           fi
 
             fi
           else
             result=$wxUSE_FILESYSTEM
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7478,11 +8329,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fontenum" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fontenum... " >&6; }
+          # Check whether --enable-fontenum was given.
+if test "${enable_fontenum+set}" = set; then :
+  enableval=$enable_fontenum;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_fontenum='wxUSE_FONTENUM=yes'
+                          else
+                            wx_cv_use_fontenum='wxUSE_FONTENUM=no'
+                          fi
+
+else
+
+                          wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_fontenum"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FONTENUM = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_FONTENUM
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fontmap" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fontmap... " >&6; }
           # Check whether --enable-fontmap was given.
           # Check whether --enable-fontmap was given.
-if test "${enable_fontmap+set}" = set; then
+if test "${enable_fontmap+set}" = set; then :
   enableval=$enable_fontmap;
                           if test "$enableval" = yes; then
                             wx_cv_use_fontmap='wxUSE_FONTMAP=yes'
   enableval=$enable_fontmap;
                           if test "$enableval" = yes; then
                             wx_cv_use_fontmap='wxUSE_FONTMAP=yes'
@@ -7492,35 +8386,25 @@ if test "${enable_fontmap+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontmap"
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontmap"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FONTMAP = yes; then
-              result=no
-            else
+            if test $wxUSE_FONTMAP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FONTMAP
           fi
 
             fi
           else
             result=$wxUSE_FONTMAP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7533,11 +8417,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fs_archive" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fs_archive... " >&6; }
           # Check whether --enable-fs_archive was given.
           # Check whether --enable-fs_archive was given.
-if test "${enable_fs_archive+set}" = set; then
+if test "${enable_fs_archive+set}" = set; then :
   enableval=$enable_fs_archive;
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
   enableval=$enable_fs_archive;
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
@@ -7547,35 +8430,25 @@ if test "${enable_fs_archive+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_archive"
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_archive"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FS_ARCHIVE = yes; then
-              result=no
-            else
+            if test $wxUSE_FS_ARCHIVE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FS_ARCHIVE
           fi
 
             fi
           else
             result=$wxUSE_FS_ARCHIVE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7588,11 +8461,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fs_inet" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fs_inet... " >&6; }
           # Check whether --enable-fs_inet was given.
           # Check whether --enable-fs_inet was given.
-if test "${enable_fs_inet+set}" = set; then
+if test "${enable_fs_inet+set}" = set; then :
   enableval=$enable_fs_inet;
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_inet='wxUSE_FS_INET=yes'
   enableval=$enable_fs_inet;
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_inet='wxUSE_FS_INET=yes'
@@ -7602,35 +8474,25 @@ if test "${enable_fs_inet+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_inet"
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_inet"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FS_INET = yes; then
-              result=no
-            else
+            if test $wxUSE_FS_INET = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FS_INET
           fi
 
             fi
           else
             result=$wxUSE_FS_INET
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7643,11 +8505,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fs_zip" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fs_zip... " >&6; }
           # Check whether --enable-fs_zip was given.
           # Check whether --enable-fs_zip was given.
-if test "${enable_fs_zip+set}" = set; then
+if test "${enable_fs_zip+set}" = set; then :
   enableval=$enable_fs_zip;
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
   enableval=$enable_fs_zip;
                           if test "$enableval" = yes; then
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
@@ -7657,35 +8518,25 @@ if test "${enable_fs_zip+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_zip"
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_zip"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FS_ZIP = yes; then
-              result=no
-            else
+            if test $wxUSE_FS_ZIP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FS_ZIP
           fi
 
             fi
           else
             result=$wxUSE_FS_ZIP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7698,11 +8549,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fswatcher" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fswatcher... " >&6; }
+          # Check whether --enable-fswatcher was given.
+if test "${enable_fswatcher+set}" = set; then :
+  enableval=$enable_fswatcher;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_fswatcher='wxUSE_FSWATCHER=yes'
+                          else
+                            wx_cv_use_fswatcher='wxUSE_FSWATCHER=no'
+                          fi
+
+else
+
+                          wx_cv_use_fswatcher='wxUSE_FSWATCHER=${'DEFAULT_wxUSE_FSWATCHER":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_fswatcher"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FSWATCHER = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_FSWATCHER
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-geometry" >&5
+$as_echo_n "checking for --${enablestring:-enable}-geometry... " >&6; }
           # Check whether --enable-geometry was given.
           # Check whether --enable-geometry was given.
-if test "${enable_geometry+set}" = set; then
+if test "${enable_geometry+set}" = set; then :
   enableval=$enable_geometry;
                           if test "$enableval" = yes; then
                             wx_cv_use_geometry='wxUSE_GEOMETRY=yes'
   enableval=$enable_geometry;
                           if test "$enableval" = yes; then
                             wx_cv_use_geometry='wxUSE_GEOMETRY=yes'
@@ -7712,35 +8606,25 @@ if test "${enable_geometry+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_geometry"
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_geometry"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_geometry >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GEOMETRY = yes; then
-              result=no
-            else
+            if test $wxUSE_GEOMETRY = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_GEOMETRY
           fi
 
             fi
           else
             result=$wxUSE_GEOMETRY
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7753,11 +8637,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-log" >&5
+$as_echo_n "checking for --${enablestring:-enable}-log... " >&6; }
           # Check whether --enable-log was given.
           # Check whether --enable-log was given.
-if test "${enable_log+set}" = set; then
+if test "${enable_log+set}" = set; then :
   enableval=$enable_log;
                           if test "$enableval" = yes; then
                             wx_cv_use_log='wxUSE_LOG=yes'
   enableval=$enable_log;
                           if test "$enableval" = yes; then
                             wx_cv_use_log='wxUSE_LOG=yes'
@@ -7767,35 +8650,25 @@ if test "${enable_log+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_log"
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_log"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_log >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOG = yes; then
-              result=no
-            else
+            if test $wxUSE_LOG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_LOG
           fi
 
             fi
           else
             result=$wxUSE_LOG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7808,11 +8681,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-longlong" >&5
+$as_echo_n "checking for --${enablestring:-enable}-longlong... " >&6; }
           # Check whether --enable-longlong was given.
           # Check whether --enable-longlong was given.
-if test "${enable_longlong+set}" = set; then
+if test "${enable_longlong+set}" = set; then :
   enableval=$enable_longlong;
                           if test "$enableval" = yes; then
                             wx_cv_use_longlong='wxUSE_LONGLONG=yes'
   enableval=$enable_longlong;
                           if test "$enableval" = yes; then
                             wx_cv_use_longlong='wxUSE_LONGLONG=yes'
@@ -7822,35 +8694,25 @@ if test "${enable_longlong+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_longlong"
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_longlong"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_longlong >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LONGLONG = yes; then
-              result=no
-            else
+            if test $wxUSE_LONGLONG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_LONGLONG
           fi
 
             fi
           else
             result=$wxUSE_LONGLONG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7863,11 +8725,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mimetype" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mimetype... " >&6; }
           # Check whether --enable-mimetype was given.
           # Check whether --enable-mimetype was given.
-if test "${enable_mimetype+set}" = set; then
+if test "${enable_mimetype+set}" = set; then :
   enableval=$enable_mimetype;
                           if test "$enableval" = yes; then
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=yes'
   enableval=$enable_mimetype;
                           if test "$enableval" = yes; then
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=yes'
@@ -7877,35 +8738,25 @@ if test "${enable_mimetype+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mimetype"
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mimetype"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MIMETYPE = yes; then
-              result=no
-            else
+            if test $wxUSE_MIMETYPE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_MIMETYPE
           fi
 
             fi
           else
             result=$wxUSE_MIMETYPE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7918,11 +8769,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-printfposparam" >&5
+$as_echo_n "checking for --${enablestring:-enable}-printfposparam... " >&6; }
+          # Check whether --enable-printfposparam was given.
+if test "${enable_printfposparam+set}" = set; then :
+  enableval=$enable_printfposparam;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+                          else
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+                          fi
+
+else
+
+                          wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_printfposparam"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PRINTF_POS_PARAMS = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_PRINTF_POS_PARAMS
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-snglinst" >&5
+$as_echo_n "checking for --${enablestring:-enable}-snglinst... " >&6; }
           # Check whether --enable-snglinst was given.
           # Check whether --enable-snglinst was given.
-if test "${enable_snglinst+set}" = set; then
+if test "${enable_snglinst+set}" = set; then :
   enableval=$enable_snglinst;
                           if test "$enableval" = yes; then
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
   enableval=$enable_snglinst;
                           if test "$enableval" = yes; then
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
@@ -7932,35 +8826,25 @@ if test "${enable_snglinst+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_snglinst"
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_snglinst"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SNGLINST_CHECKER = yes; then
-              result=no
-            else
+            if test $wxUSE_SNGLINST_CHECKER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SNGLINST_CHECKER
           fi
 
             fi
           else
             result=$wxUSE_SNGLINST_CHECKER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -7973,11 +8857,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-sound" >&5
+$as_echo_n "checking for --${enablestring:-enable}-sound... " >&6; }
+          # Check whether --enable-sound was given.
+if test "${enable_sound+set}" = set; then :
+  enableval=$enable_sound;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_sound='wxUSE_SOUND=yes'
+                          else
+                            wx_cv_use_sound='wxUSE_SOUND=no'
+                          fi
+
+else
+
+                          wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_sound"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SOUND = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_SOUND
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-stdpaths" >&5
+$as_echo_n "checking for --${enablestring:-enable}-stdpaths... " >&6; }
           # Check whether --enable-stdpaths was given.
           # Check whether --enable-stdpaths was given.
-if test "${enable_stdpaths+set}" = set; then
+if test "${enable_stdpaths+set}" = set; then :
   enableval=$enable_stdpaths;
                           if test "$enableval" = yes; then
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=yes'
   enableval=$enable_stdpaths;
                           if test "$enableval" = yes; then
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=yes'
@@ -7987,35 +8914,25 @@ if test "${enable_stdpaths+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stdpaths"
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stdpaths"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STDPATHS = yes; then
-              result=no
-            else
+            if test $wxUSE_STDPATHS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STDPATHS
           fi
 
             fi
           else
             result=$wxUSE_STDPATHS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8028,11 +8945,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-stopwatch" >&5
+$as_echo_n "checking for --${enablestring:-enable}-stopwatch... " >&6; }
           # Check whether --enable-stopwatch was given.
           # Check whether --enable-stopwatch was given.
-if test "${enable_stopwatch+set}" = set; then
+if test "${enable_stopwatch+set}" = set; then :
   enableval=$enable_stopwatch;
                           if test "$enableval" = yes; then
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
   enableval=$enable_stopwatch;
                           if test "$enableval" = yes; then
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
@@ -8042,35 +8958,25 @@ if test "${enable_stopwatch+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stopwatch"
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stopwatch"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STOPWATCH = yes; then
-              result=no
-            else
+            if test $wxUSE_STOPWATCH = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STOPWATCH
           fi
 
             fi
           else
             result=$wxUSE_STOPWATCH
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8083,11 +8989,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-streams" >&5
+$as_echo_n "checking for --${enablestring:-enable}-streams... " >&6; }
           # Check whether --enable-streams was given.
           # Check whether --enable-streams was given.
-if test "${enable_streams+set}" = set; then
+if test "${enable_streams+set}" = set; then :
   enableval=$enable_streams;
                           if test "$enableval" = yes; then
                             wx_cv_use_streams='wxUSE_STREAMS=yes'
   enableval=$enable_streams;
                           if test "$enableval" = yes; then
                             wx_cv_use_streams='wxUSE_STREAMS=yes'
@@ -8097,35 +9002,25 @@ if test "${enable_streams+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_streams"
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_streams"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_streams >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STREAMS = yes; then
-              result=no
-            else
+            if test $wxUSE_STREAMS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STREAMS
           fi
 
             fi
           else
             result=$wxUSE_STREAMS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8138,49 +9033,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-system_options was given.
-if test "${enable_system_options+set}" = set; then
-  enableval=$enable_system_options;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-sysoptions" >&5
+$as_echo_n "checking for --${enablestring:-enable}-sysoptions... " >&6; }
+          # Check whether --enable-sysoptions was given.
+if test "${enable_sysoptions+set}" = set; then :
+  enableval=$enable_sysoptions;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+                            wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=yes'
                           else
                           else
-                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+                            wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
+                          wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_system_options"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_system_options >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_sysoptions"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SYSTEM_OPTIONS = yes; then
-              result=no
-            else
+            if test $wxUSE_SYSTEM_OPTIONS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SYSTEM_OPTIONS
           fi
 
             fi
           else
             result=$wxUSE_SYSTEM_OPTIONS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8193,11 +9077,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-tarstream" >&5
+$as_echo_n "checking for --${enablestring:-enable}-tarstream... " >&6; }
           # Check whether --enable-tarstream was given.
           # Check whether --enable-tarstream was given.
-if test "${enable_tarstream+set}" = set; then
+if test "${enable_tarstream+set}" = set; then :
   enableval=$enable_tarstream;
                           if test "$enableval" = yes; then
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=yes'
   enableval=$enable_tarstream;
                           if test "$enableval" = yes; then
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=yes'
@@ -8207,35 +9090,25 @@ if test "${enable_tarstream+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tarstream"
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tarstream"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tarstream >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TARSTREAM = yes; then
-              result=no
-            else
+            if test $wxUSE_TARSTREAM = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TARSTREAM
           fi
 
             fi
           else
             result=$wxUSE_TARSTREAM
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8248,11 +9121,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-textbuf" >&5
+$as_echo_n "checking for --${enablestring:-enable}-textbuf... " >&6; }
           # Check whether --enable-textbuf was given.
           # Check whether --enable-textbuf was given.
-if test "${enable_textbuf+set}" = set; then
+if test "${enable_textbuf+set}" = set; then :
   enableval=$enable_textbuf;
                           if test "$enableval" = yes; then
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
   enableval=$enable_textbuf;
                           if test "$enableval" = yes; then
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
@@ -8262,35 +9134,25 @@ if test "${enable_textbuf+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textbuf"
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textbuf"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTBUFFER = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTBUFFER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TEXTBUFFER
           fi
 
             fi
           else
             result=$wxUSE_TEXTBUFFER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8303,11 +9165,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-textfile" >&5
+$as_echo_n "checking for --${enablestring:-enable}-textfile... " >&6; }
           # Check whether --enable-textfile was given.
           # Check whether --enable-textfile was given.
-if test "${enable_textfile+set}" = set; then
+if test "${enable_textfile+set}" = set; then :
   enableval=$enable_textfile;
                           if test "$enableval" = yes; then
                             wx_cv_use_textfile='wxUSE_TEXTFILE=yes'
   enableval=$enable_textfile;
                           if test "$enableval" = yes; then
                             wx_cv_use_textfile='wxUSE_TEXTFILE=yes'
@@ -8317,35 +9178,25 @@ if test "${enable_textfile+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textfile"
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textfile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textfile >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTFILE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TEXTFILE
           fi
 
             fi
           else
             result=$wxUSE_TEXTFILE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8358,11 +9209,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-timer" >&5
+$as_echo_n "checking for --${enablestring:-enable}-timer... " >&6; }
           # Check whether --enable-timer was given.
           # Check whether --enable-timer was given.
-if test "${enable_timer+set}" = set; then
+if test "${enable_timer+set}" = set; then :
   enableval=$enable_timer;
                           if test "$enableval" = yes; then
                             wx_cv_use_timer='wxUSE_TIMER=yes'
   enableval=$enable_timer;
                           if test "$enableval" = yes; then
                             wx_cv_use_timer='wxUSE_TIMER=yes'
@@ -8372,35 +9222,25 @@ if test "${enable_timer+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_timer"
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_timer"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_timer >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TIMER = yes; then
-              result=no
-            else
+            if test $wxUSE_TIMER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TIMER
           fi
 
             fi
           else
             result=$wxUSE_TIMER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8413,159 +9253,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-sound was given.
-if test "${enable_sound+set}" = set; then
-  enableval=$enable_sound;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-variant" >&5
+$as_echo_n "checking for --${enablestring:-enable}-variant... " >&6; }
+          # Check whether --enable-variant was given.
+if test "${enable_variant+set}" = set; then :
+  enableval=$enable_variant;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_sound='wxUSE_SOUND=yes'
+                            wx_cv_use_variant='wxUSE_VARIANT=yes'
                           else
                           else
-                            wx_cv_use_sound='wxUSE_SOUND=no'
+                            wx_cv_use_variant='wxUSE_VARIANT=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
+                          wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_sound"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sound >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_variant"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SOUND = yes; then
-              result=no
-            else
+            if test $wxUSE_VARIANT = no; then
               result=yes
               result=yes
-            fi
-          else
-            result=$wxUSE_SOUND
-          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}-mediactrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-mediactrl was given.
-if test "${enable_mediactrl+set}" = set; then
-  enableval=$enable_mediactrl;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
-                          else
-                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
-                          fi
-
-else
-
-                          LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_mediactrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MEDIACTRL = yes; then
-              result=no
             else
             else
-              result=yes
-            fi
-          else
-            result=$wxUSE_MEDIACTRL
-          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}-gstreamer8" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-gstreamer8 was given.
-if test "${enable_gstreamer8+set}" = set; then
-  enableval=$enable_gstreamer8;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
-                          else
-                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
-                          fi
-
-else
-
-                          LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_gstreamer8"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GSTREAMER8 = yes; then
               result=no
               result=no
-            else
-              result=yes
             fi
           else
             fi
           else
-            result=$wxUSE_GSTREAMER8
+            result=$wxUSE_VARIANT
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8578,49 +9297,39 @@ 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; }
-          no_cache=0
-          # Check whether --enable-printfposparam was given.
-if test "${enable_printfposparam+set}" = set; then
-  enableval=$enable_printfposparam;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-zipstream" >&5
+$as_echo_n "checking for --${enablestring:-enable}-zipstream... " >&6; }
+          # Check whether --enable-zipstream was given.
+if test "${enable_zipstream+set}" = set; then :
+  enableval=$enable_zipstream;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                           else
                           else
-                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
+                          wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_printfposparam"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_zipstream"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PRINTF_POS_PARAMS = yes; then
-              result=no
-            else
+            if test $wxUSE_ZIPSTREAM = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_PRINTF_POS_PARAMS
+            result=$wxUSE_ZIPSTREAM
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
 
 
           enablestring=
 
 
           enablestring=
@@ -8633,50 +9342,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-zipstream was given.
-if test "${enable_zipstream+set}" = set; then
-  enableval=$enable_zipstream;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-url" >&5
+$as_echo_n "checking for --${enablestring:-enable}-url... " >&6; }
+          # Check whether --enable-url was given.
+if test "${enable_url+set}" = set; then :
+  enableval=$enable_url;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
+                            wx_cv_use_url='wxUSE_URL=yes'
                           else
                           else
-                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
+                            wx_cv_use_url='wxUSE_URL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
+                          wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_zipstream"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_url"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ZIPSTREAM = yes; then
-              result=no
-            else
+            if test $wxUSE_URL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_ZIPSTREAM
+            result=$wxUSE_URL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8689,49 +9386,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-url was given.
-if test "${enable_url+set}" = set; then
-  enableval=$enable_url;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-protocol" >&5
+$as_echo_n "checking for --${enablestring:-enable}-protocol... " >&6; }
+          # Check whether --enable-protocol was given.
+if test "${enable_protocol+set}" = set; then :
+  enableval=$enable_protocol;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_url='wxUSE_URL=yes'
+                            wx_cv_use_protocol='wxUSE_PROTOCOL=yes'
                           else
                           else
-                            wx_cv_use_url='wxUSE_URL=no'
+                            wx_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
+                          wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_url"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_url >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_protocol"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_URL = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_URL
+            result=$wxUSE_PROTOCOL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8744,49 +9430,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-variant was given.
-if test "${enable_variant+set}" = set; then
-  enableval=$enable_variant;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-protocol_http" >&5
+$as_echo_n "checking for --${enablestring:-enable}-protocol_http... " >&6; }
+          # Check whether --enable-protocol_http was given.
+if test "${enable_protocol_http+set}" = set; then :
+  enableval=$enable_protocol_http;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_variant='wxUSE_VARIANT=yes'
+                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
                           else
-                            wx_cv_use_variant='wxUSE_VARIANT=no'
+                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
+                          wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_variant"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_variant >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_protocol_http"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VARIANT = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_HTTP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_VARIANT
+            result=$wxUSE_PROTOCOL_HTTP
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8799,49 +9474,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-protocol was given.
-if test "${enable_protocol+set}" = set; then
-  enableval=$enable_protocol;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-protocol_ftp" >&5
+$as_echo_n "checking for --${enablestring:-enable}-protocol_ftp... " >&6; }
+          # Check whether --enable-protocol_ftp was given.
+if test "${enable_protocol_ftp+set}" = set; then :
+  enableval=$enable_protocol_ftp;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_protocol='wxUSE_PROTOCOL=yes'
+                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
                           else
-                            wx_cv_use_protocol='wxUSE_PROTOCOL=no'
+                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
+                          wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_protocol"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_protocol_ftp"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FTP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_PROTOCOL
+            result=$wxUSE_PROTOCOL_FTP
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -8854,49 +9518,39 @@ 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; }
-          no_cache=0
-          # Check whether --enable-protocol_http was given.
-if test "${enable_protocol_http+set}" = set; then
-  enableval=$enable_protocol_http;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-protocol_file" >&5
+$as_echo_n "checking for --${enablestring:-enable}-protocol_file... " >&6; }
+          # Check whether --enable-protocol_file was given.
+if test "${enable_protocol_file+set}" = set; then :
+  enableval=$enable_protocol_file;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
+                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
                           else
                           else
-                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
+                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
+                          wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_protocol_http"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_protocol_file"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_HTTP = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FILE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_PROTOCOL_HTTP
+            result=$wxUSE_PROTOCOL_FILE
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
 
 
           enablestring=
 
 
           enablestring=
@@ -8909,53 +9563,43 @@ 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; }
-          no_cache=0
-          # Check whether --enable-protocol_ftp was given.
-if test "${enable_protocol_ftp+set}" = set; then
-  enableval=$enable_protocol_ftp;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-threads" >&5
+$as_echo_n "checking for --${enablestring:-enable}-threads... " >&6; }
+          # Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+  enableval=$enable_threads;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
+                            wx_cv_use_threads='wxUSE_THREADS=yes'
                           else
                           else
-                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
+                            wx_cv_use_threads='wxUSE_THREADS=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
+                          wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_protocol_ftp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_threads"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FTP = yes; then
-              result=no
-            else
+            if test $wxUSE_THREADS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_PROTOCOL_FTP
+            result=$wxUSE_THREADS
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
 
 
           enablestring=
 
 
           enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
+          defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
                   defaultval=yes
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
                   defaultval=yes
@@ -8964,50 +9608,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-protocol_file was given.
-if test "${enable_protocol_file+set}" = set; then
-  enableval=$enable_protocol_file;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-iniconf" >&5
+$as_echo_n "checking for --${enablestring:-enable}-iniconf... " >&6; }
+          # Check whether --enable-iniconf was given.
+if test "${enable_iniconf+set}" = set; then :
+  enableval=$enable_iniconf;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
+                            wx_cv_use_iniconf='wxUSE_INICONF=yes'
                           else
                           else
-                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
+                            wx_cv_use_iniconf='wxUSE_INICONF=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
+                          wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_protocol_file"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_iniconf"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FILE = yes; then
-              result=no
-            else
+            if test $wxUSE_INICONF = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_PROTOCOL_FILE
+            result=$wxUSE_INICONF
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9020,49 +9652,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval=$enable_threads;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-regkey" >&5
+$as_echo_n "checking for --${enablestring:-enable}-regkey... " >&6; }
+          # Check whether --enable-regkey was given.
+if test "${enable_regkey+set}" = set; then :
+  enableval=$enable_regkey;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_threads='wxUSE_THREADS=yes'
+                            wx_cv_use_regkey='wxUSE_REGKEY=yes'
                           else
                           else
-                            wx_cv_use_threads='wxUSE_THREADS=no'
+                            wx_cv_use_regkey='wxUSE_REGKEY=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
+                          wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_threads"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_threads >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_regkey"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_THREADS = yes; then
-              result=no
-            else
+            if test $wxUSE_REGKEY = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_THREADS
+            result=$wxUSE_REGKEY
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -9079,11 +9700,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-docview" >&5
+$as_echo_n "checking for --${enablestring:-enable}-docview... " >&6; }
           # Check whether --enable-docview was given.
           # Check whether --enable-docview was given.
-if test "${enable_docview+set}" = set; then
+if test "${enable_docview+set}" = set; then :
   enableval=$enable_docview;
                           if test "$enableval" = yes; then
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
   enableval=$enable_docview;
                           if test "$enableval" = yes; then
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
@@ -9093,35 +9713,25 @@ if test "${enable_docview+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_docview"
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_docview"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_docview >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then
-              result=no
-            else
+            if test $wxUSE_DOC_VIEW_ARCHITECTURE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DOC_VIEW_ARCHITECTURE
           fi
 
             fi
           else
             result=$wxUSE_DOC_VIEW_ARCHITECTURE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9134,11 +9744,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-help" >&5
+$as_echo_n "checking for --${enablestring:-enable}-help... " >&6; }
           # Check whether --enable-help was given.
           # Check whether --enable-help was given.
-if test "${enable_help+set}" = set; then
+if test "${enable_help+set}" = set; then :
   enableval=$enable_help;
                           if test "$enableval" = yes; then
                             wx_cv_use_help='wxUSE_HELP=yes'
   enableval=$enable_help;
                           if test "$enableval" = yes; then
                             wx_cv_use_help='wxUSE_HELP=yes'
@@ -9148,35 +9757,25 @@ if test "${enable_help+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_help"
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_help"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_help >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_HELP = yes; then
-              result=no
-            else
+            if test $wxUSE_HELP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_HELP
           fi
 
             fi
           else
             result=$wxUSE_HELP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9189,11 +9788,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mshtmlhelp" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mshtmlhelp... " >&6; }
           # Check whether --enable-mshtmlhelp was given.
           # Check whether --enable-mshtmlhelp was given.
-if test "${enable_mshtmlhelp+set}" = set; then
+if test "${enable_mshtmlhelp+set}" = set; then :
   enableval=$enable_mshtmlhelp;
                           if test "$enableval" = yes; then
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
   enableval=$enable_mshtmlhelp;
                           if test "$enableval" = yes; then
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
@@ -9203,35 +9801,25 @@ if test "${enable_mshtmlhelp+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mshtmlhelp"
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mshtmlhelp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MS_HTML_HELP = yes; then
-              result=no
-            else
+            if test $wxUSE_MS_HTML_HELP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_MS_HTML_HELP
           fi
 
             fi
           else
             result=$wxUSE_MS_HTML_HELP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9244,11 +9832,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-html" >&5
+$as_echo_n "checking for --${enablestring:-enable}-html... " >&6; }
           # Check whether --enable-html was given.
           # Check whether --enable-html was given.
-if test "${enable_html+set}" = set; then
+if test "${enable_html+set}" = set; then :
   enableval=$enable_html;
                           if test "$enableval" = yes; then
                             wx_cv_use_html='wxUSE_HTML=yes'
   enableval=$enable_html;
                           if test "$enableval" = yes; then
                             wx_cv_use_html='wxUSE_HTML=yes'
@@ -9258,35 +9845,25 @@ if test "${enable_html+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_html"
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_html"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_html >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_HTML = yes; then
-              result=no
-            else
+            if test $wxUSE_HTML = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_HTML
           fi
 
             fi
           else
             result=$wxUSE_HTML
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9299,11 +9876,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-htmlhelp" >&5
+$as_echo_n "checking for --${enablestring:-enable}-htmlhelp... " >&6; }
           # Check whether --enable-htmlhelp was given.
           # Check whether --enable-htmlhelp was given.
-if test "${enable_htmlhelp+set}" = set; then
+if test "${enable_htmlhelp+set}" = set; then :
   enableval=$enable_htmlhelp;
                           if test "$enableval" = yes; then
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
   enableval=$enable_htmlhelp;
                           if test "$enableval" = yes; then
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
@@ -9313,35 +9889,25 @@ if test "${enable_htmlhelp+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_htmlhelp"
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_htmlhelp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_WXHTML_HELP = yes; then
-              result=no
-            else
+            if test $wxUSE_WXHTML_HELP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_WXHTML_HELP
           fi
 
             fi
           else
             result=$wxUSE_WXHTML_HELP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9354,11 +9920,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-xrc" >&5
+$as_echo_n "checking for --${enablestring:-enable}-xrc... " >&6; }
           # Check whether --enable-xrc was given.
           # Check whether --enable-xrc was given.
-if test "${enable_xrc+set}" = set; then
+if test "${enable_xrc+set}" = set; then :
   enableval=$enable_xrc;
                           if test "$enableval" = yes; then
                             wx_cv_use_xrc='wxUSE_XRC=yes'
   enableval=$enable_xrc;
                           if test "$enableval" = yes; then
                             wx_cv_use_xrc='wxUSE_XRC=yes'
@@ -9368,35 +9933,25 @@ if test "${enable_xrc+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xrc"
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xrc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_xrc >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_XRC = yes; then
-              result=no
-            else
+            if test $wxUSE_XRC = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_XRC
           fi
 
             fi
           else
             result=$wxUSE_XRC
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9409,11 +9964,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-aui" >&5
+$as_echo_n "checking for --${enablestring:-enable}-aui... " >&6; }
           # Check whether --enable-aui was given.
           # Check whether --enable-aui was given.
-if test "${enable_aui+set}" = set; then
+if test "${enable_aui+set}" = set; then :
   enableval=$enable_aui;
                           if test "$enableval" = yes; then
                             wx_cv_use_aui='wxUSE_AUI=yes'
   enableval=$enable_aui;
                           if test "$enableval" = yes; then
                             wx_cv_use_aui='wxUSE_AUI=yes'
@@ -9423,35 +9977,113 @@ if test "${enable_aui+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aui"
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aui"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_aui >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_AUI = yes; then
+            if test $wxUSE_AUI = no; then
+              result=yes
+            else
               result=no
               result=no
+            fi
+          else
+            result=$wxUSE_AUI
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-propgrid" >&5
+$as_echo_n "checking for --${enablestring:-enable}-propgrid... " >&6; }
+          # Check whether --enable-propgrid was given.
+if test "${enable_propgrid+set}" = set; then :
+  enableval=$enable_propgrid;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_propgrid='wxUSE_PROPGRID=yes'
+                          else
+                            wx_cv_use_propgrid='wxUSE_PROPGRID=no'
+                          fi
+
+else
+
+                          wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_propgrid"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROPGRID = no; then
+              result=yes
             else
             else
+              result=no
+            fi
+          else
+            result=$wxUSE_PROPGRID
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ribbon" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ribbon... " >&6; }
+          # Check whether --enable-ribbon was given.
+if test "${enable_ribbon+set}" = set; then :
+  enableval=$enable_ribbon;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ribbon='wxUSE_RIBBON=yes'
+                          else
+                            wx_cv_use_ribbon='wxUSE_RIBBON=no'
+                          fi
+
+else
+
+                          wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ribbon"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RIBBON = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_AUI
+            result=$wxUSE_RIBBON
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9464,11 +10096,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-stc" >&5
+$as_echo_n "checking for --${enablestring:-enable}-stc... " >&6; }
           # Check whether --enable-stc was given.
           # Check whether --enable-stc was given.
-if test "${enable_stc+set}" = set; then
+if test "${enable_stc+set}" = set; then :
   enableval=$enable_stc;
                           if test "$enableval" = yes; then
                             wx_cv_use_stc='wxUSE_STC=yes'
   enableval=$enable_stc;
                           if test "$enableval" = yes; then
                             wx_cv_use_stc='wxUSE_STC=yes'
@@ -9478,35 +10109,25 @@ if test "${enable_stc+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stc"
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stc >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STC = yes; then
-              result=no
-            else
+            if test $wxUSE_STC = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STC
           fi
 
             fi
           else
             result=$wxUSE_STC
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9519,11 +10140,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-constraints" >&5
+$as_echo_n "checking for --${enablestring:-enable}-constraints... " >&6; }
           # Check whether --enable-constraints was given.
           # Check whether --enable-constraints was given.
-if test "${enable_constraints+set}" = set; then
+if test "${enable_constraints+set}" = set; then :
   enableval=$enable_constraints;
                           if test "$enableval" = yes; then
                             wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
   enableval=$enable_constraints;
                           if test "$enableval" = yes; then
                             wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
@@ -9533,35 +10153,25 @@ if test "${enable_constraints+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_constraints"
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_constraints"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_constraints >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONSTRAINTS = yes; then
-              result=no
-            else
+            if test $wxUSE_CONSTRAINTS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CONSTRAINTS
           fi
 
             fi
           else
             result=$wxUSE_CONSTRAINTS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9574,49 +10184,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-printarch was given.
-if test "${enable_printarch+set}" = set; then
-  enableval=$enable_printarch;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-loggui" >&5
+$as_echo_n "checking for --${enablestring:-enable}-loggui... " >&6; }
+          # Check whether --enable-loggui was given.
+if test "${enable_loggui+set}" = set; then :
+  enableval=$enable_loggui;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                            wx_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else
                           else
-                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                            wx_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
+                          wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_printarch"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_printarch >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_loggui"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
-              result=no
-            else
+            if test $wxUSE_LOGGUI = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_PRINTING_ARCHITECTURE
+            result=$wxUSE_LOGGUI
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9629,49 +10228,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-mdi was given.
-if test "${enable_mdi+set}" = set; then
-  enableval=$enable_mdi;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-logwin" >&5
+$as_echo_n "checking for --${enablestring:-enable}-logwin... " >&6; }
+          # Check whether --enable-logwin was given.
+if test "${enable_logwin+set}" = set; then :
+  enableval=$enable_logwin;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_mdi='wxUSE_MDI=yes'
+                            wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else
                           else
-                            wx_cv_use_mdi='wxUSE_MDI=no'
+                            wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
+                          wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_mdi"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mdi >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_logwin"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MDI = yes; then
-              result=no
-            else
+            if test $wxUSE_LOGWINDOW = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_MDI
+            result=$wxUSE_LOGWINDOW
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9684,49 +10272,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-mdidoc was given.
-if test "${enable_mdidoc+set}" = set; then
-  enableval=$enable_mdidoc;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-logdialog" >&5
+$as_echo_n "checking for --${enablestring:-enable}-logdialog... " >&6; }
+          # Check whether --enable-logdialog was given.
+if test "${enable_logdialog+set}" = set; then :
+  enableval=$enable_logdialog;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
+                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
                           else
                           else
-                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
+                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
+                          wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_mdidoc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_logdialog"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MDI_ARCHITECTURE = yes; then
-              result=no
-            else
+            if test $wxUSE_LOGDIALOG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_MDI_ARCHITECTURE
+            result=$wxUSE_LOGDIALOG
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9739,49 +10316,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-loggui was given.
-if test "${enable_loggui+set}" = set; then
-  enableval=$enable_loggui;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mdi" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mdi... " >&6; }
+          # Check whether --enable-mdi was given.
+if test "${enable_mdi+set}" = set; then :
+  enableval=$enable_mdi;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_loggui='wxUSE_LOGGUI=yes'
+                            wx_cv_use_mdi='wxUSE_MDI=yes'
                           else
                           else
-                            wx_cv_use_loggui='wxUSE_LOGGUI=no'
+                            wx_cv_use_mdi='wxUSE_MDI=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
+                          wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_loggui"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_loggui >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_mdi"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOGGUI = yes; then
-              result=no
-            else
+            if test $wxUSE_MDI = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_LOGGUI
+            result=$wxUSE_MDI
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9794,49 +10360,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-logwin was given.
-if test "${enable_logwin+set}" = set; then
-  enableval=$enable_logwin;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mdidoc" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mdidoc... " >&6; }
+          # Check whether --enable-mdidoc was given.
+if test "${enable_mdidoc+set}" = set; then :
+  enableval=$enable_mdidoc;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
                           else
                           else
-                            wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
+                          wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_logwin"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_logwin >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_mdidoc"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOGWINDOW = yes; then
-              result=no
-            else
+            if test $wxUSE_MDI_ARCHITECTURE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_LOGWINDOW
+            result=$wxUSE_MDI_ARCHITECTURE
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9849,49 +10404,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-logdialog was given.
-if test "${enable_logdialog+set}" = set; then
-  enableval=$enable_logdialog;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mediactrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mediactrl... " >&6; }
+          # Check whether --enable-mediactrl was given.
+if test "${enable_mediactrl+set}" = set; then :
+  enableval=$enable_mediactrl;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
                           else
                           else
-                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
+                          wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_logdialog"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_logdialog >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_mediactrl"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOGDIALOG = yes; then
-              result=no
-            else
+            if test $wxUSE_MEDIACTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_LOGDIALOG
+            result=$wxUSE_MEDIACTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9904,49 +10448,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-webkit was given.
-if test "${enable_webkit+set}" = set; then
-  enableval=$enable_webkit;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-gstreamer8" >&5
+$as_echo_n "checking for --${enablestring:-enable}-gstreamer8... " >&6; }
+          # Check whether --enable-gstreamer8 was given.
+if test "${enable_gstreamer8+set}" = set; then :
+  enableval=$enable_gstreamer8;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_webkit='wxUSE_WEBKIT=yes'
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
                           else
                           else
-                            wx_cv_use_webkit='wxUSE_WEBKIT=no'
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
+                          wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_webkit"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_webkit >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_gstreamer8"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_WEBKIT = yes; then
-              result=no
-            else
+            if test $wxUSE_GSTREAMER8 = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_WEBKIT
+            result=$wxUSE_GSTREAMER8
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -9959,11 +10492,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-richtext" >&5
+$as_echo_n "checking for --${enablestring:-enable}-richtext... " >&6; }
           # Check whether --enable-richtext was given.
           # Check whether --enable-richtext was given.
-if test "${enable_richtext+set}" = set; then
+if test "${enable_richtext+set}" = set; then :
   enableval=$enable_richtext;
                           if test "$enableval" = yes; then
                             wx_cv_use_richtext='wxUSE_RICHTEXT=yes'
   enableval=$enable_richtext;
                           if test "$enableval" = yes; then
                             wx_cv_use_richtext='wxUSE_RICHTEXT=yes'
@@ -9973,35 +10505,25 @@ if test "${enable_richtext+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_richtext"
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_richtext"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_richtext >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RICHTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_RICHTEXT = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_RICHTEXT
           fi
 
             fi
           else
             result=$wxUSE_RICHTEXT
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10014,49 +10536,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-graphics_ctx was given.
-if test "${enable_graphics_ctx+set}" = set; then
-  enableval=$enable_graphics_ctx;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-postscript" >&5
+$as_echo_n "checking for --${enablestring:-enable}-postscript... " >&6; }
+          # Check whether --enable-postscript was given.
+if test "${enable_postscript+set}" = set; then :
+  enableval=$enable_postscript;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
+                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else
                           else
-                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
+                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
+                          wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_graphics_ctx"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_postscript"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GRAPHICS_CONTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_POSTSCRIPT = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_GRAPHICS_CONTEXT
+            result=$wxUSE_POSTSCRIPT
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10069,49 +10580,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-postscript was given.
-if test "${enable_postscript+set}" = set; then
-  enableval=$enable_postscript;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-printarch" >&5
+$as_echo_n "checking for --${enablestring:-enable}-printarch... " >&6; }
+          # Check whether --enable-printarch was given.
+if test "${enable_printarch+set}" = set; then :
+  enableval=$enable_printarch;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                           else
                           else
-                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
+                          wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_postscript"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_postscript >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_printarch"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_POSTSCRIPT = yes; then
-              result=no
-            else
+            if test $wxUSE_PRINTING_ARCHITECTURE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_POSTSCRIPT
+            result=$wxUSE_PRINTING_ARCHITECTURE
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10124,11 +10624,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-svg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-svg... " >&6; }
           # Check whether --enable-svg was given.
           # Check whether --enable-svg was given.
-if test "${enable_svg+set}" = set; then
+if test "${enable_svg+set}" = set; then :
   enableval=$enable_svg;
                           if test "$enableval" = yes; then
                             wx_cv_use_svg='wxUSE_SVG=yes'
   enableval=$enable_svg;
                           if test "$enableval" = yes; then
                             wx_cv_use_svg='wxUSE_SVG=yes'
@@ -10138,37 +10637,25 @@ if test "${enable_svg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_svg"
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_svg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_svg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SVG = yes; then
-              result=no
-            else
+            if test $wxUSE_SVG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SVG
           fi
 
             fi
           else
             result=$wxUSE_SVG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10181,49 +10668,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-clipboard was given.
-if test "${enable_clipboard+set}" = set; then
-  enableval=$enable_clipboard;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-webkit" >&5
+$as_echo_n "checking for --${enablestring:-enable}-webkit... " >&6; }
+          # Check whether --enable-webkit was given.
+if test "${enable_webkit+set}" = set; then :
+  enableval=$enable_webkit;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
+                            wx_cv_use_webkit='wxUSE_WEBKIT=yes'
                           else
                           else
-                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+                            wx_cv_use_webkit='wxUSE_WEBKIT=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
+                          wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_clipboard"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_webkit"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CLIPBOARD = yes; then
-              result=no
-            else
+            if test $wxUSE_WEBKIT = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_CLIPBOARD
+            result=$wxUSE_WEBKIT
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10236,49 +10712,87 @@ 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; }
-          no_cache=0
-          # Check whether --enable-dnd was given.
-if test "${enable_dnd+set}" = set; then
-  enableval=$enable_dnd;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-webview" >&5
+$as_echo_n "checking for --${enablestring:-enable}-webview... " >&6; }
+          # Check whether --enable-webview was given.
+if test "${enable_webview+set}" = set; then :
+  enableval=$enable_webview;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
+                            wx_cv_use_webview='wxUSE_WEBVIEW=yes'
                           else
                           else
-                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+                            wx_cv_use_webview='wxUSE_WEBVIEW=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                          wx_cv_use_webview='wxUSE_WEBVIEW=${'DEFAULT_wxUSE_WEBVIEW":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_webview"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_WEBVIEW = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_WEBVIEW
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+if test "$wxUSE_MAC" != 1; then
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-graphics_ctx" >&5
+$as_echo_n "checking for --${enablestring:-enable}-graphics_ctx... " >&6; }
+          # Check whether --enable-graphics_ctx was given.
+if test "${enable_graphics_ctx+set}" = set; then :
+  enableval=$enable_graphics_ctx;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
                           else
                           else
-                            no_cache=1
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
                           fi
 
                           fi
 
-                          wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
+else
+
+                          wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_dnd"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dnd >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_graphics_ctx"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DRAG_AND_DROP = yes; then
-              result=no
-            else
+            if test $wxUSE_GRAPHICS_CONTEXT = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DRAG_AND_DROP
+            result=$wxUSE_GRAPHICS_CONTEXT
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+fi
+
 
 
           enablestring=
 
 
           enablestring=
@@ -10291,49 +10805,82 @@ 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; }
-          no_cache=0
-          # Check whether --enable-metafile was given.
-if test "${enable_metafile+set}" = set; then
-  enableval=$enable_metafile;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-clipboard" >&5
+$as_echo_n "checking for --${enablestring:-enable}-clipboard... " >&6; }
+          # Check whether --enable-clipboard was given.
+if test "${enable_clipboard+set}" = set; then :
+  enableval=$enable_clipboard;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_metafile='wxUSE_METAFILE=yes'
+                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                           else
                           else
-                            wx_cv_use_metafile='wxUSE_METAFILE=no'
+                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                          wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_clipboard"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CLIPBOARD = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_CLIPBOARD
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dnd" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dnd... " >&6; }
+          # Check whether --enable-dnd was given.
+if test "${enable_dnd+set}" = set; then :
+  enableval=$enable_dnd;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                           else
                           else
-                            no_cache=1
+                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
 
                           fi
 
-                          wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
+else
+
+                          wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_metafile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_dnd"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_METAFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_DRAG_AND_DROP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_METAFILE
+            result=$wxUSE_DRAG_AND_DROP
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -10349,11 +10896,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-controls" >&5
+$as_echo_n "checking for --${enablestring:-enable}-controls... " >&6; }
           # Check whether --enable-controls was given.
           # Check whether --enable-controls was given.
-if test "${enable_controls+set}" = set; then
+if test "${enable_controls+set}" = set; then :
   enableval=$enable_controls;
                           if test "$enableval" = yes; then
                             wx_cv_use_controls='wxUSE_CONTROLS=yes'
   enableval=$enable_controls;
                           if test "$enableval" = yes; then
                             wx_cv_use_controls='wxUSE_CONTROLS=yes'
@@ -10363,146 +10909,137 @@ if test "${enable_controls+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_controls"
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_controls"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_controls >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONTROLS = yes; then
-              result=no
-            else
+            if test $wxUSE_CONTROLS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CONTROLS
           fi
 
             fi
           else
             result=$wxUSE_CONTROLS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+if test "$wxUSE_CONTROLS" = "no"; then
+    DEFAULT_wxUSE_ACCEL=no
+    DEFAULT_wxUSE_ANIMATIONCTRL=no
+    DEFAULT_wxUSE_BANNERWINDOW=no
+    DEFAULT_wxUSE_BMPBUTTON=no
+    DEFAULT_wxUSE_BUTTON=no
+    DEFAULT_wxUSE_CALCTRL=no
+    DEFAULT_wxUSE_CARET=no
+    DEFAULT_wxUSE_CHECKBOX=no
+    DEFAULT_wxUSE_CHECKLISTBOX=no
+    DEFAULT_wxUSE_CHOICE=no
+    DEFAULT_wxUSE_CHOICEBOOK=no
+    DEFAULT_wxUSE_COLLPANE=no
+    DEFAULT_wxUSE_COLOURPICKERCTRL=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_COMMANDLINKBUTTON=no
+    DEFAULT_wxUSE_DATAVIEWCTRL=no
+    DEFAULT_wxUSE_DATEPICKCTRL=no
+    DEFAULT_wxUSE_DETECT_SM=no
+    DEFAULT_wxUSE_DIRPICKERCTRL=no
+    DEFAULT_wxUSE_DISPLAY=no
+    DEFAULT_wxUSE_FILECTRL=no
+    DEFAULT_wxUSE_FILEPICKERCTRL=no
+    DEFAULT_wxUSE_FONTPICKERCTRL=no
+    DEFAULT_wxUSE_GAUGE=no
+    DEFAULT_wxUSE_GRID=no
+    DEFAULT_wxUSE_HEADERCTRL=no
+    DEFAULT_wxUSE_HYPERLINKCTRL=no
+    DEFAULT_wxUSE_IMAGLIST=no
+    DEFAULT_wxUSE_LISTBOOK=no
+    DEFAULT_wxUSE_LISTBOX=no
+    DEFAULT_wxUSE_LISTCTRL=no
+    DEFAULT_wxUSE_MARKUP=no
+    DEFAULT_wxUSE_NOTEBOOK=no
+    DEFAULT_wxUSE_POPUPWIN=no
+    DEFAULT_wxUSE_RADIOBOX=no
+    DEFAULT_wxUSE_RADIOBTN=no
+    DEFAULT_wxUSE_RICHMSGDLG=no
+    DEFAULT_wxUSE_RICHTOOLTIP=no
+    DEFAULT_wxUSE_REARRANGECTRL=no
+    DEFAULT_wxUSE_SASH=no
+    DEFAULT_wxUSE_SCROLLBAR=no
+    DEFAULT_wxUSE_SEARCHCTRL=no
+    DEFAULT_wxUSE_SLIDER=no
+    DEFAULT_wxUSE_SPINBTN=no
+    DEFAULT_wxUSE_SPINCTRL=no
+    DEFAULT_wxUSE_SPLITTER=no
+    DEFAULT_wxUSE_STATBMP=no
+    DEFAULT_wxUSE_STATBOX=no
+    DEFAULT_wxUSE_STATLINE=no
+    DEFAULT_wxUSE_STATUSBAR=no
+    DEFAULT_wxUSE_TIMEPICKCTRL=no
+    DEFAULT_wxUSE_TIPWINDOW=no
+    DEFAULT_wxUSE_TOGGLEBTN=no
+    DEFAULT_wxUSE_TOOLBAR=no
+    DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+    DEFAULT_wxUSE_TOOLBOOK=no
+    DEFAULT_wxUSE_TOOLTIPS=no
+    DEFAULT_wxUSE_TREEBOOK=no
+    DEFAULT_wxUSE_TREECTRL=no
+    DEFAULT_wxUSE_TREELISTCTRL=no
+fi
 
 
 
 
-if test "$wxUSE_CONTROLS" = "yes"; then
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_ANIMATIONCTRL=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_BUTTON=yes
-  DEFAULT_wxUSE_CALCTRL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLISTBOX=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_CHOICEBOOK=yes
-  DEFAULT_wxUSE_COLLPANE=yes
-  DEFAULT_wxUSE_COLOURPICKERCTRL=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_DATEPICKCTRL=yes
-  DEFAULT_wxUSE_DISPLAY=yes
-  DEFAULT_wxUSE_DETECT_SM=yes
-  DEFAULT_wxUSE_DIRPICKERCTRL=yes
-  DEFAULT_wxUSE_FILEPICKERCTRL=yes
-  DEFAULT_wxUSE_FONTPICKERCTRL=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_HYPERLINKCTRL=yes
-  DEFAULT_wxUSE_DATAVIEWCTRL=no
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOOK=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPINCTRL=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=yes
-  DEFAULT_wxUSE_TOGGLEBTN=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_TREEBOOK=yes
-  DEFAULT_wxUSE_TOOLBOOK=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes
-elif test "$wxUSE_CONTROLS" = "no"; then
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_ANIMATIONCTRL=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_BUTTON=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_COLLPANE=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLISTBOX=no
-  DEFAULT_wxUSE_CHOICE=no
-  DEFAULT_wxUSE_CHOICEBOOK=no
-  DEFAULT_wxUSE_COLOURPICKERCTRL=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_DATEPICKCTRL=no
-  DEFAULT_wxUSE_DISPLAY=no
-  DEFAULT_wxUSE_DETECT_SM=no
-  DEFAULT_wxUSE_DIRPICKERCTRL=no
-  DEFAULT_wxUSE_FILEPICKERCTRL=no
-  DEFAULT_wxUSE_FONTPICKERCTRL=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_HYPERLINKCTRL=no
-  DEFAULT_wxUSE_DATAVIEWCTRL=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOOK=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATUSBAR=no
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TOGGLEBTN=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_TREEBOOK=no
-  DEFAULT_wxUSE_TOOLBOOK=no
-  DEFAULT_wxUSE_TREECTRL=no
-  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-markup" >&5
+$as_echo_n "checking for --${enablestring:-enable}-markup... " >&6; }
+          # Check whether --enable-markup was given.
+if test "${enable_markup+set}" = set; then :
+  enableval=$enable_markup;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_markup='wxUSE_MARKUP=yes'
+                          else
+                            wx_cv_use_markup='wxUSE_MARKUP=no'
+                          fi
+
+else
+
+                          wx_cv_use_markup='wxUSE_MARKUP=${'DEFAULT_wxUSE_MARKUP":-$defaultval}"
+
 fi
 
 
 fi
 
 
+          eval "$wx_cv_use_markup"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MARKUP = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_MARKUP
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -10513,11 +11050,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-accel" >&5
+$as_echo_n "checking for --${enablestring:-enable}-accel... " >&6; }
           # Check whether --enable-accel was given.
           # Check whether --enable-accel was given.
-if test "${enable_accel+set}" = set; then
+if test "${enable_accel+set}" = set; then :
   enableval=$enable_accel;
                           if test "$enableval" = yes; then
                             wx_cv_use_accel='wxUSE_ACCEL=yes'
   enableval=$enable_accel;
                           if test "$enableval" = yes; then
                             wx_cv_use_accel='wxUSE_ACCEL=yes'
@@ -10527,35 +11063,25 @@ if test "${enable_accel+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accel"
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accel"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_accel >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ACCEL = yes; then
-              result=no
-            else
+            if test $wxUSE_ACCEL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ACCEL
           fi
 
             fi
           else
             result=$wxUSE_ACCEL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10568,11 +11094,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-animatectrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-animatectrl... " >&6; }
           # Check whether --enable-animatectrl was given.
           # Check whether --enable-animatectrl was given.
-if test "${enable_animatectrl+set}" = set; then
+if test "${enable_animatectrl+set}" = set; then :
   enableval=$enable_animatectrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
   enableval=$enable_animatectrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
@@ -10582,35 +11107,25 @@ if test "${enable_animatectrl+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_animatectrl"
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_animatectrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ANIMATIONCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_ANIMATIONCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ANIMATIONCTRL
           fi
 
             fi
           else
             result=$wxUSE_ANIMATIONCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10623,49 +11138,126 @@ 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; }
-          no_cache=0
-          # Check whether --enable-button was given.
-if test "${enable_button+set}" = set; then
-  enableval=$enable_button;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-bannerwindow" >&5
+$as_echo_n "checking for --${enablestring:-enable}-bannerwindow... " >&6; }
+          # Check whether --enable-bannerwindow was given.
+if test "${enable_bannerwindow+set}" = set; then :
+  enableval=$enable_bannerwindow;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_button='wxUSE_BUTTON=yes'
+                            wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=yes'
                           else
                           else
-                            wx_cv_use_button='wxUSE_BUTTON=no'
+                            wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                          wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=${'DEFAULT_wxUSE_BANNERWINDOW":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_bannerwindow"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_BANNERWINDOW = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_BANNERWINDOW
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-artstd" >&5
+$as_echo_n "checking for --${enablestring:-enable}-artstd... " >&6; }
+          # Check whether --enable-artstd was given.
+if test "${enable_artstd+set}" = set; then :
+  enableval=$enable_artstd;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=yes'
                           else
                           else
-                            no_cache=1
+                            wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=no'
                           fi
 
                           fi
 
-                          wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
+else
+
+                          wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=${'DEFAULT_wxUSE_ARTPROVIDER_STD":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_button"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_button >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_artstd"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BUTTON = yes; then
-              result=no
+            if test $wxUSE_ARTPROVIDER_STD = no; then
+              result=yes
             else
             else
+              result=no
+            fi
+          else
+            result=$wxUSE_ARTPROVIDER_STD
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-arttango" >&5
+$as_echo_n "checking for --${enablestring:-enable}-arttango... " >&6; }
+          # Check whether --enable-arttango was given.
+if test "${enable_arttango+set}" = set; then :
+  enableval=$enable_arttango;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=yes'
+                          else
+                            wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=no'
+                          fi
+
+else
+
+                          wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=${'DEFAULT_wxUSE_ARTPROVIDER_TANGO":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_arttango"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ARTPROVIDER_TANGO = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_BUTTON
+            result=$wxUSE_ARTPROVIDER_TANGO
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10678,11 +11270,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-bmpbutton" >&5
+$as_echo_n "checking for --${enablestring:-enable}-bmpbutton... " >&6; }
           # Check whether --enable-bmpbutton was given.
           # Check whether --enable-bmpbutton was given.
-if test "${enable_bmpbutton+set}" = set; then
+if test "${enable_bmpbutton+set}" = set; then :
   enableval=$enable_bmpbutton;
                           if test "$enableval" = yes; then
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
   enableval=$enable_bmpbutton;
                           if test "$enableval" = yes; then
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
@@ -10692,35 +11283,25 @@ if test "${enable_bmpbutton+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpbutton"
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpbutton"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BMPBUTTON = yes; then
-              result=no
-            else
+            if test $wxUSE_BMPBUTTON = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_BMPBUTTON
           fi
 
             fi
           else
             result=$wxUSE_BMPBUTTON
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10733,11 +11314,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-bmpcombobox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-bmpcombobox... " >&6; }
           # Check whether --enable-bmpcombobox was given.
           # Check whether --enable-bmpcombobox was given.
-if test "${enable_bmpcombobox+set}" = set; then
+if test "${enable_bmpcombobox+set}" = set; then :
   enableval=$enable_bmpcombobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
   enableval=$enable_bmpcombobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
@@ -10747,35 +11327,25 @@ if test "${enable_bmpcombobox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpcombobox"
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpcombobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BITMAPCOMBOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_BITMAPCOMBOBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_BITMAPCOMBOBOX
           fi
 
             fi
           else
             result=$wxUSE_BITMAPCOMBOBOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10788,11 +11358,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-button" >&5
+$as_echo_n "checking for --${enablestring:-enable}-button... " >&6; }
+          # Check whether --enable-button was given.
+if test "${enable_button+set}" = set; then :
+  enableval=$enable_button;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_button='wxUSE_BUTTON=yes'
+                          else
+                            wx_cv_use_button='wxUSE_BUTTON=no'
+                          fi
+
+else
+
+                          wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_button"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_BUTTON = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_BUTTON
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-calendar" >&5
+$as_echo_n "checking for --${enablestring:-enable}-calendar... " >&6; }
           # Check whether --enable-calendar was given.
           # Check whether --enable-calendar was given.
-if test "${enable_calendar+set}" = set; then
+if test "${enable_calendar+set}" = set; then :
   enableval=$enable_calendar;
                           if test "$enableval" = yes; then
                             wx_cv_use_calendar='wxUSE_CALCTRL=yes'
   enableval=$enable_calendar;
                           if test "$enableval" = yes; then
                             wx_cv_use_calendar='wxUSE_CALCTRL=yes'
@@ -10802,35 +11415,25 @@ if test "${enable_calendar+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_calendar"
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_calendar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_calendar >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CALCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_CALCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CALCTRL
           fi
 
             fi
           else
             result=$wxUSE_CALCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10843,11 +11446,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-caret" >&5
+$as_echo_n "checking for --${enablestring:-enable}-caret... " >&6; }
           # Check whether --enable-caret was given.
           # Check whether --enable-caret was given.
-if test "${enable_caret+set}" = set; then
+if test "${enable_caret+set}" = set; then :
   enableval=$enable_caret;
                           if test "$enableval" = yes; then
                             wx_cv_use_caret='wxUSE_CARET=yes'
   enableval=$enable_caret;
                           if test "$enableval" = yes; then
                             wx_cv_use_caret='wxUSE_CARET=yes'
@@ -10857,35 +11459,25 @@ if test "${enable_caret+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_caret"
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_caret"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_caret >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CARET = yes; then
-              result=no
-            else
+            if test $wxUSE_CARET = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CARET
           fi
 
             fi
           else
             result=$wxUSE_CARET
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10898,11 +11490,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-checkbox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-checkbox... " >&6; }
           # Check whether --enable-checkbox was given.
           # Check whether --enable-checkbox was given.
-if test "${enable_checkbox+set}" = set; then
+if test "${enable_checkbox+set}" = set; then :
   enableval=$enable_checkbox;
                           if test "$enableval" = yes; then
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=yes'
   enableval=$enable_checkbox;
                           if test "$enableval" = yes; then
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=yes'
@@ -10912,35 +11503,25 @@ if test "${enable_checkbox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checkbox"
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checkbox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHECKBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_CHECKBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CHECKBOX
           fi
 
             fi
           else
             result=$wxUSE_CHECKBOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -10953,11 +11534,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-checklst" >&5
+$as_echo_n "checking for --${enablestring:-enable}-checklst... " >&6; }
           # Check whether --enable-checklst was given.
           # Check whether --enable-checklst was given.
-if test "${enable_checklst+set}" = set; then
+if test "${enable_checklst+set}" = set; then :
   enableval=$enable_checklst;
                           if test "$enableval" = yes; then
                             wx_cv_use_checklst='wxUSE_CHECKLST=yes'
   enableval=$enable_checklst;
                           if test "$enableval" = yes; then
                             wx_cv_use_checklst='wxUSE_CHECKLST=yes'
@@ -10967,35 +11547,25 @@ if test "${enable_checklst+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checklst"
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checklst"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_checklst >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHECKLST = yes; then
-              result=no
-            else
+            if test $wxUSE_CHECKLST = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CHECKLST
           fi
 
             fi
           else
             result=$wxUSE_CHECKLST
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11008,11 +11578,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-choice" >&5
+$as_echo_n "checking for --${enablestring:-enable}-choice... " >&6; }
           # Check whether --enable-choice was given.
           # Check whether --enable-choice was given.
-if test "${enable_choice+set}" = set; then
+if test "${enable_choice+set}" = set; then :
   enableval=$enable_choice;
                           if test "$enableval" = yes; then
                             wx_cv_use_choice='wxUSE_CHOICE=yes'
   enableval=$enable_choice;
                           if test "$enableval" = yes; then
                             wx_cv_use_choice='wxUSE_CHOICE=yes'
@@ -11022,35 +11591,25 @@ if test "${enable_choice+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choice"
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choice"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_choice >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHOICE = yes; then
-              result=no
-            else
+            if test $wxUSE_CHOICE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CHOICE
           fi
 
             fi
           else
             result=$wxUSE_CHOICE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11063,11 +11622,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-choicebook" >&5
+$as_echo_n "checking for --${enablestring:-enable}-choicebook... " >&6; }
           # Check whether --enable-choicebook was given.
           # Check whether --enable-choicebook was given.
-if test "${enable_choicebook+set}" = set; then
+if test "${enable_choicebook+set}" = set; then :
   enableval=$enable_choicebook;
                           if test "$enableval" = yes; then
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
   enableval=$enable_choicebook;
                           if test "$enableval" = yes; then
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
@@ -11077,35 +11635,25 @@ if test "${enable_choicebook+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicebook"
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicebook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHOICEBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_CHOICEBOOK = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CHOICEBOOK
           fi
 
             fi
           else
             result=$wxUSE_CHOICEBOOK
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11118,11 +11666,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-collpane" >&5
+$as_echo_n "checking for --${enablestring:-enable}-collpane... " >&6; }
           # Check whether --enable-collpane was given.
           # Check whether --enable-collpane was given.
-if test "${enable_collpane+set}" = set; then
+if test "${enable_collpane+set}" = set; then :
   enableval=$enable_collpane;
                           if test "$enableval" = yes; then
                             wx_cv_use_collpane='wxUSE_COLLPANE=yes'
   enableval=$enable_collpane;
                           if test "$enableval" = yes; then
                             wx_cv_use_collpane='wxUSE_COLLPANE=yes'
@@ -11132,35 +11679,25 @@ if test "${enable_collpane+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_collpane"
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_collpane"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_collpane >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COLLPANE = yes; then
-              result=no
-            else
+            if test $wxUSE_COLLPANE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_COLLPANE
           fi
 
             fi
           else
             result=$wxUSE_COLLPANE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11173,11 +11710,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-colourpicker" >&5
+$as_echo_n "checking for --${enablestring:-enable}-colourpicker... " >&6; }
           # Check whether --enable-colourpicker was given.
           # Check whether --enable-colourpicker was given.
-if test "${enable_colourpicker+set}" = set; then
+if test "${enable_colourpicker+set}" = set; then :
   enableval=$enable_colourpicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
   enableval=$enable_colourpicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
@@ -11187,35 +11723,25 @@ if test "${enable_colourpicker+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_colourpicker"
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_colourpicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COLOURPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_COLOURPICKERCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_COLOURPICKERCTRL
           fi
 
             fi
           else
             result=$wxUSE_COLOURPICKERCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11228,11 +11754,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-combobox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-combobox... " >&6; }
           # Check whether --enable-combobox was given.
           # Check whether --enable-combobox was given.
-if test "${enable_combobox+set}" = set; then
+if test "${enable_combobox+set}" = set; then :
   enableval=$enable_combobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_combobox='wxUSE_COMBOBOX=yes'
   enableval=$enable_combobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_combobox='wxUSE_COMBOBOX=yes'
@@ -11242,35 +11767,25 @@ if test "${enable_combobox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_combobox"
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_combobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_combobox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COMBOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_COMBOBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_COMBOBOX
           fi
 
             fi
           else
             result=$wxUSE_COMBOBOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11283,11 +11798,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-comboctrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-comboctrl... " >&6; }
           # Check whether --enable-comboctrl was given.
           # Check whether --enable-comboctrl was given.
-if test "${enable_comboctrl+set}" = set; then
+if test "${enable_comboctrl+set}" = set; then :
   enableval=$enable_comboctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
   enableval=$enable_comboctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
@@ -11297,35 +11811,113 @@ if test "${enable_comboctrl+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_comboctrl"
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_comboctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COMBOCTRL = yes; then
+            if test $wxUSE_COMBOCTRL = no; then
+              result=yes
+            else
               result=no
               result=no
+            fi
+          else
+            result=$wxUSE_COMBOCTRL
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-commandlinkbutton" >&5
+$as_echo_n "checking for --${enablestring:-enable}-commandlinkbutton... " >&6; }
+          # Check whether --enable-commandlinkbutton was given.
+if test "${enable_commandlinkbutton+set}" = set; then :
+  enableval=$enable_commandlinkbutton;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes'
+                          else
+                            wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no'
+                          fi
+
+else
+
+                          wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_commandlinkbutton"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COMMANDLINKBUTTON = no; then
+              result=yes
             else
             else
+              result=no
+            fi
+          else
+            result=$wxUSE_COMMANDLINKBUTTON
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dataviewctrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dataviewctrl... " >&6; }
+          # Check whether --enable-dataviewctrl was given.
+if test "${enable_dataviewctrl+set}" = set; then :
+  enableval=$enable_dataviewctrl;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+                          else
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_dataviewctrl"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DATAVIEWCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_COMBOCTRL
+            result=$wxUSE_DATAVIEWCTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11338,11 +11930,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-datepick" >&5
+$as_echo_n "checking for --${enablestring:-enable}-datepick... " >&6; }
           # Check whether --enable-datepick was given.
           # Check whether --enable-datepick was given.
-if test "${enable_datepick+set}" = set; then
+if test "${enable_datepick+set}" = set; then :
   enableval=$enable_datepick;
                           if test "$enableval" = yes; then
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
   enableval=$enable_datepick;
                           if test "$enableval" = yes; then
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
@@ -11352,35 +11943,25 @@ if test "${enable_datepick+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datepick"
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datepick"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_datepick >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATEPICKCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_DATEPICKCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DATEPICKCTRL
           fi
 
             fi
           else
             result=$wxUSE_DATEPICKCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11393,11 +11974,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-detect_sm" >&5
+$as_echo_n "checking for --${enablestring:-enable}-detect_sm... " >&6; }
+          # Check whether --enable-detect_sm was given.
+if test "${enable_detect_sm+set}" = set; then :
+  enableval=$enable_detect_sm;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
+                          else
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
+                          fi
+
+else
+
+                          wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_detect_sm"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DETECT_SM = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_DETECT_SM
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dirpicker" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dirpicker... " >&6; }
           # Check whether --enable-dirpicker was given.
           # Check whether --enable-dirpicker was given.
-if test "${enable_dirpicker+set}" = set; then
+if test "${enable_dirpicker+set}" = set; then :
   enableval=$enable_dirpicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
   enableval=$enable_dirpicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
@@ -11407,35 +12031,25 @@ if test "${enable_dirpicker+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirpicker"
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirpicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIRPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_DIRPICKERCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DIRPICKERCTRL
           fi
 
             fi
           else
             result=$wxUSE_DIRPICKERCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11448,11 +12062,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-display" >&5
+$as_echo_n "checking for --${enablestring:-enable}-display... " >&6; }
           # Check whether --enable-display was given.
           # Check whether --enable-display was given.
-if test "${enable_display+set}" = set; then
+if test "${enable_display+set}" = set; then :
   enableval=$enable_display;
                           if test "$enableval" = yes; then
                             wx_cv_use_display='wxUSE_DISPLAY=yes'
   enableval=$enable_display;
                           if test "$enableval" = yes; then
                             wx_cv_use_display='wxUSE_DISPLAY=yes'
@@ -11462,35 +12075,25 @@ if test "${enable_display+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_display"
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_display"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_display >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DISPLAY = yes; then
-              result=no
-            else
+            if test $wxUSE_DISPLAY = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DISPLAY
           fi
 
             fi
           else
             result=$wxUSE_DISPLAY
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11503,49 +12106,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-detect_sm was given.
-if test "${enable_detect_sm+set}" = set; then
-  enableval=$enable_detect_sm;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-editablebox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-editablebox... " >&6; }
+          # Check whether --enable-editablebox was given.
+if test "${enable_editablebox+set}" = set; then :
+  enableval=$enable_editablebox;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
+                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
                           else
                           else
-                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
+                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
+                          wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_detect_sm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_editablebox"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DETECT_SM = yes; then
-              result=no
-            else
+            if test $wxUSE_EDITABLELISTBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DETECT_SM
+            result=$wxUSE_EDITABLELISTBOX
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11558,49 +12150,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-editablebox was given.
-if test "${enable_editablebox+set}" = set; then
-  enableval=$enable_editablebox;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-filectrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-filectrl... " >&6; }
+          # Check whether --enable-filectrl was given.
+if test "${enable_filectrl+set}" = set; then :
+  enableval=$enable_filectrl;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
+                            wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
                           else
                           else
-                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
+                            wx_cv_use_filectrl='wxUSE_FILECTRL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
+                          wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_editablebox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_editablebox >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_filectrl"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EDITABLELISTBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_FILECTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_EDITABLELISTBOX
+            result=$wxUSE_FILECTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11613,11 +12194,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-filepicker" >&5
+$as_echo_n "checking for --${enablestring:-enable}-filepicker... " >&6; }
           # Check whether --enable-filepicker was given.
           # Check whether --enable-filepicker was given.
-if test "${enable_filepicker+set}" = set; then
+if test "${enable_filepicker+set}" = set; then :
   enableval=$enable_filepicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
   enableval=$enable_filepicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
@@ -11627,35 +12207,25 @@ if test "${enable_filepicker+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filepicker"
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filepicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_filepicker >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILEPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_FILEPICKERCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FILEPICKERCTRL
           fi
 
             fi
           else
             result=$wxUSE_FILEPICKERCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11668,11 +12238,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fontpicker" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fontpicker... " >&6; }
           # Check whether --enable-fontpicker was given.
           # Check whether --enable-fontpicker was given.
-if test "${enable_fontpicker+set}" = set; then
+if test "${enable_fontpicker+set}" = set; then :
   enableval=$enable_fontpicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
   enableval=$enable_fontpicker;
                           if test "$enableval" = yes; then
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
@@ -11682,35 +12251,25 @@ if test "${enable_fontpicker+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontpicker"
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontpicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FONTPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_FONTPICKERCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FONTPICKERCTRL
           fi
 
             fi
           else
             result=$wxUSE_FONTPICKERCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11723,11 +12282,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-gauge" >&5
+$as_echo_n "checking for --${enablestring:-enable}-gauge... " >&6; }
           # Check whether --enable-gauge was given.
           # Check whether --enable-gauge was given.
-if test "${enable_gauge+set}" = set; then
+if test "${enable_gauge+set}" = set; then :
   enableval=$enable_gauge;
                           if test "$enableval" = yes; then
                             wx_cv_use_gauge='wxUSE_GAUGE=yes'
   enableval=$enable_gauge;
                           if test "$enableval" = yes; then
                             wx_cv_use_gauge='wxUSE_GAUGE=yes'
@@ -11737,35 +12295,25 @@ if test "${enable_gauge+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gauge"
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gauge"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gauge >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GAUGE = yes; then
-              result=no
-            else
+            if test $wxUSE_GAUGE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_GAUGE
           fi
 
             fi
           else
             result=$wxUSE_GAUGE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11778,11 +12326,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-grid" >&5
+$as_echo_n "checking for --${enablestring:-enable}-grid... " >&6; }
           # Check whether --enable-grid was given.
           # Check whether --enable-grid was given.
-if test "${enable_grid+set}" = set; then
+if test "${enable_grid+set}" = set; then :
   enableval=$enable_grid;
                           if test "$enableval" = yes; then
                             wx_cv_use_grid='wxUSE_GRID=yes'
   enableval=$enable_grid;
                           if test "$enableval" = yes; then
                             wx_cv_use_grid='wxUSE_GRID=yes'
@@ -11792,35 +12339,25 @@ if test "${enable_grid+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_grid"
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_grid"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_grid >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GRID = yes; then
-              result=no
-            else
+            if test $wxUSE_GRID = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_GRID
           fi
 
             fi
           else
             result=$wxUSE_GRID
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11833,49 +12370,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-dataviewctrl was given.
-if test "${enable_dataviewctrl+set}" = set; then
-  enableval=$enable_dataviewctrl;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-headerctrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-headerctrl... " >&6; }
+          # Check whether --enable-headerctrl was given.
+if test "${enable_headerctrl+set}" = set; then :
+  enableval=$enable_headerctrl;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+                            wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes'
                           else
                           else
-                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+                            wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
+                          wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_dataviewctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_headerctrl"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATAVIEWCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_HEADERCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DATAVIEWCTRL
+            result=$wxUSE_HEADERCTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11888,11 +12414,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-hyperlink" >&5
+$as_echo_n "checking for --${enablestring:-enable}-hyperlink... " >&6; }
           # Check whether --enable-hyperlink was given.
           # Check whether --enable-hyperlink was given.
-if test "${enable_hyperlink+set}" = set; then
+if test "${enable_hyperlink+set}" = set; then :
   enableval=$enable_hyperlink;
                           if test "$enableval" = yes; then
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
   enableval=$enable_hyperlink;
                           if test "$enableval" = yes; then
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
@@ -11902,35 +12427,25 @@ if test "${enable_hyperlink+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_hyperlink"
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_hyperlink"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_HYPERLINKCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_HYPERLINKCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_HYPERLINKCTRL
           fi
 
             fi
           else
             result=$wxUSE_HYPERLINKCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11943,11 +12458,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-imaglist" >&5
+$as_echo_n "checking for --${enablestring:-enable}-imaglist... " >&6; }
           # Check whether --enable-imaglist was given.
           # Check whether --enable-imaglist was given.
-if test "${enable_imaglist+set}" = set; then
+if test "${enable_imaglist+set}" = set; then :
   enableval=$enable_imaglist;
                           if test "$enableval" = yes; then
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=yes'
   enableval=$enable_imaglist;
                           if test "$enableval" = yes; then
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=yes'
@@ -11957,35 +12471,25 @@ if test "${enable_imaglist+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_imaglist"
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_imaglist"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IMAGLIST = yes; then
-              result=no
-            else
+            if test $wxUSE_IMAGLIST = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_IMAGLIST
           fi
 
             fi
           else
             result=$wxUSE_IMAGLIST
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -11998,11 +12502,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-infobar" >&5
+$as_echo_n "checking for --${enablestring:-enable}-infobar... " >&6; }
+          # Check whether --enable-infobar was given.
+if test "${enable_infobar+set}" = set; then :
+  enableval=$enable_infobar;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_infobar='wxUSE_INFOBAR=yes'
+                          else
+                            wx_cv_use_infobar='wxUSE_INFOBAR=no'
+                          fi
+
+else
+
+                          wx_cv_use_infobar='wxUSE_INFOBAR=${'DEFAULT_wxUSE_INFOBAR":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_infobar"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_INFOBAR = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_INFOBAR
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-listbook" >&5
+$as_echo_n "checking for --${enablestring:-enable}-listbook... " >&6; }
           # Check whether --enable-listbook was given.
           # Check whether --enable-listbook was given.
-if test "${enable_listbook+set}" = set; then
+if test "${enable_listbook+set}" = set; then :
   enableval=$enable_listbook;
                           if test "$enableval" = yes; then
                             wx_cv_use_listbook='wxUSE_LISTBOOK=yes'
   enableval=$enable_listbook;
                           if test "$enableval" = yes; then
                             wx_cv_use_listbook='wxUSE_LISTBOOK=yes'
@@ -12012,35 +12559,25 @@ if test "${enable_listbook+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbook"
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_listbook >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LISTBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_LISTBOOK = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_LISTBOOK
           fi
 
             fi
           else
             result=$wxUSE_LISTBOOK
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12053,11 +12590,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-listbox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-listbox... " >&6; }
           # Check whether --enable-listbox was given.
           # Check whether --enable-listbox was given.
-if test "${enable_listbox+set}" = set; then
+if test "${enable_listbox+set}" = set; then :
   enableval=$enable_listbox;
                           if test "$enableval" = yes; then
                             wx_cv_use_listbox='wxUSE_LISTBOX=yes'
   enableval=$enable_listbox;
                           if test "$enableval" = yes; then
                             wx_cv_use_listbox='wxUSE_LISTBOX=yes'
@@ -12067,35 +12603,25 @@ if test "${enable_listbox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbox"
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_listbox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LISTBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_LISTBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_LISTBOX
           fi
 
             fi
           else
             result=$wxUSE_LISTBOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12108,11 +12634,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-listctrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-listctrl... " >&6; }
           # Check whether --enable-listctrl was given.
           # Check whether --enable-listctrl was given.
-if test "${enable_listctrl+set}" = set; then
+if test "${enable_listctrl+set}" = set; then :
   enableval=$enable_listctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=yes'
   enableval=$enable_listctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=yes'
@@ -12122,35 +12647,25 @@ if test "${enable_listctrl+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listctrl"
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LISTCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_LISTCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_LISTCTRL
           fi
 
             fi
           else
             result=$wxUSE_LISTCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12163,11 +12678,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-notebook" >&5
+$as_echo_n "checking for --${enablestring:-enable}-notebook... " >&6; }
           # Check whether --enable-notebook was given.
           # Check whether --enable-notebook was given.
-if test "${enable_notebook+set}" = set; then
+if test "${enable_notebook+set}" = set; then :
   enableval=$enable_notebook;
                           if test "$enableval" = yes; then
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=yes'
   enableval=$enable_notebook;
                           if test "$enableval" = yes; then
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=yes'
@@ -12177,35 +12691,69 @@ if test "${enable_notebook+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_notebook"
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_notebook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_notebook >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NOTEBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_NOTEBOOK = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_NOTEBOOK
           fi
 
             fi
           else
             result=$wxUSE_NOTEBOOK
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-notifmsg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-notifmsg... " >&6; }
+          # Check whether --enable-notifmsg was given.
+if test "${enable_notifmsg+set}" = set; then :
+  enableval=$enable_notifmsg;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=yes'
+                          else
+                            wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=no'
+                          fi
+
+else
+
+                          wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=${'DEFAULT_wxUSE_NOTIFICATION_MESSAGE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_notifmsg"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NOTIFICATION_MESSAGE = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_NOTIFICATION_MESSAGE
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12218,11 +12766,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-odcombobox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-odcombobox... " >&6; }
           # Check whether --enable-odcombobox was given.
           # Check whether --enable-odcombobox was given.
-if test "${enable_odcombobox+set}" = set; then
+if test "${enable_odcombobox+set}" = set; then :
   enableval=$enable_odcombobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
   enableval=$enable_odcombobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
@@ -12232,35 +12779,25 @@ if test "${enable_odcombobox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_odcombobox"
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_odcombobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ODCOMBOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_ODCOMBOBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ODCOMBOBOX
           fi
 
             fi
           else
             result=$wxUSE_ODCOMBOBOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12273,11 +12810,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-popupwin" >&5
+$as_echo_n "checking for --${enablestring:-enable}-popupwin... " >&6; }
+          # Check whether --enable-popupwin was given.
+if test "${enable_popupwin+set}" = set; then :
+  enableval=$enable_popupwin;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                          else
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                          fi
+
+else
+
+                          wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_popupwin"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_POPUPWIN = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_POPUPWIN
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-radiobox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-radiobox... " >&6; }
           # Check whether --enable-radiobox was given.
           # Check whether --enable-radiobox was given.
-if test "${enable_radiobox+set}" = set; then
+if test "${enable_radiobox+set}" = set; then :
   enableval=$enable_radiobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=yes'
   enableval=$enable_radiobox;
                           if test "$enableval" = yes; then
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=yes'
@@ -12287,35 +12867,25 @@ if test "${enable_radiobox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobox"
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RADIOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_RADIOBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_RADIOBOX
           fi
 
             fi
           else
             result=$wxUSE_RADIOBOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12328,11 +12898,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-radiobtn" >&5
+$as_echo_n "checking for --${enablestring:-enable}-radiobtn... " >&6; }
           # Check whether --enable-radiobtn was given.
           # Check whether --enable-radiobtn was given.
-if test "${enable_radiobtn+set}" = set; then
+if test "${enable_radiobtn+set}" = set; then :
   enableval=$enable_radiobtn;
                           if test "$enableval" = yes; then
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
   enableval=$enable_radiobtn;
                           if test "$enableval" = yes; then
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
@@ -12342,35 +12911,157 @@ if test "${enable_radiobtn+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobtn"
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobtn"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RADIOBTN = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_RADIOBTN
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
 
           fi
 
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-richmsgdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-richmsgdlg... " >&6; }
+          # Check whether --enable-richmsgdlg was given.
+if test "${enable_richmsgdlg+set}" = set; then :
+  enableval=$enable_richmsgdlg;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=yes'
+                          else
+                            wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=no'
+                          fi
+
+else
+
+                          wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=${'DEFAULT_wxUSE_RICHMSGDLG":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_richmsgdlg"
+
           if test x"$enablestring" = xdisable; then
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RADIOBTN = yes; then
+            if test $wxUSE_RICHMSGDLG = no; then
+              result=yes
+            else
               result=no
               result=no
+            fi
+          else
+            result=$wxUSE_RICHMSGDLG
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-richtooltip" >&5
+$as_echo_n "checking for --${enablestring:-enable}-richtooltip... " >&6; }
+          # Check whether --enable-richtooltip was given.
+if test "${enable_richtooltip+set}" = set; then :
+  enableval=$enable_richtooltip;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=yes'
+                          else
+                            wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=no'
+                          fi
+
+else
+
+                          wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=${'DEFAULT_wxUSE_RICHTOOLTIP":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_richtooltip"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RICHTOOLTIP = no; then
+              result=yes
             else
             else
+              result=no
+            fi
+          else
+            result=$wxUSE_RICHTOOLTIP
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-rearrangectrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-rearrangectrl... " >&6; }
+          # Check whether --enable-rearrangectrl was given.
+if test "${enable_rearrangectrl+set}" = set; then :
+  enableval=$enable_rearrangectrl;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=yes'
+                          else
+                            wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=${'DEFAULT_wxUSE_REARRANGECTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_rearrangectrl"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_REARRANGECTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_RADIOBTN
+            result=$wxUSE_REARRANGECTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12383,11 +13074,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-sash" >&5
+$as_echo_n "checking for --${enablestring:-enable}-sash... " >&6; }
           # Check whether --enable-sash was given.
           # Check whether --enable-sash was given.
-if test "${enable_sash+set}" = set; then
+if test "${enable_sash+set}" = set; then :
   enableval=$enable_sash;
                           if test "$enableval" = yes; then
                             wx_cv_use_sash='wxUSE_SASH=yes'
   enableval=$enable_sash;
                           if test "$enableval" = yes; then
                             wx_cv_use_sash='wxUSE_SASH=yes'
@@ -12397,35 +13087,25 @@ if test "${enable_sash+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sash"
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sash"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sash >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SASH = yes; then
-              result=no
-            else
+            if test $wxUSE_SASH = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SASH
           fi
 
             fi
           else
             result=$wxUSE_SASH
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12438,11 +13118,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-scrollbar" >&5
+$as_echo_n "checking for --${enablestring:-enable}-scrollbar... " >&6; }
           # Check whether --enable-scrollbar was given.
           # Check whether --enable-scrollbar was given.
-if test "${enable_scrollbar+set}" = set; then
+if test "${enable_scrollbar+set}" = set; then :
   enableval=$enable_scrollbar;
                           if test "$enableval" = yes; then
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
   enableval=$enable_scrollbar;
                           if test "$enableval" = yes; then
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
@@ -12452,35 +13131,25 @@ if test "${enable_scrollbar+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_scrollbar"
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_scrollbar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SCROLLBAR = yes; then
-              result=no
-            else
+            if test $wxUSE_SCROLLBAR = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SCROLLBAR
           fi
 
             fi
           else
             result=$wxUSE_SCROLLBAR
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12493,11 +13162,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-searchctrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-searchctrl... " >&6; }
           # Check whether --enable-searchctrl was given.
           # Check whether --enable-searchctrl was given.
-if test "${enable_searchctrl+set}" = set; then
+if test "${enable_searchctrl+set}" = set; then :
   enableval=$enable_searchctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
   enableval=$enable_searchctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
@@ -12507,35 +13175,25 @@ if test "${enable_searchctrl+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_searchctrl"
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_searchctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SEARCHCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_SEARCHCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SEARCHCTRL
           fi
 
             fi
           else
             result=$wxUSE_SEARCHCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12548,11 +13206,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-slider" >&5
+$as_echo_n "checking for --${enablestring:-enable}-slider... " >&6; }
           # Check whether --enable-slider was given.
           # Check whether --enable-slider was given.
-if test "${enable_slider+set}" = set; then
+if test "${enable_slider+set}" = set; then :
   enableval=$enable_slider;
                           if test "$enableval" = yes; then
                             wx_cv_use_slider='wxUSE_SLIDER=yes'
   enableval=$enable_slider;
                           if test "$enableval" = yes; then
                             wx_cv_use_slider='wxUSE_SLIDER=yes'
@@ -12562,35 +13219,25 @@ if test "${enable_slider+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_slider"
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_slider"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_slider >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SLIDER = yes; then
-              result=no
-            else
+            if test $wxUSE_SLIDER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SLIDER
           fi
 
             fi
           else
             result=$wxUSE_SLIDER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12603,11 +13250,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-spinbtn" >&5
+$as_echo_n "checking for --${enablestring:-enable}-spinbtn... " >&6; }
           # Check whether --enable-spinbtn was given.
           # Check whether --enable-spinbtn was given.
-if test "${enable_spinbtn+set}" = set; then
+if test "${enable_spinbtn+set}" = set; then :
   enableval=$enable_spinbtn;
                           if test "$enableval" = yes; then
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=yes'
   enableval=$enable_spinbtn;
                           if test "$enableval" = yes; then
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=yes'
@@ -12617,35 +13263,25 @@ if test "${enable_spinbtn+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinbtn"
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinbtn"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPINBTN = yes; then
-              result=no
-            else
+            if test $wxUSE_SPINBTN = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SPINBTN
           fi
 
             fi
           else
             result=$wxUSE_SPINBTN
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12658,11 +13294,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-spinctrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-spinctrl... " >&6; }
           # Check whether --enable-spinctrl was given.
           # Check whether --enable-spinctrl was given.
-if test "${enable_spinctrl+set}" = set; then
+if test "${enable_spinctrl+set}" = set; then :
   enableval=$enable_spinctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
   enableval=$enable_spinctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
@@ -12672,35 +13307,25 @@ if test "${enable_spinctrl+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinctrl"
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPINCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_SPINCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SPINCTRL
           fi
 
             fi
           else
             result=$wxUSE_SPINCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12713,11 +13338,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-splitter" >&5
+$as_echo_n "checking for --${enablestring:-enable}-splitter... " >&6; }
           # Check whether --enable-splitter was given.
           # Check whether --enable-splitter was given.
-if test "${enable_splitter+set}" = set; then
+if test "${enable_splitter+set}" = set; then :
   enableval=$enable_splitter;
                           if test "$enableval" = yes; then
                             wx_cv_use_splitter='wxUSE_SPLITTER=yes'
   enableval=$enable_splitter;
                           if test "$enableval" = yes; then
                             wx_cv_use_splitter='wxUSE_SPLITTER=yes'
@@ -12727,35 +13351,25 @@ if test "${enable_splitter+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splitter"
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splitter"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_splitter >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPLITTER = yes; then
-              result=no
-            else
+            if test $wxUSE_SPLITTER = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SPLITTER
           fi
 
             fi
           else
             result=$wxUSE_SPLITTER
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12768,11 +13382,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-statbmp" >&5
+$as_echo_n "checking for --${enablestring:-enable}-statbmp... " >&6; }
           # Check whether --enable-statbmp was given.
           # Check whether --enable-statbmp was given.
-if test "${enable_statbmp+set}" = set; then
+if test "${enable_statbmp+set}" = set; then :
   enableval=$enable_statbmp;
                           if test "$enableval" = yes; then
                             wx_cv_use_statbmp='wxUSE_STATBMP=yes'
   enableval=$enable_statbmp;
                           if test "$enableval" = yes; then
                             wx_cv_use_statbmp='wxUSE_STATBMP=yes'
@@ -12782,35 +13395,25 @@ if test "${enable_statbmp+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbmp"
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbmp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATBMP = yes; then
-              result=no
-            else
+            if test $wxUSE_STATBMP = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STATBMP
           fi
 
             fi
           else
             result=$wxUSE_STATBMP
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12823,11 +13426,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-statbox" >&5
+$as_echo_n "checking for --${enablestring:-enable}-statbox... " >&6; }
           # Check whether --enable-statbox was given.
           # Check whether --enable-statbox was given.
-if test "${enable_statbox+set}" = set; then
+if test "${enable_statbox+set}" = set; then :
   enableval=$enable_statbox;
                           if test "$enableval" = yes; then
                             wx_cv_use_statbox='wxUSE_STATBOX=yes'
   enableval=$enable_statbox;
                           if test "$enableval" = yes; then
                             wx_cv_use_statbox='wxUSE_STATBOX=yes'
@@ -12837,35 +13439,25 @@ if test "${enable_statbox+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbox"
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statbox >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_STATBOX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STATBOX
           fi
 
             fi
           else
             result=$wxUSE_STATBOX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12878,11 +13470,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-statline" >&5
+$as_echo_n "checking for --${enablestring:-enable}-statline... " >&6; }
           # Check whether --enable-statline was given.
           # Check whether --enable-statline was given.
-if test "${enable_statline+set}" = set; then
+if test "${enable_statline+set}" = set; then :
   enableval=$enable_statline;
                           if test "$enableval" = yes; then
                             wx_cv_use_statline='wxUSE_STATLINE=yes'
   enableval=$enable_statline;
                           if test "$enableval" = yes; then
                             wx_cv_use_statline='wxUSE_STATLINE=yes'
@@ -12892,35 +13483,25 @@ if test "${enable_statline+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statline"
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statline"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statline >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATLINE = yes; then
-              result=no
-            else
+            if test $wxUSE_STATLINE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STATLINE
           fi
 
             fi
           else
             result=$wxUSE_STATLINE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12933,11 +13514,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-stattext" >&5
+$as_echo_n "checking for --${enablestring:-enable}-stattext... " >&6; }
           # Check whether --enable-stattext was given.
           # Check whether --enable-stattext was given.
-if test "${enable_stattext+set}" = set; then
+if test "${enable_stattext+set}" = set; then :
   enableval=$enable_stattext;
                           if test "$enableval" = yes; then
                             wx_cv_use_stattext='wxUSE_STATTEXT=yes'
   enableval=$enable_stattext;
                           if test "$enableval" = yes; then
                             wx_cv_use_stattext='wxUSE_STATTEXT=yes'
@@ -12947,35 +13527,25 @@ if test "${enable_stattext+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stattext"
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stattext"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stattext >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_STATTEXT = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STATTEXT
           fi
 
             fi
           else
             result=$wxUSE_STATTEXT
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -12988,11 +13558,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-statusbar" >&5
+$as_echo_n "checking for --${enablestring:-enable}-statusbar... " >&6; }
           # Check whether --enable-statusbar was given.
           # Check whether --enable-statusbar was given.
-if test "${enable_statusbar+set}" = set; then
+if test "${enable_statusbar+set}" = set; then :
   enableval=$enable_statusbar;
                           if test "$enableval" = yes; then
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=yes'
   enableval=$enable_statusbar;
                           if test "$enableval" = yes; then
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=yes'
@@ -13002,35 +13571,25 @@ if test "${enable_statusbar+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statusbar"
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statusbar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATUSBAR = yes; then
-              result=no
-            else
+            if test $wxUSE_STATUSBAR = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STATUSBAR
           fi
 
             fi
           else
             result=$wxUSE_STATUSBAR
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13043,49 +13602,82 @@ 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; }
-          no_cache=0
-          # Check whether --enable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
-  enableval=$enable_tabdialog;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-taskbaricon" >&5
+$as_echo_n "checking for --${enablestring:-enable}-taskbaricon... " >&6; }
+          # Check whether --enable-taskbaricon was given.
+if test "${enable_taskbaricon+set}" = set; then :
+  enableval=$enable_taskbaricon;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
+                            wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes'
                           else
                           else
-                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
+                            wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                          wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_taskbaricon"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TASKBARICON = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_TASKBARICON
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-tbarnative" >&5
+$as_echo_n "checking for --${enablestring:-enable}-tbarnative... " >&6; }
+          # Check whether --enable-tbarnative was given.
+if test "${enable_tbarnative+set}" = set; then :
+  enableval=$enable_tbarnative;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                           else
                           else
-                            no_cache=1
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
 
                           fi
 
-                          wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
+else
+
+                          wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_tabdialog"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_tbarnative"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TAB_DIALOG = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLBAR_NATIVE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_TAB_DIALOG
+            result=$wxUSE_TOOLBAR_NATIVE
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13098,11 +13690,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-textctrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-textctrl... " >&6; }
           # Check whether --enable-textctrl was given.
           # Check whether --enable-textctrl was given.
-if test "${enable_textctrl+set}" = set; then
+if test "${enable_textctrl+set}" = set; then :
   enableval=$enable_textctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
   enableval=$enable_textctrl;
                           if test "$enableval" = yes; then
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
@@ -13112,35 +13703,25 @@ if test "${enable_textctrl+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textctrl"
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TEXTCTRL
           fi
 
             fi
           else
             result=$wxUSE_TEXTCTRL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13153,49 +13734,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-togglebtn was given.
-if test "${enable_togglebtn+set}" = set; then
-  enableval=$enable_togglebtn;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-datepick" >&5
+$as_echo_n "checking for --${enablestring:-enable}-datepick... " >&6; }
+          # Check whether --enable-datepick was given.
+if test "${enable_datepick+set}" = set; then :
+  enableval=$enable_datepick;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=yes'
                           else
                           else
-                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
+                          wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_togglebtn"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_datepick"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOGGLEBTN = yes; then
-              result=no
-            else
+            if test $wxUSE_TIMEPICKCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_TOGGLEBTN
+            result=$wxUSE_TIMEPICKCTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13208,49 +13778,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
-  enableval=$enable_toolbar;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-tipwindow" >&5
+$as_echo_n "checking for --${enablestring:-enable}-tipwindow... " >&6; }
+          # Check whether --enable-tipwindow was given.
+if test "${enable_tipwindow+set}" = set; then :
+  enableval=$enable_tipwindow;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                           else
                           else
-                            wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
+                          wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_toolbar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_tipwindow"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBAR = yes; then
-              result=no
-            else
+            if test $wxUSE_TIPWINDOW = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_TOOLBAR
+            result=$wxUSE_TIPWINDOW
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13263,49 +13822,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-tbarnative was given.
-if test "${enable_tbarnative+set}" = set; then
-  enableval=$enable_tbarnative;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-togglebtn" >&5
+$as_echo_n "checking for --${enablestring:-enable}-togglebtn... " >&6; }
+          # Check whether --enable-togglebtn was given.
+if test "${enable_togglebtn+set}" = set; then :
+  enableval=$enable_togglebtn;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                           else
                           else
-                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
+                          wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_tbarnative"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_togglebtn"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBAR_NATIVE = yes; then
-              result=no
-            else
+            if test $wxUSE_TOGGLEBTN = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_TOOLBAR_NATIVE
+            result=$wxUSE_TOGGLEBTN
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13318,49 +13866,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-treebook was given.
-if test "${enable_treebook+set}" = set; then
-  enableval=$enable_treebook;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-toolbar" >&5
+$as_echo_n "checking for --${enablestring:-enable}-toolbar... " >&6; }
+          # Check whether --enable-toolbar was given.
+if test "${enable_toolbar+set}" = set; then :
+  enableval=$enable_toolbar;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                           else
                           else
-                            wx_cv_use_treebook='wxUSE_TREEBOOK=no'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
+                          wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_treebook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_treebook >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_toolbar"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TREEBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLBAR = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_TREEBOOK
+            result=$wxUSE_TOOLBAR
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13373,11 +13910,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-toolbook" >&5
+$as_echo_n "checking for --${enablestring:-enable}-toolbook... " >&6; }
           # Check whether --enable-toolbook was given.
           # Check whether --enable-toolbook was given.
-if test "${enable_toolbook+set}" = set; then
+if test "${enable_toolbook+set}" = set; then :
   enableval=$enable_toolbook;
                           if test "$enableval" = yes; then
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
   enableval=$enable_toolbook;
                           if test "$enableval" = yes; then
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
@@ -13387,35 +13923,25 @@ if test "${enable_toolbook+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_toolbook"
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_toolbook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_toolbook >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLBOOK = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TOOLBOOK
           fi
 
             fi
           else
             result=$wxUSE_TOOLBOOK
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13428,49 +13954,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
-  enableval=$enable_treectrl;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-treebook" >&5
+$as_echo_n "checking for --${enablestring:-enable}-treebook... " >&6; }
+          # Check whether --enable-treebook was given.
+if test "${enable_treebook+set}" = set; then :
+  enableval=$enable_treebook;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
                           else
                           else
-                            wx_cv_use_treectrl='wxUSE_TREECTRL=no'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
+                          wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_treectrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_treebook"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TREECTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_TREEBOOK = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_TREECTRL
+            result=$wxUSE_TREEBOOK
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13483,49 +13998,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-tipwindow was given.
-if test "${enable_tipwindow+set}" = set; then
-  enableval=$enable_tipwindow;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-treectrl" >&5
+$as_echo_n "checking for --${enablestring:-enable}-treectrl... " >&6; }
+          # Check whether --enable-treectrl was given.
+if test "${enable_treectrl+set}" = set; then :
+  enableval=$enable_treectrl;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
                           else
                           else
-                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
+                          wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_tipwindow"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_treectrl"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TIPWINDOW = yes; then
-              result=no
-            else
+            if test $wxUSE_TREECTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_TIPWINDOW
+            result=$wxUSE_TREECTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13538,49 +14042,38 @@ 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; }
-          no_cache=0
-          # Check whether --enable-popupwin was given.
-if test "${enable_popupwin+set}" = set; then
-  enableval=$enable_popupwin;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-treelist" >&5
+$as_echo_n "checking for --${enablestring:-enable}-treelist... " >&6; }
+          # Check whether --enable-treelist was given.
+if test "${enable_treelist+set}" = set; then :
+  enableval=$enable_treelist;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                            wx_cv_use_treelist='wxUSE_TREELISTCTRL=yes'
                           else
                           else
-                            wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                            wx_cv_use_treelist='wxUSE_TREELISTCTRL=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
+                          wx_cv_use_treelist='wxUSE_TREELISTCTRL=${'DEFAULT_wxUSE_TREELISTCTRL":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_popupwin"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_treelist"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_POPUPWIN = yes; then
-              result=no
-            else
+            if test $wxUSE_TREELISTCTRL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_POPUPWIN
+            result=$wxUSE_TREELISTCTRL
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -13595,11 +14088,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-commondlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-commondlg... " >&6; }
           # Check whether --enable-commondlg was given.
           # Check whether --enable-commondlg was given.
-if test "${enable_commondlg+set}" = set; then
+if test "${enable_commondlg+set}" = set; then :
   enableval=$enable_commondlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
   enableval=$enable_commondlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
@@ -13609,35 +14101,25 @@ if test "${enable_commondlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_commondlg"
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_commondlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COMMONDLGS = yes; then
-              result=no
-            else
+            if test $wxUSE_COMMONDLGS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_COMMONDLGS
           fi
 
             fi
           else
             result=$wxUSE_COMMONDLGS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13650,11 +14132,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-aboutdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-aboutdlg... " >&6; }
           # Check whether --enable-aboutdlg was given.
           # Check whether --enable-aboutdlg was given.
-if test "${enable_aboutdlg+set}" = set; then
+if test "${enable_aboutdlg+set}" = set; then :
   enableval=$enable_aboutdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
   enableval=$enable_aboutdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
@@ -13664,35 +14145,25 @@ if test "${enable_aboutdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aboutdlg"
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aboutdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ABOUTDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_ABOUTDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ABOUTDLG
           fi
 
             fi
           else
             result=$wxUSE_ABOUTDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13705,11 +14176,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-choicedlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-choicedlg... " >&6; }
           # Check whether --enable-choicedlg was given.
           # Check whether --enable-choicedlg was given.
-if test "${enable_choicedlg+set}" = set; then
+if test "${enable_choicedlg+set}" = set; then :
   enableval=$enable_choicedlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
   enableval=$enable_choicedlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
@@ -13719,35 +14189,25 @@ if test "${enable_choicedlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicedlg"
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicedlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHOICEDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_CHOICEDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_CHOICEDLG
           fi
 
             fi
           else
             result=$wxUSE_CHOICEDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13760,11 +14220,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-coldlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-coldlg... " >&6; }
           # Check whether --enable-coldlg was given.
           # Check whether --enable-coldlg was given.
-if test "${enable_coldlg+set}" = set; then
+if test "${enable_coldlg+set}" = set; then :
   enableval=$enable_coldlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=yes'
   enableval=$enable_coldlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=yes'
@@ -13774,35 +14233,25 @@ if test "${enable_coldlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_coldlg"
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_coldlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COLOURDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_COLOURDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_COLOURDLG
           fi
 
             fi
           else
             result=$wxUSE_COLOURDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13815,11 +14264,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-filedlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-filedlg... " >&6; }
           # Check whether --enable-filedlg was given.
           # Check whether --enable-filedlg was given.
-if test "${enable_filedlg+set}" = set; then
+if test "${enable_filedlg+set}" = set; then :
   enableval=$enable_filedlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_filedlg='wxUSE_FILEDLG=yes'
   enableval=$enable_filedlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_filedlg='wxUSE_FILEDLG=yes'
@@ -13829,35 +14277,25 @@ if test "${enable_filedlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filedlg"
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filedlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILEDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_FILEDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FILEDLG
           fi
 
             fi
           else
             result=$wxUSE_FILEDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13870,11 +14308,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-finddlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-finddlg... " >&6; }
           # Check whether --enable-finddlg was given.
           # Check whether --enable-finddlg was given.
-if test "${enable_finddlg+set}" = set; then
+if test "${enable_finddlg+set}" = set; then :
   enableval=$enable_finddlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
   enableval=$enable_finddlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
@@ -13884,35 +14321,25 @@ if test "${enable_finddlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_finddlg"
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_finddlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_finddlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FINDREPLDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_FINDREPLDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FINDREPLDLG
           fi
 
             fi
           else
             result=$wxUSE_FINDREPLDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13925,11 +14352,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fontdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fontdlg... " >&6; }
           # Check whether --enable-fontdlg was given.
           # Check whether --enable-fontdlg was given.
-if test "${enable_fontdlg+set}" = set; then
+if test "${enable_fontdlg+set}" = set; then :
   enableval=$enable_fontdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=yes'
   enableval=$enable_fontdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=yes'
@@ -13939,35 +14365,25 @@ if test "${enable_fontdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontdlg"
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FONTDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_FONTDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_FONTDLG
           fi
 
             fi
           else
             result=$wxUSE_FONTDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -13980,11 +14396,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dirdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dirdlg... " >&6; }
           # Check whether --enable-dirdlg was given.
           # Check whether --enable-dirdlg was given.
-if test "${enable_dirdlg+set}" = set; then
+if test "${enable_dirdlg+set}" = set; then :
   enableval=$enable_dirdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=yes'
   enableval=$enable_dirdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=yes'
@@ -13994,35 +14409,25 @@ if test "${enable_dirdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirdlg"
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIRDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_DIRDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DIRDLG
           fi
 
             fi
           else
             result=$wxUSE_DIRDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14035,11 +14440,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-msgdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-msgdlg... " >&6; }
           # Check whether --enable-msgdlg was given.
           # Check whether --enable-msgdlg was given.
-if test "${enable_msgdlg+set}" = set; then
+if test "${enable_msgdlg+set}" = set; then :
   enableval=$enable_msgdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=yes'
   enableval=$enable_msgdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=yes'
@@ -14049,35 +14453,25 @@ if test "${enable_msgdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_msgdlg"
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_msgdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MSGDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_MSGDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_MSGDLG
           fi
 
             fi
           else
             result=$wxUSE_MSGDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14090,11 +14484,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-numberdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-numberdlg... " >&6; }
           # Check whether --enable-numberdlg was given.
           # Check whether --enable-numberdlg was given.
-if test "${enable_numberdlg+set}" = set; then
+if test "${enable_numberdlg+set}" = set; then :
   enableval=$enable_numberdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
   enableval=$enable_numberdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
@@ -14104,35 +14497,25 @@ if test "${enable_numberdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_numberdlg"
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_numberdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NUMBERDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_NUMBERDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_NUMBERDLG
           fi
 
             fi
           else
             result=$wxUSE_NUMBERDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14145,11 +14528,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-splash" >&5
+$as_echo_n "checking for --${enablestring:-enable}-splash... " >&6; }
           # Check whether --enable-splash was given.
           # Check whether --enable-splash was given.
-if test "${enable_splash+set}" = set; then
+if test "${enable_splash+set}" = set; then :
   enableval=$enable_splash;
                           if test "$enableval" = yes; then
                             wx_cv_use_splash='wxUSE_SPLASH=yes'
   enableval=$enable_splash;
                           if test "$enableval" = yes; then
                             wx_cv_use_splash='wxUSE_SPLASH=yes'
@@ -14159,35 +14541,25 @@ if test "${enable_splash+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splash"
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splash"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_splash >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPLASH = yes; then
-              result=no
-            else
+            if test $wxUSE_SPLASH = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SPLASH
           fi
 
             fi
           else
             result=$wxUSE_SPLASH
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14200,11 +14572,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-textdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-textdlg... " >&6; }
           # Check whether --enable-textdlg was given.
           # Check whether --enable-textdlg was given.
-if test "${enable_textdlg+set}" = set; then
+if test "${enable_textdlg+set}" = set; then :
   enableval=$enable_textdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=yes'
   enableval=$enable_textdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=yes'
@@ -14214,35 +14585,25 @@ if test "${enable_textdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textdlg"
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TEXTDLG
           fi
 
             fi
           else
             result=$wxUSE_TEXTDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14255,11 +14616,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-tipdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-tipdlg... " >&6; }
           # Check whether --enable-tipdlg was given.
           # Check whether --enable-tipdlg was given.
-if test "${enable_tipdlg+set}" = set; then
+if test "${enable_tipdlg+set}" = set; then :
   enableval=$enable_tipdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
   enableval=$enable_tipdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
@@ -14269,35 +14629,25 @@ if test "${enable_tipdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tipdlg"
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tipdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STARTUP_TIPS = yes; then
-              result=no
-            else
+            if test $wxUSE_STARTUP_TIPS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_STARTUP_TIPS
           fi
 
             fi
           else
             result=$wxUSE_STARTUP_TIPS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14310,11 +14660,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-progressdlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-progressdlg... " >&6; }
           # Check whether --enable-progressdlg was given.
           # Check whether --enable-progressdlg was given.
-if test "${enable_progressdlg+set}" = set; then
+if test "${enable_progressdlg+set}" = set; then :
   enableval=$enable_progressdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
   enableval=$enable_progressdlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
@@ -14324,35 +14673,25 @@ if test "${enable_progressdlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_progressdlg"
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_progressdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROGRESSDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_PROGRESSDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PROGRESSDLG
           fi
 
             fi
           else
             result=$wxUSE_PROGRESSDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14365,11 +14704,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-wizarddlg" >&5
+$as_echo_n "checking for --${enablestring:-enable}-wizarddlg... " >&6; }
           # Check whether --enable-wizarddlg was given.
           # Check whether --enable-wizarddlg was given.
-if test "${enable_wizarddlg+set}" = set; then
+if test "${enable_wizarddlg+set}" = set; then :
   enableval=$enable_wizarddlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
   enableval=$enable_wizarddlg;
                           if test "$enableval" = yes; then
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
@@ -14379,35 +14717,25 @@ if test "${enable_wizarddlg+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_wizarddlg"
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_wizarddlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_WIZARDDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_WIZARDDLG = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_WIZARDDLG
           fi
 
             fi
           else
             result=$wxUSE_WIZARDDLG
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
 
@@ -14422,11 +14750,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-menus" >&5
+$as_echo_n "checking for --${enablestring:-enable}-menus... " >&6; }
           # Check whether --enable-menus was given.
           # Check whether --enable-menus was given.
-if test "${enable_menus+set}" = set; then
+if test "${enable_menus+set}" = set; then :
   enableval=$enable_menus;
                           if test "$enableval" = yes; then
                             wx_cv_use_menus='wxUSE_MENUS=yes'
   enableval=$enable_menus;
                           if test "$enableval" = yes; then
                             wx_cv_use_menus='wxUSE_MENUS=yes'
@@ -14436,35 +14763,25 @@ if test "${enable_menus+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_menus"
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_menus"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_menus >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MENUS = yes; then
-              result=no
-            else
+            if test $wxUSE_MENUS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_MENUS
           fi
 
             fi
           else
             result=$wxUSE_MENUS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14477,11 +14794,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-miniframe" >&5
+$as_echo_n "checking for --${enablestring:-enable}-miniframe... " >&6; }
           # Check whether --enable-miniframe was given.
           # Check whether --enable-miniframe was given.
-if test "${enable_miniframe+set}" = set; then
+if test "${enable_miniframe+set}" = set; then :
   enableval=$enable_miniframe;
                           if test "$enableval" = yes; then
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=yes'
   enableval=$enable_miniframe;
                           if test "$enableval" = yes; then
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=yes'
@@ -14491,35 +14807,25 @@ if test "${enable_miniframe+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_miniframe"
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_miniframe"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MINIFRAME = yes; then
-              result=no
-            else
+            if test $wxUSE_MINIFRAME = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_MINIFRAME
           fi
 
             fi
           else
             result=$wxUSE_MINIFRAME
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14532,11 +14838,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-tooltips" >&5
+$as_echo_n "checking for --${enablestring:-enable}-tooltips... " >&6; }
           # Check whether --enable-tooltips was given.
           # Check whether --enable-tooltips was given.
-if test "${enable_tooltips+set}" = set; then
+if test "${enable_tooltips+set}" = set; then :
   enableval=$enable_tooltips;
                           if test "$enableval" = yes; then
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
   enableval=$enable_tooltips;
                           if test "$enableval" = yes; then
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
@@ -14546,35 +14851,25 @@ if test "${enable_tooltips+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tooltips"
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tooltips"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLTIPS = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLTIPS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TOOLTIPS
           fi
 
             fi
           else
             result=$wxUSE_TOOLTIPS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14587,11 +14882,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-splines" >&5
+$as_echo_n "checking for --${enablestring:-enable}-splines... " >&6; }
           # Check whether --enable-splines was given.
           # Check whether --enable-splines was given.
-if test "${enable_splines+set}" = set; then
+if test "${enable_splines+set}" = set; then :
   enableval=$enable_splines;
                           if test "$enableval" = yes; then
                             wx_cv_use_splines='wxUSE_SPLINES=yes'
   enableval=$enable_splines;
                           if test "$enableval" = yes; then
                             wx_cv_use_splines='wxUSE_SPLINES=yes'
@@ -14601,35 +14895,25 @@ if test "${enable_splines+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splines"
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splines"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_splines >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPLINES = yes; then
-              result=no
-            else
+            if test $wxUSE_SPLINES = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_SPLINES
           fi
 
             fi
           else
             result=$wxUSE_SPLINES
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14642,11 +14926,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mousewheel" >&5
+$as_echo_n "checking for --${enablestring:-enable}-mousewheel... " >&6; }
           # Check whether --enable-mousewheel was given.
           # Check whether --enable-mousewheel was given.
-if test "${enable_mousewheel+set}" = set; then
+if test "${enable_mousewheel+set}" = set; then :
   enableval=$enable_mousewheel;
                           if test "$enableval" = yes; then
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
   enableval=$enable_mousewheel;
                           if test "$enableval" = yes; then
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
@@ -14656,35 +14939,25 @@ if test "${enable_mousewheel+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mousewheel"
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mousewheel"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MOUSEWHEEL = yes; then
-              result=no
-            else
+            if test $wxUSE_MOUSEWHEEL = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_MOUSEWHEEL
           fi
 
             fi
           else
             result=$wxUSE_MOUSEWHEEL
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14697,11 +14970,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-validators" >&5
+$as_echo_n "checking for --${enablestring:-enable}-validators... " >&6; }
           # Check whether --enable-validators was given.
           # Check whether --enable-validators was given.
-if test "${enable_validators+set}" = set; then
+if test "${enable_validators+set}" = set; then :
   enableval=$enable_validators;
                           if test "$enableval" = yes; then
                             wx_cv_use_validators='wxUSE_VALIDATORS=yes'
   enableval=$enable_validators;
                           if test "$enableval" = yes; then
                             wx_cv_use_validators='wxUSE_VALIDATORS=yes'
@@ -14711,35 +14983,25 @@ if test "${enable_validators+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_validators"
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_validators"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_validators >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VALIDATORS = yes; then
-              result=no
-            else
+            if test $wxUSE_VALIDATORS = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_VALIDATORS
           fi
 
             fi
           else
             result=$wxUSE_VALIDATORS
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14752,11 +15014,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-busyinfo" >&5
+$as_echo_n "checking for --${enablestring:-enable}-busyinfo... " >&6; }
           # Check whether --enable-busyinfo was given.
           # Check whether --enable-busyinfo was given.
-if test "${enable_busyinfo+set}" = set; then
+if test "${enable_busyinfo+set}" = set; then :
   enableval=$enable_busyinfo;
                           if test "$enableval" = yes; then
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
   enableval=$enable_busyinfo;
                           if test "$enableval" = yes; then
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
@@ -14766,35 +15027,25 @@ if test "${enable_busyinfo+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_busyinfo"
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_busyinfo"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BUSYINFO = yes; then
-              result=no
-            else
+            if test $wxUSE_BUSYINFO = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_BUSYINFO
           fi
 
             fi
           else
             result=$wxUSE_BUSYINFO
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14807,11 +15058,54 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-hotkey" >&5
+$as_echo_n "checking for --${enablestring:-enable}-hotkey... " >&6; }
+          # Check whether --enable-hotkey was given.
+if test "${enable_hotkey+set}" = set; then :
+  enableval=$enable_hotkey;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_hotkey='wxUSE_HOTKEY=yes'
+                          else
+                            wx_cv_use_hotkey='wxUSE_HOTKEY=no'
+                          fi
+
+else
+
+                          wx_cv_use_hotkey='wxUSE_HOTKEY=${'DEFAULT_wxUSE_HOTKEY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_hotkey"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_HOTKEY = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_HOTKEY
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-joystick" >&5
+$as_echo_n "checking for --${enablestring:-enable}-joystick... " >&6; }
           # Check whether --enable-joystick was given.
           # Check whether --enable-joystick was given.
-if test "${enable_joystick+set}" = set; then
+if test "${enable_joystick+set}" = set; then :
   enableval=$enable_joystick;
                           if test "$enableval" = yes; then
                             wx_cv_use_joystick='wxUSE_JOYSTICK=yes'
   enableval=$enable_joystick;
                           if test "$enableval" = yes; then
                             wx_cv_use_joystick='wxUSE_JOYSTICK=yes'
@@ -14821,35 +15115,25 @@ if test "${enable_joystick+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_joystick"
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_joystick"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_joystick >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_JOYSTICK = yes; then
-              result=no
-            else
+            if test $wxUSE_JOYSTICK = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_JOYSTICK
           fi
 
             fi
           else
             result=$wxUSE_JOYSTICK
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14862,11 +15146,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-metafile" >&5
+$as_echo_n "checking for --${enablestring:-enable}-metafile... " >&6; }
           # Check whether --enable-metafile was given.
           # Check whether --enable-metafile was given.
-if test "${enable_metafile+set}" = set; then
+if test "${enable_metafile+set}" = set; then :
   enableval=$enable_metafile;
                           if test "$enableval" = yes; then
                             wx_cv_use_metafile='wxUSE_METAFILE=yes'
   enableval=$enable_metafile;
                           if test "$enableval" = yes; then
                             wx_cv_use_metafile='wxUSE_METAFILE=yes'
@@ -14876,35 +15159,25 @@ if test "${enable_metafile+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_metafile"
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_metafile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_METAFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_METAFILE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_METAFILE
           fi
 
             fi
           else
             result=$wxUSE_METAFILE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14917,11 +15190,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dragimage" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dragimage... " >&6; }
           # Check whether --enable-dragimage was given.
           # Check whether --enable-dragimage was given.
-if test "${enable_dragimage+set}" = set; then
+if test "${enable_dragimage+set}" = set; then :
   enableval=$enable_dragimage;
                           if test "$enableval" = yes; then
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
   enableval=$enable_dragimage;
                           if test "$enableval" = yes; then
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
@@ -14931,35 +15203,25 @@ if test "${enable_dragimage+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dragimage"
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dragimage"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DRAGIMAGE = yes; then
-              result=no
-            else
+            if test $wxUSE_DRAGIMAGE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_DRAGIMAGE
           fi
 
             fi
           else
             result=$wxUSE_DRAGIMAGE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -14972,11 +15234,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-accessibility" >&5
+$as_echo_n "checking for --${enablestring:-enable}-accessibility... " >&6; }
           # Check whether --enable-accessibility was given.
           # Check whether --enable-accessibility was given.
-if test "${enable_accessibility+set}" = set; then
+if test "${enable_accessibility+set}" = set; then :
   enableval=$enable_accessibility;
                           if test "$enableval" = yes; then
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
   enableval=$enable_accessibility;
                           if test "$enableval" = yes; then
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
@@ -14986,39 +15247,27 @@ if test "${enable_accessibility+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accessibility"
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accessibility"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ACCESSIBILITY = yes; then
-              result=no
-            else
+            if test $wxUSE_ACCESSIBILITY = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_ACCESSIBILITY
           fi
 
             fi
           else
             result=$wxUSE_ACCESSIBILITY
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
-if test "$wxUSE_MSW" = "1"; then
-
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -15029,53 +15278,129 @@ if test "$wxUSE_MSW" = "1"; then
               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; }
-          no_cache=0
-          # Check whether --enable-dccache was given.
-if test "${enable_dccache+set}" = set; then
-  enableval=$enable_dccache;
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-uiactionsim" >&5
+$as_echo_n "checking for --${enablestring:-enable}-uiactionsim... " >&6; }
+          # Check whether --enable-uiactionsim was given.
+if test "${enable_uiactionsim+set}" = set; then :
+  enableval=$enable_uiactionsim;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
+                            wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes'
                           else
                           else
-                            wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
+                            wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no'
                           fi
 
 else
 
                           fi
 
 else
 
-                          LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                          wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_uiactionsim"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UIACTIONSIMULATOR = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_UIACTIONSIMULATOR
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dctransform" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dctransform... " >&6; }
+          # Check whether --enable-dctransform was given.
+if test "${enable_dctransform+set}" = set; then :
+  enableval=$enable_dctransform;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=yes'
                           else
                           else
-                            no_cache=1
+                            wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=no'
                           fi
 
                           fi
 
-                          wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
+else
+
+                          wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=${'DEFAULT_wxUSE_DC_TRANSFORM_MATRIX":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_dccache"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_dctransform"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DC_CACHEING = yes; then
-              result=no
-            else
+            if test $wxUSE_DC_TRANSFORM_MATRIX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_DC_CACHEING
+            result=$wxUSE_DC_TRANSFORM_MATRIX
           fi
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-webviewwebkit" >&5
+$as_echo_n "checking for --${enablestring:-enable}-webviewwebkit... " >&6; }
+          # Check whether --enable-webviewwebkit was given.
+if test "${enable_webviewwebkit+set}" = set; then :
+  enableval=$enable_webviewwebkit;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=yes'
+                          else
+                            wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=no'
+                          fi
+
+else
+
+                          wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=${'DEFAULT_wxUSE_WEBVIEW_WEBKIT":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
+          eval "$wx_cv_use_webviewwebkit"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_WEBVIEW_WEBKIT = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_WEBVIEW_WEBKIT
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+
 
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
 
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
@@ -15087,11 +15412,10 @@ fi
               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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-palette" >&5
+$as_echo_n "checking for --${enablestring:-enable}-palette... " >&6; }
           # Check whether --enable-palette was given.
           # Check whether --enable-palette was given.
-if test "${enable_palette+set}" = set; then
+if test "${enable_palette+set}" = set; then :
   enableval=$enable_palette;
                           if test "$enableval" = yes; then
                             wx_cv_use_palette='wxUSE_PALETTE=yes'
   enableval=$enable_palette;
                           if test "$enableval" = yes; then
                             wx_cv_use_palette='wxUSE_PALETTE=yes'
@@ -15101,35 +15425,25 @@ if test "${enable_palette+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_palette"
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_palette"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_palette >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PALETTE = yes; then
-              result=no
-            else
+            if test $wxUSE_PALETTE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PALETTE
           fi
 
             fi
           else
             result=$wxUSE_PALETTE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15142,11 +15456,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-image" >&5
+$as_echo_n "checking for --${enablestring:-enable}-image... " >&6; }
           # Check whether --enable-image was given.
           # Check whether --enable-image was given.
-if test "${enable_image+set}" = set; then
+if test "${enable_image+set}" = set; then :
   enableval=$enable_image;
                           if test "$enableval" = yes; then
                             wx_cv_use_image='wxUSE_IMAGE=yes'
   enableval=$enable_image;
                           if test "$enableval" = yes; then
                             wx_cv_use_image='wxUSE_IMAGE=yes'
@@ -15156,35 +15469,25 @@ if test "${enable_image+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_image"
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_image"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_image >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IMAGE = yes; then
-              result=no
-            else
+            if test $wxUSE_IMAGE = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_IMAGE
           fi
 
             fi
           else
             result=$wxUSE_IMAGE
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15197,11 +15500,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-gif" >&5
+$as_echo_n "checking for --${enablestring:-enable}-gif... " >&6; }
           # Check whether --enable-gif was given.
           # Check whether --enable-gif was given.
-if test "${enable_gif+set}" = set; then
+if test "${enable_gif+set}" = set; then :
   enableval=$enable_gif;
                           if test "$enableval" = yes; then
                             wx_cv_use_gif='wxUSE_GIF=yes'
   enableval=$enable_gif;
                           if test "$enableval" = yes; then
                             wx_cv_use_gif='wxUSE_GIF=yes'
@@ -15211,35 +15513,25 @@ if test "${enable_gif+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gif"
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gif"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gif >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GIF = yes; then
-              result=no
-            else
+            if test $wxUSE_GIF = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_GIF
           fi
 
             fi
           else
             result=$wxUSE_GIF
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15252,11 +15544,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-pcx" >&5
+$as_echo_n "checking for --${enablestring:-enable}-pcx... " >&6; }
           # Check whether --enable-pcx was given.
           # Check whether --enable-pcx was given.
-if test "${enable_pcx+set}" = set; then
+if test "${enable_pcx+set}" = set; then :
   enableval=$enable_pcx;
                           if test "$enableval" = yes; then
                             wx_cv_use_pcx='wxUSE_PCX=yes'
   enableval=$enable_pcx;
                           if test "$enableval" = yes; then
                             wx_cv_use_pcx='wxUSE_PCX=yes'
@@ -15266,35 +15557,25 @@ if test "${enable_pcx+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pcx"
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pcx"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_pcx >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PCX = yes; then
-              result=no
-            else
+            if test $wxUSE_PCX = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PCX
           fi
 
             fi
           else
             result=$wxUSE_PCX
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15307,11 +15588,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-tga" >&5
+$as_echo_n "checking for --${enablestring:-enable}-tga... " >&6; }
           # Check whether --enable-tga was given.
           # Check whether --enable-tga was given.
-if test "${enable_tga+set}" = set; then
+if test "${enable_tga+set}" = set; then :
   enableval=$enable_tga;
                           if test "$enableval" = yes; then
                             wx_cv_use_tga='wxUSE_TGA=yes'
   enableval=$enable_tga;
                           if test "$enableval" = yes; then
                             wx_cv_use_tga='wxUSE_TGA=yes'
@@ -15321,35 +15601,25 @@ if test "${enable_tga+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tga"
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tga"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tga >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TGA = yes; then
-              result=no
-            else
+            if test $wxUSE_TGA = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_TGA
           fi
 
             fi
           else
             result=$wxUSE_TGA
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15362,11 +15632,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-iff" >&5
+$as_echo_n "checking for --${enablestring:-enable}-iff... " >&6; }
           # Check whether --enable-iff was given.
           # Check whether --enable-iff was given.
-if test "${enable_iff+set}" = set; then
+if test "${enable_iff+set}" = set; then :
   enableval=$enable_iff;
                           if test "$enableval" = yes; then
                             wx_cv_use_iff='wxUSE_IFF=yes'
   enableval=$enable_iff;
                           if test "$enableval" = yes; then
                             wx_cv_use_iff='wxUSE_IFF=yes'
@@ -15376,35 +15645,25 @@ if test "${enable_iff+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_iff"
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_iff"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_iff >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IFF = yes; then
-              result=no
-            else
+            if test $wxUSE_IFF = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_IFF
           fi
 
             fi
           else
             result=$wxUSE_IFF
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15417,11 +15676,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-pnm" >&5
+$as_echo_n "checking for --${enablestring:-enable}-pnm... " >&6; }
           # Check whether --enable-pnm was given.
           # Check whether --enable-pnm was given.
-if test "${enable_pnm+set}" = set; then
+if test "${enable_pnm+set}" = set; then :
   enableval=$enable_pnm;
                           if test "$enableval" = yes; then
                             wx_cv_use_pnm='wxUSE_PNM=yes'
   enableval=$enable_pnm;
                           if test "$enableval" = yes; then
                             wx_cv_use_pnm='wxUSE_PNM=yes'
@@ -15431,35 +15689,25 @@ if test "${enable_pnm+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pnm"
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pnm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_pnm >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PNM = yes; then
-              result=no
-            else
+            if test $wxUSE_PNM = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_PNM
           fi
 
             fi
           else
             result=$wxUSE_PNM
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15472,11 +15720,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-xpm" >&5
+$as_echo_n "checking for --${enablestring:-enable}-xpm... " >&6; }
           # Check whether --enable-xpm was given.
           # Check whether --enable-xpm was given.
-if test "${enable_xpm+set}" = set; then
+if test "${enable_xpm+set}" = set; then :
   enableval=$enable_xpm;
                           if test "$enableval" = yes; then
                             wx_cv_use_xpm='wxUSE_XPM=yes'
   enableval=$enable_xpm;
                           if test "$enableval" = yes; then
                             wx_cv_use_xpm='wxUSE_XPM=yes'
@@ -15486,35 +15733,25 @@ if test "${enable_xpm+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xpm"
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xpm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_xpm >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_XPM = yes; then
-              result=no
-            else
+            if test $wxUSE_XPM = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             result=$wxUSE_XPM
           fi
 
             fi
           else
             result=$wxUSE_XPM
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
           enablestring=
 
 
           enablestring=
@@ -15527,11 +15764,10 @@ 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; }
-          no_cache=0
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ico_cur" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ico_cur... " >&6; }
           # Check whether --enable-ico_cur was given.
           # Check whether --enable-ico_cur was given.
-if test "${enable_ico_cur+set}" = set; then
+if test "${enable_ico_cur+set}" = set; then :
   enableval=$enable_ico_cur;
                           if test "$enableval" = yes; then
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
   enableval=$enable_ico_cur;
                           if test "$enableval" = yes; then
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
@@ -15541,155 +15777,342 @@ if test "${enable_ico_cur+set}" = set; then
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ico_cur"
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ico_cur"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ICO_CUR = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_ICO_CUR
           fi
 
           fi
 
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-dccache" >&5
+$as_echo_n "checking for --${enablestring:-enable}-dccache... " >&6; }
+          # Check whether --enable-dccache was given.
+if test "${enable_dccache+set}" = set; then :
+  enableval=$enable_dccache;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
+                          else
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
+                          fi
+
+else
+
+                          wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_dccache"
+
           if test x"$enablestring" = xdisable; then
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ICO_CUR = yes; then
+            if test $wxUSE_DC_CACHEING = no; then
+              result=yes
+            else
               result=no
               result=no
+            fi
+          else
+            result=$wxUSE_DC_CACHEING
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ps-in-msw" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ps-in-msw... " >&6; }
+          # Check whether --enable-ps-in-msw was given.
+if test "${enable_ps_in_msw+set}" = set; then :
+  enableval=$enable_ps_in_msw;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes'
+                          else
+                            wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no'
+                          fi
+
+else
+
+                          wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ps_in_msw"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = no; then
+              result=yes
             else
             else
+              result=no
+            fi
+          else
+            result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-ownerdrawn" >&5
+$as_echo_n "checking for --${enablestring:-enable}-ownerdrawn... " >&6; }
+          # Check whether --enable-ownerdrawn was given.
+if test "${enable_ownerdrawn+set}" = set; then :
+  enableval=$enable_ownerdrawn;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes'
+                          else
+                            wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no'
+                          fi
+
+else
+
+                          wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ownerdrawn"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OWNER_DRAWN = no; then
               result=yes
               result=yes
+            else
+              result=no
             fi
           else
             fi
           else
-            result=$wxUSE_ICO_CUR
+            result=$wxUSE_OWNER_DRAWN
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$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
 
           fi
 
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-uxtheme" >&5
+$as_echo_n "checking for --${enablestring:-enable}-uxtheme... " >&6; }
+          # Check whether --enable-uxtheme was given.
+if test "${enable_uxtheme+set}" = set; then :
+  enableval=$enable_uxtheme;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_uxtheme='wxUSE_UXTHEME=yes'
+                          else
+                            wx_cv_use_uxtheme='wxUSE_UXTHEME=no'
+                          fi
 
 
+else
+
+                          wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          echo "saving argument cache $wx_arg_cache_file"
-          mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
+          eval "$wx_cv_use_uxtheme"
 
 
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UXTHEME = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_UXTHEME
+          fi
 
 
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&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
-    DEFAULT_DEFAULT_wxUSE_GTK=0
-    DEFAULT_DEFAULT_wxUSE_MOTIF=0
-    DEFAULT_DEFAULT_wxUSE_MSW=1
-    wxUSE_SHARED=no
-    CC=${CC:-winegcc}
-    CXX=${CXX:-wineg++}
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-wxdib" >&5
+$as_echo_n "checking for --${enablestring:-enable}-wxdib... " >&6; }
+          # Check whether --enable-wxdib was given.
+if test "${enable_wxdib+set}" = set; then :
+  enableval=$enable_wxdib;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_wxdib='wxUSE_DIB=yes'
+                          else
+                            wx_cv_use_wxdib='wxUSE_DIB=no'
+                          fi
+
+else
+
+                          wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
+
 fi
 
 
 fi
 
 
-if test "$wxUSE_GUI" = "yes"; then
+          eval "$wx_cv_use_wxdib"
 
 
-    if test "$USE_BEOS" = 1; then
-        { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5
-echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DIB = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_DIB
+          fi
 
 
-    if test "$TOOLKIT_GIVEN" = 1; then
-            for toolkit in `echo $ALL_TOOLKITS`; do
-        var=wxUSE_$toolkit
-        eval "value=\$${var}"
-        if test "x$value" = "xno"; then
-          eval "$var=0"
-        elif test "x$value" != "x"; then
-          eval "$var=1"
-        fi
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
-        if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
-          eval "wx${toolkit}_VERSION=$value"
-        fi
-      done
-    else
-            for toolkit in `echo $ALL_TOOLKITS`; do
-        if test "$has_toolkit_in_cache" != 1; then
-          var=DEFAULT_DEFAULT_wxUSE_$toolkit
-        else
-          var=DEFAULT_wxUSE_$toolkit
 
 
-          eval "version=\$DEFAULT_wx${toolkit}_VERSION"
-          if test "x$version" != "x"; then
-            eval "wx${toolkit}_VERSION=$version"
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
           fi
           fi
-        fi
-        eval "wxUSE_$toolkit=\$${var}"
-      done
-    fi
 
 
-            NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
-                  + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
-                  + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-webviewie" >&5
+$as_echo_n "checking for --${enablestring:-enable}-webviewie... " >&6; }
+          # Check whether --enable-webviewie was given.
+if test "${enable_webviewie+set}" = set; then :
+  enableval=$enable_webviewie;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=yes'
+                          else
+                            wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=no'
+                          fi
 
 
-        case "${host}" in
-      *-pc-os2_emx | *-pc-os2-emx )
-        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
-    esac
+else
 
 
-    case "$NUM_TOOLKITS" in
-      1)
-      ;;
-      0)
-        { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5
-echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-      *)
-        { { echo "$as_me:$LINENO: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&5
-echo "$as_me: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&2;}
-   { (exit 1); exit 1; }; }
-    esac
+                          wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=${'DEFAULT_wxUSE_WEBVIEW_IE":-$defaultval}"
+
+fi
 
 
-    # to be removed when --disable-gtk2 isn't needed
-    if test "x$wxUSE_GTK2" = "xyes"; then
-        wxGTK_VERSION=2
-    elif test "x$wxUSE_GTK2" = "xno"; then
-        wxGTK_VERSION=1
-    fi
 
 
-        for toolkit in `echo $ALL_TOOLKITS`; do
-      var=wxUSE_$toolkit
-      eval "value=\$${var}"
-      if test "x$value" != x; then
-        cache_var=CACHE_$toolkit
-        eval "cache=\$${cache_var}"
-        if test "$cache" = 1; then
-          echo "$var=$value" >> ${wx_arg_cache_file}
-          eval "version=\$wx${toolkit}_VERSION"
-          if test "x$version" != "x"; then
-            echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
+          eval "$wx_cv_use_webviewie"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_WEBVIEW_IE = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_WEBVIEW_IE
           fi
           fi
-        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; }
-        fi
-      fi
-    done
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
+if test "$wxUSE_MSW" != 1; then
+    DEFAULT_wxUSE_AUTOID_MANAGEMENT=no
+fi
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-autoidman" >&5
+$as_echo_n "checking for --${enablestring:-enable}-autoidman... " >&6; }
+          # Check whether --enable-autoidman was given.
+if test "${enable_autoidman+set}" = set; then :
+  enableval=$enable_autoidman;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=yes'
+                          else
+                            wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=no'
+                          fi
+
 else
 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; }
-    else
-        { echo "$as_me:$LINENO: result: base only" >&5
-echo "${ECHO_T}base only" >&6; }
-    fi
+
+                          wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_autoidman"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_AUTOID_MANAGEMENT = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_AUTOID_MANAGEMENT
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
 fi
 
 
 fi
 
 
@@ -15720,12 +16143,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
     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;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
       esac ;;
     esac
   done
@@ -15733,8 +16157,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `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"
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -15757,21 +16181,18 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
 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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     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;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
 CFLAGS=${CFLAGS:=}
   fi
 fi
 rm -f confcache
 
 CFLAGS=${CFLAGS:=}
-
-
-
-    ac_ext=c
+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_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'
@@ -15779,10 +16200,10 @@ 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; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -15792,25 +16213,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_CC="${ac_tool_prefix}gcc"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -15819,10 +16240,10 @@ 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
   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; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&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
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -15832,25 +16253,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_CC="gcc"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -15858,12 +16279,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -15876,10 +16293,10 @@ 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.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
           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
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -15889,25 +16306,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_CC="${ac_tool_prefix}cc"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -15916,10 +16333,10 @@ 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
 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; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -15930,18 +16347,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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 test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -15960,11 +16377,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -15975,10 +16392,10 @@ if test -z "$CC"; then
   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; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -15988,25 +16405,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_CC="$ac_tool_prefix$ac_prog"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -16019,10 +16436,10 @@ if test -z "$CC"; then
 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; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&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
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -16032,25 +16449,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_CC="$ac_prog"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -16062,12 +16479,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -16077,51 +16490,37 @@ fi
 fi
 
 
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 case "(($ac_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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16133,42 +16532,38 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM 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; }
-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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 case "(($ac_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_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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,
   # 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,
@@ -16178,14 +16573,14 @@ for ac_file in $ac_files ''
 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 | *.map | *.inf | *.dSYM | *.o | *.obj )
        ;;
     [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;
+       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
        then :; else
           ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
        fi
        then :; else
           ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
        fi
@@ -16204,78 +16599,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
 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
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# 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; }
-# 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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-       cross_compiling=yes
-    else
-       { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# 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"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 case "(($ac_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_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -16283,37 +16641,90 @@ 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 | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
          break;;
     * ) break;;
   esac
 done
 else
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
          break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$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; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+       cross_compiling=yes
+    else
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5 ; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16325,51 +16736,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 case "(($ac_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_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$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; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16383,54 +16789,34 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
   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
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 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; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16441,34 +16827,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
   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
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16479,35 +16842,12 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-       ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
         CFLAGS="-g"
         CFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16518,42 +16858,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
   ac_cv_prog_cc_g=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
 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
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$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
@@ -16569,18 +16885,14 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -16637,31 +16949,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
        -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
        -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
   ac_cv_prog_cc_c89=$ac_arg
-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
 done
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -16672,17 +16962,19 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
 # 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; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
   *)
     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; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -16693,22 +16985,22 @@ 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
 
     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: 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
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C compiler" >&5
+$as_echo_n "checking whether we are using the Intel C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16723,38 +17015,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___INTEL_COMPILER=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
+$as_echo "$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
@@ -16769,18 +17041,123 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+        if test "$INTELCC" = "yes"; then
+
+
+    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
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v8 or later" >&5
+$as_echo_n "checking whether we are using Intel C compiler v8 or later... " >&6; }
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=yes
+else
+  bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&5
+$as_echo "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&6; }
+    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" = "xyes"; then
+        :; INTELCC8=yes
+    else
+        :;
+    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_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
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v10 or later" >&5
+$as_echo_n "checking whether we are using Intel C compiler v10 or later... " >&6; }
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=yes
+else
+  bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&5
+$as_echo "$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&6; }
+    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then
+        :; INTELCC10=yes
+    else
+        :;
+    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
+
+
+
+    fi
+
         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; }
-if test "${bakefile_cv_c_exto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler requires -ext o" >&5
+$as_echo_n "checking if the C compiler requires -ext o... " >&6; }
+if test "${bakefile_cv_c_exto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16792,11 +17169,11 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest.$ac_ext.o
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest.$ac_ext.o
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in `(ls conftest.* 2>/dev/null)`; do
     case $ac_file in
         conftest.$ac_ext.o)
   for ac_file in `(ls conftest.* 2>/dev/null)`; do
     case $ac_file in
         conftest.$ac_ext.o)
@@ -16807,19 +17184,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     esac
 done
 else
     esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot figure out if compiler needs -ext o: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot figure out if compiler needs -ext o: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot figure out if compiler needs -ext o: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 fi
 
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_exto" >&5
+$as_echo "$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"
@@ -16833,20 +17208,16 @@ 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; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16857,34 +17228,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
   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
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16895,35 +17243,12 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-       ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
         CFLAGS="-g"
         CFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -16934,42 +17259,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
   ac_cv_prog_cc_g=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
 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
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$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
@@ -16998,16 +17299,12 @@ 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; }
-if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5
+$as_echo_n "checking whether we are using the IBM xlC C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17022,38 +17319,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___xlC__=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5
+$as_echo "$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
@@ -17078,16 +17355,12 @@ 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; }
-if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Metrowerks C compiler" >&5
+$as_echo_n "checking whether we are using the Metrowerks C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17102,38 +17375,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___MWERKS__=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___MWERKS__" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___MWERKS__" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___MWERKS__" >&5
+$as_echo "$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
@@ -17147,6 +17400,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+                if test "$MWCC" != "yes"; then
 
 
     ac_ext=c
 
 
     ac_ext=c
@@ -17155,16 +17409,12 @@ 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; }
-if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5
+$as_echo_n "checking whether we are using the IBM xlC C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17179,38 +17429,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___xlC__=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___xlC__" >&5
+$as_echo "$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
@@ -17224,6 +17454,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+                fi
                 ;;
 
             IRIX*)
                 ;;
 
             IRIX*)
@@ -17235,16 +17466,12 @@ 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; }
-if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C compiler" >&5
+$as_echo_n "checking whether we are using the SGI C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17259,38 +17486,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
+$as_echo "$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
@@ -17307,6 +17514,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                 ;;
 
             Linux*)
                 ;;
 
             Linux*)
+                                                if test "$INTELCC" != "yes"; then
 
 
     ac_ext=c
 
 
     ac_ext=c
@@ -17315,16 +17523,12 @@ 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; }
-if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5
+$as_echo_n "checking whether we are using the Sun C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17339,38 +17543,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___SUNPRO_C=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
+$as_echo "$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
@@ -17384,6 +17568,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+                fi
                 ;;
 
             HP-UX*)
                 ;;
 
             HP-UX*)
@@ -17395,16 +17580,12 @@ 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; }
-if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C compiler" >&5
+$as_echo_n "checking whether we are using the HP C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17419,38 +17600,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___HP_cc=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___HP_cc" >&5
+$as_echo "$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
@@ -17475,16 +17636,12 @@ 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; }
-if test "${bakefile_cv_c_compiler___DECC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C compiler" >&5
+$as_echo_n "checking whether we are using the Compaq C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___DECC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17499,38 +17656,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___DECC=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___DECC" >&5
+$as_echo "$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
@@ -17555,16 +17692,12 @@ 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; }
-if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5
+$as_echo_n "checking whether we are using the Sun C compiler... " >&6; }
+if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -17579,38 +17712,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   bakefile_cv_c_compiler___SUNPRO_C=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
+$as_echo "$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
@@ -17635,15 +17748,15 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -17657,11 +17770,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -17670,76 +17779,34 @@ 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
-  ac_status=$?
-  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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
 
+else
   # 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.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
-  ac_status=$?
-  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
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
   break
 fi
 
@@ -17751,8 +17818,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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$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
@@ -17762,11 +17829,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -17775,83 +17838,40 @@ 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
-  ac_status=$?
-  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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
 
+else
   # 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.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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
-  ac_status=$?
-  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
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
 fi
 
 ac_ext=c
@@ -17861,45 +17881,40 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
   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
+  # 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 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.
+    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
   # 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"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_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_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`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     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"
     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"
@@ -17911,77 +17926,61 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
+  done
   done
   done
-done
-
-done
 IFS=$as_save_IFS
 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
-
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
 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
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
   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
+  # 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 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.
+    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
   # 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"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_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_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`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     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"
     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"
@@ -17993,54 +17992,39 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
+  done
   done
   done
-done
-
-done
 IFS=$as_save_IFS
 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
-
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 if test $ac_cv_c_compiler_gnu = yes; then
  EGREP="$ac_cv_path_EGREP"
 
 
 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; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
+$as_echo_n "checking whether $CC needs -traditional... " >&6; }
+if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
     ac_pattern="Autoconf.*'x'"
 else
     ac_pattern="Autoconf.*'x'"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sgtty.h>
 Autoconf TIOCGETP
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 /* end confdefs.h.  */
 #include <sgtty.h>
 Autoconf TIOCGETP
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no
   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no
@@ -18049,25 +18033,21 @@ rm -f conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <termio.h>
 Autoconf TCGETA
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 /* end confdefs.h.  */
 #include <termio.h>
 Autoconf TCGETA
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -f conftest*
 
   fi
 fi
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -f conftest*
 
   fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
+$as_echo "$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
@@ -18075,10 +18055,7 @@ fi
 
 
 CXXFLAGS=${CXXFLAGS:=}
 
 
 CXXFLAGS=${CXXFLAGS:=}
-
-
-
-    ac_ext=cpp
+ac_ext=cpp
 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'
@@ -18092,10 +18069,10 @@ if test -z "$CXX"; then
   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; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -18105,25 +18082,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_CXX="$ac_tool_prefix$ac_prog"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -18136,10 +18113,10 @@ if test -z "$CXX"; then
 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; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -18149,25 +18126,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_CXX="$ac_prog"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -18179,12 +18156,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -18194,49 +18167,36 @@ fi
   fi
 fi
 # Provide some information about the compiler.
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 case "(($ac_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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
 
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18250,54 +18210,34 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
   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
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 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; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 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; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18308,34 +18248,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
   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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18346,35 +18263,12 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
 
-       ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
         CXXFLAGS="-g"
         CXXFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18385,42 +18279,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
   ac_cv_prog_cxx_g=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
 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
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$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 "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -18445,22 +18315,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+
+
+
+
     ac_ext=cpp
 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_ext=cpp
 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; }
-if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C++ compiler" >&5
+$as_echo_n "checking whether we are using the Intel C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18475,38 +18345,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___INTEL_COMPILER=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
+$as_echo "$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
@@ -18521,18 +18371,123 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+        if test "$INTELCXX" = "yes"; then
+
+
+    ac_ext=cpp
+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
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v8 or later" >&5
+$as_echo_n "checking whether we are using Intel C++ compiler v8 or later... " >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=yes
+else
+  bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&5
+$as_echo "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" = "xyes"; then
+        :; INTELCXX8=yes
+    else
+        :;
+    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_ext=cpp
+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
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v10 or later" >&5
+$as_echo_n "checking whether we are using Intel C++ compiler v10 or later... " >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=yes
+else
+  bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&5
+$as_echo "$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then
+        :; INTELCXX10=yes
+    else
+        :;
+    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
+
+
+
+    fi
+
         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; }
-if test "${bakefile_cv_c_exto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler requires -ext o" >&5
+$as_echo_n "checking if the C compiler requires -ext o... " >&6; }
+if test "${bakefile_cv_c_exto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18544,11 +18499,11 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest.$ac_ext.o
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest.$ac_ext.o
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in `(ls conftest.* 2>/dev/null)`; do
     case $ac_file in
         conftest.$ac_ext.o)
   for ac_file in `(ls conftest.* 2>/dev/null)`; do
     case $ac_file in
         conftest.$ac_ext.o)
@@ -18559,19 +18514,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     esac
 done
 else
     esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot figure out if compiler needs -ext o: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot figure out if compiler needs -ext o: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot figure out if compiler needs -ext o: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 fi
 
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_c_exto" >&5
+$as_echo "$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"
@@ -18585,20 +18538,16 @@ 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; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18609,34 +18558,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
   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
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18647,35 +18573,12 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-       ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
         CFLAGS="-g"
         CFLAGS="-g"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18686,42 +18589,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
   ac_cv_prog_cc_g=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
 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
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$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
@@ -18750,16 +18629,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5
+$as_echo_n "checking whether we are using the IBM xlC C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18774,38 +18649,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___xlC__=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5
+$as_echo "$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
@@ -18830,16 +18685,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Metrowerks C++ compiler" >&5
+$as_echo_n "checking whether we are using the Metrowerks C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18854,38 +18705,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___MWERKS__=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___MWERKS__" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5
+$as_echo "$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
@@ -18899,6 +18730,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+                if test "$MWCXX" != "yes"; then
 
 
     ac_ext=cpp
 
 
     ac_ext=cpp
@@ -18907,16 +18739,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5
+$as_echo_n "checking whether we are using the IBM xlC C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -18931,38 +18759,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___xlC__=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___xlC__" >&5
+$as_echo "$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
@@ -18976,6 +18784,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+                fi
                 ;;
 
             IRIX*)
                 ;;
 
             IRIX*)
@@ -18987,16 +18796,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C++ compiler" >&5
+$as_echo_n "checking whether we are using the SGI C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -19011,38 +18816,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
+$as_echo "$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
@@ -19059,6 +18844,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                 ;;
 
             Linux*)
                 ;;
 
             Linux*)
+                                                if test "$INTELCXX" != "yes"; then
 
 
     ac_ext=cpp
 
 
     ac_ext=cpp
@@ -19067,16 +18853,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5
+$as_echo_n "checking whether we are using the Sun C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -19091,38 +18873,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___SUNPRO_CC=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
+$as_echo "$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
@@ -19136,6 +18898,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
 
 
+                fi
                 ;;
 
             HP-UX*)
                 ;;
 
             HP-UX*)
@@ -19147,16 +18910,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C++ compiler" >&5
+$as_echo_n "checking whether we are using the HP C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -19171,38 +18930,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___HP_aCC=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
+$as_echo "$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
@@ -19227,16 +18966,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C++ compiler" >&5
+$as_echo_n "checking whether we are using the Compaq C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -19251,38 +18986,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___DECCXX=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
+$as_echo "$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
@@ -19307,16 +19022,12 @@ 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_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; }
-if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5
+$as_echo_n "checking whether we are using the Sun C++ compiler... " >&6; }
+if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -19331,38 +19042,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   bakefile_cv_cxx_compiler___SUNPRO_CC=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
+$as_echo "$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
@@ -19383,116 +19074,17 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 if test "$CXX" = "g++" -a "$GXX" != "yes"; then
 
 
 if test "$CXX" = "g++" -a "$GXX" != "yes"; then
-    { { echo "$as_me:$LINENO: error: C++ compiler is needed to build wxWidgets" >&5
-echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "C++ compiler is needed to build wxWidgets" "$LINENO" 5
 fi
 
 fi
 
-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; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # 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_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
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-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
-{ 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 -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_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
-
-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; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-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
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
 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 "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
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -19502,25 +19094,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_AR="${ac_tool_prefix}ar"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -19529,10 +19121,10 @@ 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
   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; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -19542,25 +19134,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_AR="ar"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -19568,12 +19160,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -19583,616 +19171,333 @@ else
 fi
 
     if test "x$AR" = "x" ; then
 fi
 
     if test "x$AR" = "x" ; then
-        { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
-echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error $? "ar is needed to build wxWidgets" "$LINENO" 5
     fi
 fi
 
     fi
 fi
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# 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; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # 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 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.
-           :
-         elif test $ac_prog = install &&
-           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :
-         else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
-         fi
-       fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
 
 
+if test "$wxUSE_MAC" = 1; then
+
+retest_macosx_linking=no
+
+OSX_ARCH_OPTS=""
+
+if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
+    if test "x$wxUSE_MAC_ARCH" != xno; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&5
+$as_echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-universal_binary is used." >&2;}
+    fi
+
+    if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
+        OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
+    else         OSX_ARCH_OPTS="ppc,i386"
+        if test "$wxUSE_OSX_COCOA" = 1; then
+            OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
+        fi
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for architectures to use in universal binary" >&5
+$as_echo_n "checking for architectures to use in universal binary... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSX_ARCH_OPTS" >&5
+$as_echo "$OSX_ARCH_OPTS" >&6; }
+
+                                                        retest_macosx_linking=yes
 
 
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5
+$as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
+    bk_use_pch=no
+else
+    if test "x$wxUSE_MAC_ARCH" != xno; then
+        OSX_ARCH_OPTS=$wxUSE_MAC_ARCH
+    fi
 fi
 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
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
+
+if test "x$OSX_ARCH_OPTS" != "x"; then
+    OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
+
+    CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
+    CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
+    OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
+    OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS"
+    LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
 fi
 fi
-{ 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.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+if test "x$wxUSE_MACOSX_SDK" = "xno"; then
+    wxUSE_MACOSX_SDK=
+elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
+    # TODO: Search for most recent SDK and use it.
+    wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
+fi
 
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+if test "x$wxUSE_MACOSX_SDK" != "x"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDK directory $wxUSE_MACOSX_SDK" >&5
+$as_echo_n "checking for SDK directory $wxUSE_MACOSX_SDK... " >&6; }
+    if ! test -d "$wxUSE_MACOSX_SDK"; then
+        { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "not found
+See \`config.log' for more details" "$LINENO" 5 ; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: exists" >&5
+$as_echo "exists" >&6; }
+    fi
+        MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
+    retest_macosx_linking=yes
+            fi
 
 
+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
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking SDK deployment version" >&5
+$as_echo_n "checking SDK deployment version... " >&6; }
 
 
-case ${INSTALL} in
-  /* ) # Absolute
-     ;;
-  ?:* ) # Drive letter, considered as absolute.
-     ;;
-  *)
-     INSTALL=`pwd`/${INSTALL} ;;
-esac
+        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
 
 
-case "${host}" in
+            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/'`
 
 
-                *-*-darwin* )
-        INSTALL_PROGRAM="cp -fp"
-        INSTALL_DATA="cp -fp"
-        ;;
-    *)
-        ;;
-esac
+        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
-{ 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
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then
+            wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+$as_echo "$wxUSE_MACOSX_VERSION_MIN" >&6; }
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine deployment target from SDKSettings.plist" >&5
+$as_echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;}
+            wxUSE_MACOSX_VERSION_MIN=
+        fi
+    else
+        wxUSE_MACOSX_VERSION_MIN=
+    fi
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
+    for ac_prog in sw_vers
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OSX_SW_VERS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  if test -n "$OSX_SW_VERS"; then
+  ac_cv_prog_OSX_SW_VERS="$OSX_SW_VERS" # 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=.
 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
+    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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    ac_cv_prog_OSX_SW_VERS="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 IFS=$as_save_IFS
 
 fi
 fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+OSX_SW_VERS=$ac_cv_prog_OSX_SW_VERS
+if test -n "$OSX_SW_VERS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSX_SW_VERS" >&5
+$as_echo "$OSX_SW_VERS" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-{ 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 -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
+  test -n "$OSX_SW_VERS" && break
 done
 done
-done
-IFS=$as_save_IFS
 
 
+    if test "$OSX_SW_VERS" != ""; then
+        OSX_VERSION=`sw_vers -productVersion | grep 10.[0-9]`
+    else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&5
+$as_echo "$as_me: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&2;}
+        OSX_VERSION="10.4"
+    fi
+
+    case "$OSX_VERSION" in
+        10.4* )
+            wxUSE_MACOSX_VERSION_MIN=10.4
+            ;;
+
+        * )
+            if test "$wxUSE_OSX_CARBON" = 1; then
+                # otherwise configure stops on leopard for universal_binary
+                wxUSE_MACOSX_VERSION_MIN=10.4
+            else
+                # for Cocoa, use 10.5 to be able to compile it in 64 bits too
+                wxUSE_MACOSX_VERSION_MIN=10.5
+            fi
+            ;;
+    esac
 fi
 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; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+
+NEEDS_GCC40="no"
+if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
+    NEEDS_GCC40="yes"
 fi
 
 fi
 
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP="true"
-  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
-else
-  STRIP="$ac_cv_prog_STRIP"
+if test "$wxUSE_OSX_CARBON" = 1; then
+    NEEDS_GCC40="yes"
 fi
 
 fi
 
+if test "x$NEEDS_GCC40" == "xyes"; then
+    # gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
+    # and wants 10.4 compatible code, then 'downgrade' to 4.0
+    # This is also the simplest way to get 32-bit binaries on Snow Leopard.
+    if test "x$CC" = "xgcc"; then
+        CCVERSION=`$CC --version | grep 4.[2-9].`
+        if test "x$CCVERSION" != "x"; then
+            echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
+            CC="gcc-4.0"
+        fi
+    fi
 
 
-if test "$wxUSE_WINE" = "yes"; then
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wrc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wrc; 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_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # 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_WINDRES="${ac_tool_prefix}wrc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+    if test "x$CXX" = "xg++"; then
+        CCVERSION=`$CXX --version | grep 4.[2-9].`
+        if test "x$CCVERSION" != "x"; then
+            CXX="g++-4.0"
+        fi
+    fi
+fi
 
 
+if test "x$MACOSX_SDK_OPTS" != "x"; then
+    eval "CC=\"$CC $MACOSX_SDK_OPTS\""
+    eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
+    eval "LD=\"$LD $MACOSX_SDK_OPTS\""
 fi
 fi
+
+if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
+    if test "$wxUSE_OSX_IPHONE" = 1; then
+        MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN"
+    else
+        MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
+    fi
+    eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
+    eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
+    eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
+    retest_macosx_linking=yes
 fi
 fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
-  { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
+
+if test "x$retest_macosx_linking" = "xyes"; then
+    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
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler works with SDK/version options" >&5
+$as_echo_n "checking if C compiler works with SDK/version options... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no.  Try a different SDK
+See \`config.log' for more details" "$LINENO" 5 ; }; exit 1
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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
 
 
 
 
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
-  ac_ct_WINDRES=$WINDRES
-  # Extract the first word of "wrc", so it can be a program name with args.
-set dummy wrc; 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_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # 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_ac_ct_WINDRES="wrc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+    ac_ext=cpp
+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
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler works with SDK/version options" >&5
+$as_echo_n "checking if C++ compiler works with SDK/version options... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
 
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no.  Try a different SDK
+See \`config.log' for more details" "$LINENO" 5 ; }; exit 1
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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
+
 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; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+
 fi
 fi
+case "${host}" in
 
 
-  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 ;;
+                *-*-darwin* )
+        INSTALL_PROGRAM="cp -fp"
+        INSTALL_DATA="cp -fp"
+        ;;
+    *)
+        ;;
 esac
 esac
-    WINDRES=$ac_ct_WINDRES
-  fi
-else
-  WINDRES="$ac_cv_prog_WINDRES"
-fi
 
 
-    RESCOMP="$WINDRES"
-else
-    case "${host}" in
-    *-*-cygwin* | *-*-mingw32* )
-                                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; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # 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_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
-  { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
+                    $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+
+            GNU_SOURCE_FLAG="-D_GNU_SOURCE"
+    CFLAGS="$GNU_SOURCE_FLAG $CFLAGS"
 fi
 
 fi
 
+if test "x$USE_AIX" = "x1"; then
+            if test "x$XLCXX" = "xyes"; then
+        CXXFLAGS="-qunique $CXXFLAGS"
+    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
-{ 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 -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # 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_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
-  { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-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
-else
-  WINDRES="$ac_cv_prog_WINDRES"
-fi
-
-        RESCOMP="$WINDRES"
-        if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; 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_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_ac_ct_DLLTOOL="dlltool"
-    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_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL=""
-  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
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-        ;;
-    esac
-fi
-
-{ 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 "${wx_cv_prog_makeisgnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
-            $EGREP -s GNU > /dev/null); then
-        wx_cv_prog_makeisgnu="yes"
-    else
-        wx_cv_prog_makeisgnu="no"
-    fi
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5
-echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6; }
-
-if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
-    IF_GNU_MAKE=""
-else
-    IF_GNU_MAKE="#"
-fi
-
-
-
-if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
-{ echo "$as_me:$LINENO: checking if make supports VPATH" >&5
-echo $ECHO_N "checking if make supports VPATH... $ECHO_C" >&6; }
-if test "${wx_cv_prog_makevpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cat - << EOF > confMake
-check : file
-       cp \$? \$@
-       cp \$? final_file
-EOF
-
-if test ! -d sub ; then
-  mkdir sub
-fi
-echo dummy > sub/file
-${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
-RESULT=$?
-rm -f sub/file check final_file confMake
-rmdir sub
-if test "$RESULT" = 0; then
-  wx_cv_prog_makevpath="yes"
-else
-  wx_cv_prog_makevpath="no"
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_prog_makevpath" >&5
-echo "${ECHO_T}$wx_cv_prog_makevpath" >&6; }
-
-if test "x$wx_cv_prog_makevpath" != "xyes"; then
-{ { echo "$as_me:$LINENO: error:
-You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly,
-please install GNU-make (possibly as gmake), and start
-configure with the following command:
-export MAKE=gmake; ./configure  for sh-type shells
-setenv MAKE gmake; ./configure  for csh-type shells
-Also please do remember to use gmake in this case every time
-you are trying to compile.
-" >&5
-echo "$as_me: error:
-You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly,
-please install GNU-make (possibly as gmake), and start
-configure with the following command:
-export MAKE=gmake; ./configure  for sh-type shells
-setenv MAKE gmake; ./configure  for csh-type shells
-Also please do remember to use gmake in this case every time
-you are trying to compile.
-" >&2;}
-   { (exit 1); exit 1; }; }
-fi fi
-{ 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
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
-fi
-
-
-
-
-if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
-    CXXFLAGS="-qunique $CXXFLAGS"
+                                CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS"
 fi
 
 case "${host}" in
   powerpc-*-darwin* )
 fi
 
 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; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if __POWERPC__ is already defined" >&5
+$as_echo_n "checking if __POWERPC__ is already defined... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -20206,51 +19511,25 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 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; }
-        cat >>confdefs.h <<\_ACEOF
-#define __POWERPC__ 1
-_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        $as_echo "#define __POWERPC__ 1" >>confdefs.h
 
 
 fi
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ;;
 esac
 
 case "${host}" in
   *-*-darwin* )
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ;;
 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; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CoreFoundation/CFBase.h is usable" >&5
+$as_echo_n "checking if CoreFoundation/CFBase.h is usable... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CFBase.h>
 
 /* end confdefs.h.  */
 #include <CoreFoundation/CFBase.h>
 
@@ -20262,38 +19541,15 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 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; }
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5
+$as_echo_n "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define __CF_USE_FRAMEWORK_INCLUDES__
 #include <CoreFoundation/CFBase.h>
 /* end confdefs.h.  */
 #define __CF_USE_FRAMEWORK_INCLUDES__
 #include <CoreFoundation/CFBase.h>
@@ -20306,43 +19562,21 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                         CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS"
 else
                         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.
-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; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no.  CoreFoundation not available.
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 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
   ;;
 esac
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ;;
 esac
@@ -20354,17 +19588,13 @@ 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; }
-if test "${wx_cv_nocygwin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -mno-cygwin is in effect" >&5
+$as_echo_n "checking if -mno-cygwin is in effect... " >&6; }
+if test "${wx_cv_nocygwin+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -20379,38 +19609,18 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   wx_cv_nocygwin=no
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_nocygwin" >&5
-echo "${ECHO_T}$wx_cv_nocygwin" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_nocygwin" >&5
+$as_echo "$wx_cv_nocygwin" >&6; }
 
         if test "$wx_cv_nocygwin" = "yes"; then
             wants_win32=1
 
         if test "$wx_cv_nocygwin" = "yes"; then
             wants_win32=1
@@ -20435,25 +19645,15 @@ fi
 if test "$wants_win32" = 1 ; then
     USE_UNIX=0
     USE_WIN32=1
 if test "$wants_win32" = 1 ; then
     USE_UNIX=0
     USE_WIN32=1
-    cat >>confdefs.h <<\_ACEOF
-#define __WIN32__ 1
-_ACEOF
+    $as_echo "#define __WIN32__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __WIN95__ 1
-_ACEOF
+    $as_echo "#define __WIN95__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __WINDOWS__ 1
-_ACEOF
+    $as_echo "#define __WINDOWS__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define __GNUWIN32__ 1
-_ACEOF
+    $as_echo "#define __GNUWIN32__ 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define STRICT 1
-_ACEOF
+    $as_echo "#define STRICT 1" >>confdefs.h
 
 fi
 if test "$doesnt_want_win32" = 1 ; then
 
 fi
 if test "$doesnt_want_win32" = 1 ; then
@@ -20463,27 +19663,21 @@ fi
 
 if test "$USE_UNIX" = 1 ; then
     wxUSE_UNIX=yes
 
 if test "$USE_UNIX" = 1 ; then
     wxUSE_UNIX=yes
-    cat >>confdefs.h <<\_ACEOF
-#define __UNIX__ 1
-_ACEOF
+    $as_echo "#define __UNIX__ 1" >>confdefs.h
 
 fi
 
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
                                                       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
 
 fi
 
 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; }
-if test "${ac_cv_lib_cExt_drand48+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for drand48 in -lcExt" >&5
+$as_echo_n "checking for drand48 in -lcExt... " >&6; }
+if test "${ac_cv_lib_cExt_drand48+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcExt  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcExt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20501,60 +19695,35 @@ return drand48 ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_cExt_drand48=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_cExt_drand48 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cExt_drand48" >&5
+$as_echo "$ac_cv_lib_cExt_drand48" >&6; }
+if test "x$ac_cv_lib_cExt_drand48" = x""yes; then :
   LIBS="$LIBS -lcExt"
 fi
 
       else
                     RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
       fi
   LIBS="$LIBS -lcExt"
 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; }
-if test "${wx_cv_gccversion+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5
+$as_echo_n "checking for gcc/libc version... " >&6; }
+if test "${wx_cv_gccversion+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-          if test "$cross_compiling" = yes; then
+          if test "$cross_compiling" = yes; then :
                 wx_cv_gccversion="EMX2"
 
 else
                 wx_cv_gccversion="EMX2"
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                   #include <stdio.h>
 /* end confdefs.h.  */
 
                   #include <stdio.h>
@@ -20578,43 +19747,19 @@ cat >>conftest.$ac_ext <<_ACEOF
                   }
 
 _ACEOF
                   }
 
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   wx_cv_gccversion=`cat conftestval`
 else
   wx_cv_gccversion=`cat conftestval`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-wx_cv_gccversion="EMX2"
+  wx_cv_gccversion="EMX2"
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
 fi
 
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_gccversion" >&5
-echo "${ECHO_T}$wx_cv_gccversion" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gccversion" >&5
+$as_echo "$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"
@@ -20627,25 +19772,21 @@ echo "${ECHO_T}$wx_cv_gccversion" >&6; }
           fi
       fi
       if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
           fi
       fi
       if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
-        { echo "$as_me:$LINENO: WARNING: Building DLLs requires OMF mode, enabled" >&5
-echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building DLLs requires OMF mode, enabled" >&5
+$as_echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
         wxUSE_OMF=yes
         enable_omf=yes
       fi
         ;;
   *)
 
         wxUSE_OMF=yes
         enable_omf=yes
       fi
         ;;
   *)
 
-      { 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
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in string.h" >&5
+$as_echo_n "checking for strcasecmp() in string.h... " >&6; }
+if test "${ac_cv_string_strcasecmp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
               #include <string.h>
 /* end confdefs.h.  */
 
               #include <string.h>
@@ -20660,57 +19801,30 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_string_strcasecmp=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_string_strcasecmp" >&5
-echo "${ECHO_T}$ac_cv_string_strcasecmp" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_string_strcasecmp" >&5
+$as_echo "$ac_cv_string_strcasecmp" >&6; }
 
       if test x"$ac_cv_string_strcasecmp" = "xyes"; then
 
       if test x"$ac_cv_string_strcasecmp" = "xyes"; then
-          cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRCASECMP_IN_STRING_H 1
-_ACEOF
+          $as_echo "#define HAVE_STRCASECMP_IN_STRING_H 1" >>confdefs.h
 
       else
 
       else
-          { 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
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in strings.h" >&5
+$as_echo_n "checking for strcasecmp() in strings.h... " >&6; }
+if test "${ac_cv_strings_strcasecmp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-              cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                   #include <strings.h>
 /* end confdefs.h.  */
 
                   #include <strings.h>
@@ -20725,49 +19839,24 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_strings_strcasecmp=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_strings_strcasecmp" >&5
-echo "${ECHO_T}$ac_cv_strings_strcasecmp" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strings_strcasecmp" >&5
+$as_echo "$ac_cv_strings_strcasecmp" >&6; }
 
           if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
 
           if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
-              cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRCASECMP_IN_STRINGS_H 1
-_ACEOF
+              $as_echo "#define HAVE_STRCASECMP_IN_STRINGS_H 1" >>confdefs.h
 
           else
 
           else
-              { { echo "$as_me:$LINENO: error: No case-insensitive string comparison function found." >&5
-echo "$as_me: error: No case-insensitive string comparison function found." >&2;}
-   { (exit 1); exit 1; }; }
+              as_fn_error $? "No case-insensitive string comparison function found." "$LINENO" 5
           fi
       fi
 
           fi
       fi
 
@@ -20775,16 +19864,12 @@ 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; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -20799,47 +19884,23 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
   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
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 rm -f core 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.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
 else
   ac_cv_header_stdc=no
 fi
@@ -20849,18 +19910,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
 else
   ac_cv_header_stdc=no
 fi
@@ -20870,14 +19927,10 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -20904,113 +19957,35 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                  inttypes.h stdint.h unistd.h
 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`
-{ 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 $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.  */
-$ac_includes_default
-
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -21018,63 +19993,14 @@ fi
 done
 
 
 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`
-{ 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 $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.  */
-$ac_includes_default
-
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+for ac_header in langinfo.h wchar.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -21083,51 +20009,18 @@ done
 
 
 if test "$ac_cv_header_wchar_h" != "yes"; then
 
 
 if test "$ac_cv_header_wchar_h" != "yes"; then
-    { echo "$as_me:$LINENO: checking for wcstr.h" >&5
-echo $ECHO_N "checking for wcstr.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_wcstr_h+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.  */
-$ac_includes_default
-
-#include <wcstr.h>
+    for ac_header in wcstr.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "wcstr.h" "ac_cv_header_wcstr_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_wcstr_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WCSTR_H 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_wcstr_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_wcstr_h=no
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_wcstr_h" >&5
-echo "${ECHO_T}$ac_cv_header_wcstr_h" >&6; }
 
 
+done
 
 fi
 
 
 fi
 
@@ -21143,65 +20036,28 @@ case "${host}" in
 esac
 
 if test "$USE_UNIX" = 1 ; then
 esac
 
 if test "$USE_UNIX" = 1 ; then
-    { echo "$as_me:$LINENO: checking for sys/select.h" >&5
-echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_select_h+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.  */
-$ac_includes_default
-
-#include <sys/select.h>
+    for ac_header in sys/select.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_sys_select_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SELECT_H 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_sys_select_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_sys_select_h=no
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; }
 
 
+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; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -21261,55 +20117,29 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
   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
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 if test $ac_cv_c_const = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
 
 fi
 
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -21318,39 +20148,16 @@ $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
 #endif
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
   ac_cv_c_inline=$ac_kw
-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
 done
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -21368,5758 +20175,1673 @@ _ACEOF
 esac
 
 
 esac
 
 
-{ 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
-  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
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_short=yes
+# 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if test "${ac_cv_sizeof_short+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
 
 
-       ac_cv_type_short=no
+else
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_short=0
+   fi
 fi
 
 fi
 
-rm -f core 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
+
 
 # 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.
 
 # 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; }
-if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if test "${ac_cv_sizeof_void_p+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-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
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    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
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
 
 
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid; break
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if test "$ac_cv_type_void_p" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_void_p=0
+   fi
+fi
 
 
-       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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       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
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
 _ACEOF
 _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 ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=$ac_mid; break
+
+# 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
 
-       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`
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_int=0
+   fi
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
 
 
-       ac_lo= ac_hi=
+# 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_long=0
+   fi
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
-rm -f core 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`
-  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
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
 
 
-  ;
-  return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
+
+
+# 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
+if test "${ac_cv_sizeof_size_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
 
 
-       ac_lo=`expr '(' $ac_mid ')' + 1`
+else
+  if test "$ac_cv_type_size_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (size_t)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_size_t=0
+   fi
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi ;;
-esac
-else
-  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
-   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_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+$as_echo "$ac_cv_sizeof_size_t" >&6; }
 
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
 
 
-  ;
-  return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
 _ACEOF
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_short=`cat conftest.val`
+
+
+
+case "${host}" in
+    arm-*-linux* )
+        # 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 
 
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5 ; }
    else
    else
-     ac_cv_sizeof_short=0
+     ac_cv_sizeof_long_long=0
    fi
 fi
    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
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
 
 
 
 cat >>confdefs.h <<_ACEOF
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF
 
 
 _ACEOF
 
 
-{ 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
+    ;;
+    *-hp-hpux* )
+        # 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  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
-typedef void * ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_void_p=yes
+
+
+        if test "$ac_cv_sizeof_long_long" != 0; then
+                        CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
+        fi
+    ;;
+    * )
+        # 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 
 
-       ac_cv_type_void_p=no
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi
 fi
 
 fi
 
-rm -f core 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
+
+
+esac
 
 # 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.
 
 # 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; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5
+$as_echo_n "checking size of wchar_t... " >&6; }
+if test "${ac_cv_sizeof_wchar_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-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
-   typedef void * ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t"        "
+        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
+        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
+        #  error \"fake wchar_t\"
+        #endif
+        #ifdef HAVE_WCHAR_H
+        #  ifdef __CYGWIN__
+        #    include <stddef.h>
+        #  endif
+        #  include <wchar.h>
+        #endif
+        #ifdef HAVE_STDLIB_H
+        #  include <stdlib.h>
+        #endif
+        #include <stdio.h>
 
 
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+"; then :
+
+else
+  if test "$ac_cv_type_wchar_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (wchar_t)
+See \`config.log' for more details" "$LINENO" 5 ; }
+   else
+     ac_cv_sizeof_wchar_t=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5
+$as_echo "$ac_cv_sizeof_wchar_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+if test "$ac_cv_sizeof_wchar_t" = 0; then
+    as_fn_error $? "wxWidgets requires wchar_t support." "$LINENO" 5
+fi
+$as_echo "#define wxUSE_WCHAR_T 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
+$as_echo_n "checking for va_copy... " >&6; }
+if test "${wx_cv_func_va_copy+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        ac_ext=cpp
+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
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef void * ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
 
 
-  ;
-  return 0;
-}
+
+                #include <stdarg.h>
+                void foo(char *f, ...)
+                {
+                    va_list ap1, ap2;
+                    va_start(ap1, f);
+                    va_copy(ap2, ap1);
+                    va_end(ap2);
+                    va_end(ap1);
+                }
+                int main()
+                {
+                    foo("hi", 17);
+                    return 0;
+                }
+
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid; break
+if ac_fn_cxx_try_link "$LINENO"; then :
+  wx_cv_func_va_copy=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_func_va_copy=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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_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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_va_copy" >&5
+$as_echo "$wx_cv_func_va_copy" >&6; }
+
+if test $wx_cv_func_va_copy = "yes"; then
+    $as_echo "#define HAVE_VA_COPY 1" >>confdefs.h
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if va_list can be copied by value" >&5
+$as_echo_n "checking if va_list can be copied by value... " >&6; }
+if test "${wx_cv_type_va_list_lvalue+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
 
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            if test "$cross_compiling" = yes; then :
+                  wx_cv_type_va_list_lvalue=yes
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef void * ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+                    #include <stdarg.h>
+                    int foo(char *f, ...)
+                    {
+                        va_list ap1, ap2;
+                        va_start(ap1, f);
+                        ap2 = ap1;
+                        if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 )
+                            return 1;
+                        va_end(ap2);
+                        va_end(ap1);
+                        return 0;
+                    }
+                    int main()
+                    {
+                        return foo("hi", 17);
+                    }
+
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  wx_cv_type_va_list_lvalue=yes
+else
+  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.beam conftest.$ac_ext
+fi
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_va_list_lvalue" >&5
+$as_echo "$wx_cv_type_va_list_lvalue" >&6; }
+
+    if test $wx_cv_type_va_list_lvalue != "yes"; then
+                        $as_echo "#define VA_LIST_IS_ARRAY 1" >>confdefs.h
+
+    fi
+fi
+
+if test "$wxUSE_VARARG_MACROS" = "yes"; then
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports variadic macros" >&5
+$as_echo_n "checking whether the compiler supports variadic macros... " >&6; }
+if test "${wx_cv_have_variadic_macros+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                        ac_ext=cpp
+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
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef void * ac__type_sizeof_;
+
+
+                    #include <stdio.h>
+                    #define test(fmt, ...) printf(fmt, __VA_ARGS__)
+
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
+
+                    test("%s %d %p", "test", 1, 0);
+
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=$ac_mid; break
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_have_variadic_macros=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_have_variadic_macros=no
 
 
-       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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+        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_lo= ac_hi=
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_have_variadic_macros" >&5
+$as_echo "$wx_cv_have_variadic_macros" >&6; }
+
+if test $wx_cv_have_variadic_macros = "yes"; then
+    $as_echo "#define HAVE_VARIADIC_MACROS 1" >>confdefs.h
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 
-rm -f core 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`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+fi
+
+LARGEFILE_CPPFLAGS=
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+            wx_largefile=no
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef void * ac__type_sizeof_;
+#define _FILE_OFFSET_BITS 64
+                          #include <sys/types.h>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
+typedef struct {
+    unsigned int field: sizeof(off_t) == 8;
+} wxlf;
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=64
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_sys_file_offset_bits=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 
 
-       ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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 *)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_void_p=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+    if test "$ac_cv_sys_file_offset_bits" != no; then
+        wx_largefile=yes
+        cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+    fi
+
+    if test "x$wx_largefile" != "xyes"; then
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* 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_)); }
-#include <stdio.h>
-#include <stdlib.h>
+#define _LARGE_FILES 1
+                          #include <sys/types.h>
 int
 main ()
 {
 int
 main ()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
+typedef struct {
+    unsigned int field: sizeof(off_t) == 8;
+} wxlf;
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_void_p=`cat conftest.val`
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1
 else
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-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 *)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void *)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_void_p=0
-   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
+  ac_cv_sys_large_files=no
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+    if test "$ac_cv_sys_large_files" != no; then
+        wx_largefile=yes
+        cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
 _ACEOF
 
 _ACEOF
 
+    fi
+
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if large file support is available" >&5
+$as_echo_n "checking if large file support is available... " >&6; }
+    if test "x$wx_largefile" = "xyes"; then
+        $as_echo "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h
+
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_largefile" >&5
+$as_echo "$wx_largefile" >&6; }
+fi
+
+if test "$ac_cv_sys_file_offset_bits" = "64"; then
+    LARGEFILE_CPPFLAGS="-D_FILE_OFFSET_BITS=64"
+elif test "$ac_cv_sys_large_files" = 1; then
+    LARGEFILE_CPPFLAGS="-D_LARGE_FILES"
+fi
+
+if test -n "$LARGEFILE_CPPFLAGS"; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS"
 
 
-{ 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
+                            if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -D__STDC_EXT__ is required" >&5
+$as_echo_n "checking if -D__STDC_EXT__ is required... " >&6; }
+if test "${wx_cv_STDC_EXT_required+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+                ac_ext=cpp
+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
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
+
 int
 main ()
 {
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+
+                        #ifndef __STDC_EXT__
+                            choke me
+                        #endif
+
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_int=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_STDC_EXT_required=no
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_STDC_EXT_required=yes
 
 
-       ac_cv_type_int=no
 fi
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                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
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_STDC_EXT_required" >&5
+$as_echo "$wx_cv_STDC_EXT_required" >&6; }
+        if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
+            WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
+        fi
+    fi
+fi
+
+ac_ext=cpp
+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
+
+old_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_source+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
 _ACEOF
   ;
   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;;
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  ac_cv_sys_largefile_source=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+;;
 esac
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -rf 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
+
+$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
 
 
-       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
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+CPPFLAGS="$old_CPPFLAGS"
+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
 
 
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test "$ac_cv_sys_largefile_source" != no; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
+#include <sys/types.h>
+#include <sys/param.h>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
 
 
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
+#include <sys/types.h>
+#include <sys/param.h>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
 
 
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=$ac_mid; break
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
 else
 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_cv_c_bigendian=no
 fi
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+fi
+rm -f core 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
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
 
-       ac_lo= ac_hi=
 fi
 fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+if test $ac_cv_c_bigendian = unknown; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5
+$as_echo "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;}
+fi
+if test $ac_cv_c_bigendian = yes; then
+  $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 
-rm -f core 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`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+
+
+    ac_ext=cpp
+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
+
+
+    for ac_header in iostream
+do :
+  ac_fn_cxx_check_header_compile "$LINENO" "iostream" "ac_cv_header_iostream" "
+"
+if test "x$ac_cv_header_iostream" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IOSTREAM 1
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+fi
+
+done
+
+
+    if test "$ac_cv_header_iostream" = "yes" ; then
+      :
+    else
+      $as_echo "#define wxUSE_IOSTREAMH 1" >>confdefs.h
+
+    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
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler supports the explicit keyword" >&5
+$as_echo_n "checking if C++ compiler supports the explicit keyword... " >&6; }
+if test "${wx_cv_explicit+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+    ac_ext=cpp
+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
+
+
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
+
+        class Foo { public: explicit Foo(int) {} };
+
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
+
+        return 0;
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* 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_)); }
-#include <stdio.h>
-#include <stdlib.h>
+
+                class Foo { public: explicit Foo(int) {} };
+                static void TakeFoo(const Foo& foo) { }
+
 int
 main ()
 {
 
 int
 main ()
 {
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
+                TakeFoo(17);
+                return 0;
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_explicit=no
 else
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_explicit=yes
 
 
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+else
+  wx_cv_explicit=no
+
 fi
 fi
-rm -f conftest.val
+rm -f core 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
+
+
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_explicit" >&5
+$as_echo "$wx_cv_explicit" >&6; }
+
+  if test "$wx_cv_explicit" = "yes"; then
+    $as_echo "#define HAVE_EXPLICIT 1" >>confdefs.h
 
 
+  fi
 
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+if test "x$SUNCXX" = xyes; then
+    CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS"
+fi
 
 
+if test "x$SUNCC" = xyes; then
+    CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS"
+fi
 
 
-{ 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
+if test "x$SGICC" = "xyes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if cc version is 7.4.4 or greater" >&5
+$as_echo_n "checking if cc version is 7.4.4 or greater... " >&6; }
+if test "${wx_cv_prog_sgicc744+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
+
 int
 main ()
 {
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+
+                    #if _SGI_COMPILER_VERSION >= 744
+                    chock me: mipsPro is 7.4.4 or later
+                    #endif
+
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_long=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_prog_sgicc744=no
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_prog_sgicc744=yes
 
 
-       ac_cv_type_long=no
 fi
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 rm -f core 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicc744" >&5
+$as_echo "$wx_cv_prog_sgicc744" >&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; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test "x$wx_cv_prog_sgicc744" = "xyes"; then
+        CFLAGS="-woff 3970 $CFLAGS"
+    fi
+fi
+if test "x$SGICXX" = "xyes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC version is 7.4.4 or greater" >&5
+$as_echo_n "checking if CC version is 7.4.4 or greater... " >&6; }
+if test "${wx_cv_prog_sgicxx744+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-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
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            ac_ext=cpp
+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
+
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* 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)];
-test_array [0] = 0
+
+                    #if _SGI_COMPILER_VERSION >= 744
+                    chock me: mipsPro is 7.4.4 or later
+                    #endif
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid; break
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_prog_sgicxx744=no
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_prog_sgicxx744=yes
 
 
-       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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+            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
 
 
-       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
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_prog_sgicxx744" >&5
+$as_echo "$wx_cv_prog_sgicxx744" >&6; }
+
+    if test "x$wx_cv_prog_sgicxx744" = "xyes"; then
+        CXXFLAGS="-woff 3970 $CXXFLAGS"
+    fi
+fi
+
+if test "x$HPCC" = "xyes"; then
+                    CFLAGS="+W 2011,2450 $CFLAGS"
+fi
+if test "x$HPCXX" = "xyes"; then
+                            CXXFLAGS="+W 2340,4232 $CXXFLAGS"
+fi
+
+if test "x$COMPAQCXX" = "xyes"; then
+                                CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
+fi
+
+ac_ext=cpp
+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 "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
+    if test "$wxUSE_UNICODE" = "yes"; then
+        std_string="std::wstring"
+        char_type="wchar_t"
+    else
+        std_string="std::string"
+        char_type="char"
+    fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $std_string in <string>" >&5
+$as_echo_n "checking for $std_string in <string>... " >&6; }
+if test "${wx_cv_class_stdstring+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
+#include <string>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
+$std_string foo;
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=$ac_mid; break
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_class_stdstring=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_class_stdstring=no
 
 
-       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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_lo= ac_hi=
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdstring" >&5
+$as_echo "$wx_cv_class_stdstring" >&6; }
 
 
-rm -f core 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`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    if test "$wx_cv_class_stdstring" = yes; then
+        if test "$wxUSE_UNICODE" = "yes"; then
+            $as_echo "#define HAVE_STD_WSTRING 1" >>confdefs.h
+
+        fi
+                    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if std::basic_string<$char_type> works" >&5
+$as_echo_n "checking if std::basic_string<$char_type> works... " >&6; }
+if test "${wx_cv_class_stdbasicstring+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
+
+                    #ifdef HAVE_WCHAR_H
+                    #  ifdef __CYGWIN__
+                    #    include <stddef.h>
+                    #  endif
+                    #  include <wchar.h>
+                    #endif
+                    #ifdef HAVE_STDLIB_H
+                    #  include <stdlib.h>
+                    #endif
+                    #include <stdio.h>
+                    #include <string>
+
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+std::basic_string<$char_type> foo;
+                     const $char_type* dummy = foo.c_str();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_class_stdbasicstring=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_class_stdbasicstring=no
 
 
-       ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
-else
-  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
-   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_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
 
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   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
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdbasicstring" >&5
+$as_echo "$wx_cv_class_stdbasicstring" >&6; }
 
 
+        if test "$wx_cv_class_stdbasicstring" != yes; then
+            if test "$wxUSE_STL" = "yes"; then
+                as_fn_error $? "Can't use --enable-stl without $std_string or std::basic_string<$char_type>" "$LINENO" 5
+            elif test "$wxUSE_STD_STRING" = "yes"; then
+                as_fn_error $? "Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5
+$as_echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;}
+                wxUSE_STD_STRING=no
+            fi
+        fi
+    fi
+fi
 
 
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+    ac_fn_cxx_check_type "$LINENO" "std::istream" "ac_cv_type_std__istream" "#include <iostream>
+"
+if test "x$ac_cv_type_std__istream" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+#define HAVE_STD__ISTREAM 1
 _ACEOF
 
 
 _ACEOF
 
 
-{ 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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+  wxUSE_STD_IOSTREAM=no
+fi
+ac_fn_cxx_check_type "$LINENO" "std::ostream" "ac_cv_type_std__ostream" "#include <iostream>
+"
+if test "x$ac_cv_type_std__ostream" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STD__OSTREAM 1
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+else
+  wxUSE_STD_IOSTREAM=no
+fi
+
+
+    if test "$wxUSE_STD_IOSTREAM" != "yes"; then
+        if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+            as_fn_error $? "Can't use --enable-std_iostreams without std::istream and std::ostream" "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5
+$as_echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;}
+        fi
+    fi
+fi
+
+if test "$wxUSE_STL" = "yes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for basic STL functionality" >&5
+$as_echo_n "checking for basic STL functionality... " >&6; }
+if test "${wx_cv_lib_stl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
+#include <string>
+            #include <functional>
+            #include <algorithm>
+            #include <vector>
+            #include <list>
 int
 main ()
 {
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+std::vector<int> moo;
+             std::list<int> foo;
+             std::vector<int>::iterator it =
+                 std::find_if(moo.begin(), moo.end(),
+                              std::bind2nd(std::less<int>(), 3));
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_size_t=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_lib_stl=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_lib_stl=no
 
 
-       ac_cv_type_size_t=no
 fi
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 rm -f core 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_stl" >&5
+$as_echo "$wx_cv_lib_stl" >&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; }
-if test "${ac_cv_sizeof_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-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
-   typedef size_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+    if test "$wx_cv_lib_stl" != yes; then
+         as_fn_error $? "Can't use --enable-stl as basic STL functionality is missing" "$LINENO" 5
+    fi
 
 
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compliant std::string::compare" >&5
+$as_echo_n "checking for compliant std::string::compare... " >&6; }
+if test "${wx_cv_func_stdstring_compare+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
+#include <string>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+std::string foo, bar;
+            foo.compare(bar);
+            foo.compare(1, 1, bar);
+            foo.compare(1, 1, bar, 1, 1);
+            foo.compare("");
+            foo.compare(1, 1, "");
+            foo.compare(1, 1, "", 2);
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid; break
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_func_stdstring_compare=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_func_stdstring_compare=no
 
 
-       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 core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       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
-   typedef size_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_stdstring_compare" >&5
+$as_echo "$wx_cv_func_stdstring_compare" >&6; }
 
 
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    if test "$wx_cv_func_stdstring_compare" = yes; then
+        $as_echo "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h
+
+    fi
+
+    if test "$wx_cv_class_gnuhashmapset" = yes; then
+         $as_echo "#define HAVE_EXT_HASH_MAP 1" >>confdefs.h
+
+         $as_echo "#define HAVE_GNU_CXX_HASH_MAP 1" >>confdefs.h
+
+    fi
+
+    ac_fn_cxx_check_header_compile "$LINENO" "unordered_map" "ac_cv_header_unordered_map" "
+
+"
+if test "x$ac_cv_header_unordered_map" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std" >&5
+$as_echo_n "checking for unordered_map and unordered_set in std... " >&6; }
+if test "${wx_cv_class_stdunorderedmapset+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
+#include <unordered_map>
+                #include <unordered_set>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
+std::unordered_map<double*, char*> test1;
+                 std::unordered_set<char*> test2;
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=$ac_mid; break
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_class_stdunorderedmapset=yes
 else
 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`
+  wx_cv_class_stdunorderedmapset=no
 fi
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_lo= ac_hi=
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdunorderedmapset" >&5
+$as_echo "$wx_cv_class_stdunorderedmapset" >&6; }
 fi
 
 fi
 
-rm -f core 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`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+    if test "$wx_cv_class_stdunorderedmapset" = yes; then
+         $as_echo "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h
+
+         $as_echo "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h
+
+    else
+        ac_fn_cxx_check_header_compile "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" "
+
+"
+if test "x$ac_cv_header_tr1_unordered_map" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std::tr1" >&5
+$as_echo_n "checking for unordered_map and unordered_set in std::tr1... " >&6; }
+if test "${wx_cv_class_tr1unorderedmapset+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
+#include <tr1/unordered_map>
+                    #include <tr1/unordered_set>
 int
 main ()
 {
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
+std::tr1::unordered_map<double*, char*> test1;
+                     std::tr1::unordered_set<char*> test2;
+            #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2)
+            #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389
+            #endif
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_class_tr1unorderedmapset=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_class_tr1unorderedmapset=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-       ac_lo=`expr '(' $ac_mid ')' + 1`
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_tr1unorderedmapset" >&5
+$as_echo "$wx_cv_class_tr1unorderedmapset" >&6; }
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi ;;
-esac
+
+
+        if test "$wx_cv_class_tr1unorderedmapset" = yes; then
+            $as_echo "#define HAVE_TR1_UNORDERED_MAP 1" >>confdefs.h
+
+            $as_echo "#define HAVE_TR1_UNORDERED_SET 1" >>confdefs.h
+
+        else
+                        ac_fn_cxx_check_header_compile "$LINENO" "hash_map" "ac_cv_header_hash_map" "
+
+"
+if test "x$ac_cv_header_hash_map" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::hash_map and hash_set" >&5
+$as_echo_n "checking for std::hash_map and hash_set... " >&6; }
+if test "${wx_cv_class_stdhashmapset+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* 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_)); }
-#include <stdio.h>
-#include <stdlib.h>
+#include <hash_map>
+                        #include <hash_set>
 int
 main ()
 {
 int
 main ()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
+std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
+                         std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_size_t=`cat conftest.val`
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_class_stdhashmapset=yes
 else
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi
+  wx_cv_class_stdhashmapset=no
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
 fi
 fi
-rm -f conftest.val
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_stdhashmapset" >&5
+$as_echo "$wx_cv_class_stdhashmapset" >&6; }
 fi
 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
+            if test "$wx_cv_class_stdhashmapset" = yes; then
+                $as_echo "#define HAVE_HASH_MAP 1" >>confdefs.h
 
 
+                $as_echo "#define HAVE_STD_HASH_MAP 1" >>confdefs.h
 
 
+            fi
 
 
-case "${host}" in
-    arm-*-linux* )
-        { 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
+            ac_fn_cxx_check_header_compile "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" "
+
+"
+if test "x$ac_cv_header_ext_hash_map" = x""yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU hash_map and hash_set" >&5
+$as_echo_n "checking for GNU hash_map and hash_set... " >&6; }
+if test "${wx_cv_class_gnuhashmapset+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-typedef long long ac__type_new_;
+#include <ext/hash_map>
+                        #include <ext/hash_set>
 int
 main ()
 {
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
+                         __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_long_long=yes
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_class_gnuhashmapset=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_class_gnuhashmapset=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 
 
-       ac_cv_type_long_long=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_class_gnuhashmapset" >&5
+$as_echo "$wx_cv_class_gnuhashmapset" >&6; }
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+        fi
+    fi
 fi
 fi
-{ 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; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_ext=cpp
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
 _ACEOF
 _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 ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
 
-  ;
-  return 0;
-}
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid; break
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 
-       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`
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
 
 
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
 _ACEOF
 _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 ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
 
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=$ac_mid; break
 else
 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`
+  # Broken: fails on valid input.
+continue
 fi
 fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo= ac_hi=
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
 fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 fi
 
-rm -f core 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`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+ac_ext=cpp
+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
+
+
+for ac_header in type_traits tr1/type_traits
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+fi
+
+done
+
+
+
+
+  if test -n "$GCC"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins" >&5
+$as_echo_n "checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins... " >&6; }
+    if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* 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)];
-test_array [0] = 0
+
+          unsigned int value=0;
+          /* wxAtomicInc doesn't use return value here */
+          __sync_fetch_and_add(&value, 2);
+          __sync_sub_and_fetch(&value, 1);
+          /* but wxAtomicDec does, so mimic that: */
+          unsigned int r2 = __sync_sub_and_fetch(&value, 1);
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
-else
-  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
-   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_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   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
-{ 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
-
-
-    ;;
-    *-hp-hpux* )
-        { 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
-  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
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core 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`
-  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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
-else
-  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
-   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_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   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
-{ 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
-
-
-        if test "$ac_cv_sizeof_long_long" != "0"; then
-                        CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
-        fi
-    ;;
-    * )
-        { 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
-  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
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core 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`
-  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
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
-else
-  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
-   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_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   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
-{ 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
-
-
-esac
-
-{ 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
-        #  error "fake wchar_t"
-        #endif
-        #ifdef HAVE_WCHAR_H
-        #  ifdef __CYGWIN__
-        #    include <stddef.h>
-        #  endif
-        #  include <wchar.h>
-        #endif
-        #ifdef HAVE_STDLIB_H
-        #  include <stdlib.h>
-        #endif
-        #include <stdio.h>
-
-
-
-typedef wchar_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_wchar_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_wchar_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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; }
-if test "${ac_cv_sizeof_wchar_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
-        #  error "fake wchar_t"
-        #endif
-        #ifdef HAVE_WCHAR_H
-        #  ifdef __CYGWIN__
-        #    include <stddef.h>
-        #  endif
-        #  include <wchar.h>
-        #endif
-        #ifdef HAVE_STDLIB_H
-        #  include <stdlib.h>
-        #endif
-        #include <stdio.h>
-
-
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
-        #  error "fake wchar_t"
-        #endif
-        #ifdef HAVE_WCHAR_H
-        #  ifdef __CYGWIN__
-        #    include <stddef.h>
-        #  endif
-        #  include <wchar.h>
-        #endif
-        #ifdef HAVE_STDLIB_H
-        #  include <stdlib.h>
-        #endif
-        #include <stdio.h>
-
-
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
-        #  error "fake wchar_t"
-        #endif
-        #ifdef HAVE_WCHAR_H
-        #  ifdef __CYGWIN__
-        #    include <stddef.h>
-        #  endif
-        #  include <wchar.h>
-        #endif
-        #ifdef HAVE_STDLIB_H
-        #  include <stdlib.h>
-        #endif
-        #include <stdio.h>
-
-
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
-        #  error "fake wchar_t"
-        #endif
-        #ifdef HAVE_WCHAR_H
-        #  ifdef __CYGWIN__
-        #    include <stddef.h>
-        #  endif
-        #  include <wchar.h>
-        #endif
-        #ifdef HAVE_STDLIB_H
-        #  include <stdlib.h>
-        #endif
-        #include <stdio.h>
-
-
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core 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`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
-        #  error "fake wchar_t"
-        #endif
-        #ifdef HAVE_WCHAR_H
-        #  ifdef __CYGWIN__
-        #    include <stddef.h>
-        #  endif
-        #  include <wchar.h>
-        #endif
-        #ifdef HAVE_STDLIB_H
-        #  include <stdlib.h>
-        #endif
-        #include <stdio.h>
-
-
-
-   typedef wchar_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (wchar_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_wchar_t=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
-        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
-        #  error "fake wchar_t"
-        #endif
-        #ifdef HAVE_WCHAR_H
-        #  ifdef __CYGWIN__
-        #    include <stddef.h>
-        #  endif
-        #  include <wchar.h>
-        #endif
-        #ifdef HAVE_STDLIB_H
-        #  include <stdlib.h>
-        #endif
-        #include <stdio.h>
-
-
-
-   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_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_wchar_t=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (wchar_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_wchar_t=0
-   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
-{ 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
-
-
-if test "$ac_cv_sizeof_wchar_t" != "0"; then
-    wxUSE_WCHAR_T=yes
-else
-    wxUSE_WCHAR_T=no
-fi
-
-{ 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
-
-        ac_ext=cpp
-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
-
-        cat >conftest.$ac_ext <<_ACEOF
-
-            #include <stdarg.h>
-            void foo(char *f, ...)
-            {
-                va_list ap1, ap2;
-                va_start(ap1, f);
-                va_copy(ap2, ap1);
-                va_end(ap2);
-                va_end(ap1);
-            }
-            int main()
-            {
-                foo("hi", 17);
-                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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  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
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext 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
-
-
-
-fi
-{ 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
-#define HAVE_VA_COPY 1
-_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; }
-if test "${wx_cv_type_va_list_lvalue+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-            if test "$cross_compiling" = yes; then
-                  wx_cv_type_va_list_lvalue=yes
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-
-                #include <stdarg.h>
-                int foo(char *f, ...)
-                {
-                    va_list ap1, ap2;
-                    va_start(ap1, f);
-                    ap2 = ap1;
-                    if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 )
-                        return 1;
-                    va_end(ap2);
-                    va_end(ap1);
-                    return 0;
-                }
-                int main()
-                {
-                    return foo("hi", 17);
-                }
-_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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  wx_cv_type_va_list_lvalue=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( 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
-fi
-
-
-
-
-fi
-{ 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
-#define VA_LIST_IS_ARRAY 1
-_ACEOF
-
-    fi
-fi
-
-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; }
-if test "${wx_cv_have_variadic_macros+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                        ac_ext=cpp
-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
-
-        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>
-                    #define test(fmt, ...) printf(fmt, __VA_ARGS__)
-
-int
-main ()
-{
-
-                    test("%s %d %p", "test", 1, 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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  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
-
-fi
-
-rm -f core 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
-
-
-
-fi
-{ 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
-#define HAVE_VARIADIC_MACROS 1
-_ACEOF
-
-fi
-
-fi
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then
-  enableval=$enable_largefile;
-fi
-
-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; }
-if test "${ac_cv_sys_file_offset_bits+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 _FILE_OFFSET_BITS 64
-                          #include <sys/types.h>
-int
-main ()
-{
-typedef struct {
-    unsigned int field: sizeof(off_t) == 8;
-} wxlf;
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ 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
-        cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-
-    fi
-
-    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; }
-if test "${ac_cv_sys_large_files+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 _LARGE_FILES 1
-                          #include <sys/types.h>
-int
-main ()
-{
-typedef struct {
-    unsigned int field: sizeof(off_t) == 8;
-} wxlf;
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_sys_large_files=1
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_sys_large_files=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ 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
-        cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_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; }
-    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; }
-fi
-
-
-if test "x$wx_largefile" = "xyes"; then
-    if test "x$ac_cv_sys_file_offset_bits" = "x64"; 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; }
-if test "${wx_cv_STDC_EXT_required+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                    ac_ext=cpp
-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
-
-                    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-                            #ifndef __STDC_EXT__
-                                choke me
-                            #endif
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  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
-
-fi
-
-rm -f core 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
-
-
-
-fi
-{ 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
-        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; }
-if test "${ac_cv_sys_largefile_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  while :; do
-  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>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext 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.  */
-#define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
-int
-main ()
-{
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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=1; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-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
-  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) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-_ACEOF
-;;
-esac
-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
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FSEEKO 1
-_ACEOF
-
-fi
-
-    if test "$ac_cv_sys_largefile_source" != no; then
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
-    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; }
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-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>
-#include <sys/param.h>
-int
-main ()
-{
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-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>
-#include <sys/param.h>
-int
-main ()
-{
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_c_bigendian=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-  ac_cv_c_bigendian=unknown
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-_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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( 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
-fi
-
-
-fi
-fi
-{ 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;}
-fi
-if test $ac_cv_c_bigendian = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
-
-fi
-
-
-
-
-    ac_ext=cpp
-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 for iostream" >&5
-echo $ECHO_N "checking for iostream... $ECHO_C" >&6; }
-if test "${ac_cv_header_iostream+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 <iostream>
-_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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_header_iostream=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_iostream=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5
-echo "${ECHO_T}$ac_cv_header_iostream" >&6; }
-
-
-
-    if test "$ac_cv_header_iostream" = "yes" ; then
-      :
-    else
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_IOSTREAMH 1
-_ACEOF
-
-    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
-
-
-
-
-  { 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
-
-
-    ac_ext=cpp
-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
-
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-
-        bool b = true;
-
-        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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-
-        wx_cv_cpp_bool=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-        wx_cv_cpp_bool=no
-
-
-fi
-
-rm -f core 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
-
-
-fi
-{ 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
-#define HAVE_BOOL 1
-_ACEOF
-
-  fi
-
-
-
-  { 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
-
-
-    ac_ext=cpp
-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
-
-
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-        class Foo { public: explicit Foo(int) {} };
-
-int
-main ()
-{
-
-        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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                class Foo { public: explicit Foo(int) {} };
-                static void TakeFoo(const Foo& foo) { }
-
-int
-main ()
-{
-
-                TakeFoo(17);
-                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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_explicit=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_explicit=yes
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_explicit=no
-
-fi
-
-rm -f core 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
-
-
-fi
-{ 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
-#define HAVE_EXPLICIT 1
-_ACEOF
-
-  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; }
-if test "${ac_cv_cxx_const_cast+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-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
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_cxx_const_cast=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_cxx_const_cast=no
-fi
-
-rm -f core 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
-
-
-fi
-{ 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
-#define HAVE_CONST_CAST
-_ACEOF
-
-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; }
-if test "${ac_cv_cxx_reinterpret_cast+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-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
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <typeinfo>
-class Base { public : Base () {} virtual void f () = 0;};
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-class Unrelated { public : Unrelated () {} };
-int g (Unrelated&) { return 0; }
-int
-main ()
-{
-
-Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_cxx_reinterpret_cast=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_cxx_reinterpret_cast=no
-fi
-
-rm -f core 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
-
-
-fi
-{ 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
-#define HAVE_REINTERPRET_CAST
-_ACEOF
-
-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; }
-if test "${ac_cv_cxx_static_cast+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-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
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <typeinfo>
-class Base { public : Base () {} virtual void f () = 0; };
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-int g (Derived&) { return 0; }
-int
-main ()
-{
-
-Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_cxx_static_cast=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_cxx_static_cast=no
-fi
-
-rm -f core 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
-
-
-fi
-{ 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
-#define HAVE_STATIC_CAST
-_ACEOF
-
-fi
-
-
-if test "x$SUNCXX" = xyes; then
-    CXXFLAGS="-features=tmplife $CXXFLAGS"
-fi
-
-if test "x$SUNCC" = xyes; then
-    CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS"
-fi
-
-if test "x$SGICC" = "xyes"; then
-    CFLAGS="-woff 3970 $CFLAGS"
-fi
-if test "x$SGICXX" = "xyes"; then
-    CXXFLAGS="-woff 3970 $CXXFLAGS"
-fi
-
-if test "x$HPCC" = "xyes"; then
-                    CFLAGS="+W 2011,2450 $CFLAGS"
-fi
-if test "x$HPCXX" = "xyes"; then
-            CXXFLAGS="+W 2340 $CXXFLAGS"
-fi
-
-if test "x$COMPAQCXX" = "xyes"; then
-                                CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
-fi
-
-ac_ext=cpp
-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 "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
-    if test "$wxUSE_UNICODE" = "yes"; then
-        std_string="std::wstring"
-        char_type="wchar_t"
-    else
-        std_string="std::string"
-        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; }
-if test "${wx_cv_class_stdstring+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 <string>
-int
-main ()
-{
-$std_string foo;
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_class_stdstring=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_class_stdstring=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ 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
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_WSTRING 1
-_ACEOF
-
-        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; }
-if test "${wx_cv_class_stdbasicstring+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.  */
-
-                    #ifdef HAVE_WCHAR_H
-                    #  ifdef __CYGWIN__
-                    #    include <stddef.h>
-                    #  endif
-                    #  include <wchar.h>
-                    #endif
-                    #ifdef HAVE_STDLIB_H
-                    #  include <stdlib.h>
-                    #endif
-                    #include <stdio.h>
-                    #include <string>
-
-int
-main ()
-{
-std::basic_string<$char_type> foo;
-                     const $char_type* dummy = foo.c_str();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_class_stdbasicstring=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_class_stdbasicstring=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ 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
-                { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5
-echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
-   { (exit 1); exit 1; }; }
-            elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
-                { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5
-echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;}
-   { (exit 1); exit 1; }; }
-            else
-                { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5
-echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;}
-                wxUSE_STD_STRING=no
-            fi
-        fi
-    fi
-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; }
-if test "${ac_cv_type_std__istream+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 <iostream>
-
-typedef std::istream ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_type_std__istream=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_std__istream=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-#define HAVE_STD__ISTREAM 1
-_ACEOF
-
-
-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; }
-if test "${ac_cv_type_std__ostream+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 <iostream>
-
-typedef std::ostream ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_type_std__ostream=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_std__ostream=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-#define HAVE_STD__OSTREAM 1
-_ACEOF
-
-
-else
-  wxUSE_STD_IOSTREAM=no
-fi
-
-
-    if test "$wxUSE_STD_IOSTREAM" != "yes"; then
-        if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
-            { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5
-echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;}
-   { (exit 1); exit 1; }; }
-        else
-            { echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5
-echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;}
-        fi
-    fi
-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; }
-if test "${wx_cv_lib_stl+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 <string>
-            #include <functional>
-            #include <algorithm>
-            #include <vector>
-            #include <list>
-int
-main ()
-{
-std::vector<int> moo;
-             std::list<int> foo;
-             std::vector<int>::iterator it =
-                 std::find_if(moo.begin(), moo.end(),
-                              std::bind2nd(std::less<int>(), 3));
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_lib_stl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_lib_stl=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ 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
-echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;}
-   { (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; }
-if test "${wx_cv_func_stdstring_compare+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 <string>
-int
-main ()
-{
-std::string foo, bar;
-            foo.compare(bar);
-            foo.compare(1, 1, bar);
-            foo.compare(1, 1, bar, 1, 1);
-            foo.compare("");
-            foo.compare(1, 1, "");
-            foo.compare(1, 1, "", 2);
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  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
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ 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
-#define HAVE_STD_STRING_COMPARE 1
-_ACEOF
-
-    fi
-
-        { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_header_hash_map=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_hash_map=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-  { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <hash_map>
-                #include <hash_set>
-int
-main ()
-{
-std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
-                 std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_class_stdhashmapset=yes
+if ac_fn_cxx_try_link "$LINENO"; then :
+  wx_cv_cc_gcc_atomic_builtins=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_class_stdhashmapset=no
+  wx_cv_cc_gcc_atomic_builtins=no
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
 fi
 
 fi
 
-
-
-    if test "$wx_cv_class_stdhashmapset" = yes; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_HASH_MAP 1
-_ACEOF
-
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_HASH_MAP 1
-_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_gcc_atomic_builtins" >&5
+$as_echo "$wx_cv_cc_gcc_atomic_builtins" >&6; }
+    if test $wx_cv_cc_gcc_atomic_builtins = yes; then
+      $as_echo "#define HAVE_GCC_ATOMIC_BUILTINS 1" >>confdefs.h
 
     fi
 
     fi
+  fi
 
 
-    { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.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_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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-  { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ext/hash_map>
-                #include <ext/hash_set>
-int
-main ()
-{
-__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
-                 __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_class_gnuhashmapset=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_class_gnuhashmapset=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
-fi
-
-
-
-    if test "$wx_cv_class_gnuhashmapset" = yes; then
-         cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXT_HASH_MAP 1
-_ACEOF
-
-         cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_CXX_HASH_MAP 1
-_ACEOF
-
-    fi
-fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -27131,6 +21853,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 SEARCH_INCLUDE="\
     /usr/local/include        \
 
 SEARCH_INCLUDE="\
     /usr/local/include        \
+    /usr/local/X11/include    \
+    /usr/local/include/X11    \
+    /usr/local/X11R7/include  \
+    /usr/local/X11R6/include  \
+    /usr/local/include/X11R7  \
+    /usr/local/include/X11R6  \
                               \
     /usr/Motif-2.1/include    \
     /usr/Motif-1.2/include    \
                               \
     /usr/Motif-2.1/include    \
     /usr/Motif-1.2/include    \
@@ -27141,40 +21869,38 @@ SEARCH_INCLUDE="\
                               \
     /usr/include/Xm           \
                               \
                               \
     /usr/include/Xm           \
                               \
+    /usr/X11R7/include        \
     /usr/X11R6/include        \
     /usr/X11R6.4/include      \
     /usr/X11R6/include        \
     /usr/X11R6.4/include      \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
                               \
                               \
+    /usr/include/X11R7        \
     /usr/include/X11R6        \
     /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
                               \
     /usr/X11/include          \
     /usr/include/X11          \
                               \
     /usr/X11/include          \
     /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
                               \
     /usr/XFree86/include/X11  \
     /usr/pkg/include          \
                               \
                               \
     /usr/XFree86/include/X11  \
     /usr/pkg/include          \
                               \
+    /usr/local/X1R5/include  \
+    /usr/local/include/X11R5  \
+    /usr/X11R5/include        \
+    /usr/include/X11R5        \
+                              \
+    /usr/local/X11R4/include  \
+    /usr/local/include/X11R4  \
+    /usr/X11R4/include        \
+    /usr/include/X11R4        \
+                              \
     /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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5
+$as_echo_n "checking for libraries directories... " >&6; }
 
 case "${host}" in
     *-*-irix6* )
 
 case "${host}" in
     *-*-irix6* )
-        if test "${wx_cv_std_libpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        if test "${wx_cv_std_libpath+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                 for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do
 else
 
                 for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do
@@ -27183,37 +21909,17 @@ else
                         if test -f $libc; then
                             save_LIBS="$LIBS"
                             LIBS="$libc"
                         if test -f $libc; then
                             save_LIBS="$LIBS"
                             LIBS="$libc"
-                            cat >conftest.$ac_ext <<_ACEOF
-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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  wx_cv_std_libpath=`echo $d | sed s@/usr/@@`
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+                            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
+                                    int main() { return 0; }
 
 
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  wx_cv_std_libpath=`echo $d | sed s@/usr/@@`
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
                             LIBS="$save_LIBS"
                             if test "x$wx_cv_std_libpath" != "x"; then
                                 break 2
                             LIBS="$save_LIBS"
                             if test "x$wx_cv_std_libpath" != "x"; then
                                 break 2
@@ -27221,9 +21927,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
                         fi
                     done
                 done
                         fi
                     done
                 done
-                if test "x$wx_cv_std_libpath" = "x"; then
-                    wx_cv_std_libpath="lib"
-                fi
 
 
 fi
 
 
 fi
@@ -27233,29 +21936,44 @@ fi
     *-*-solaris2* )
                 if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
             wx_cv_std_libpath="lib/64"
     *-*-solaris2* )
                 if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
             wx_cv_std_libpath="lib/64"
-        else
-            wx_cv_std_libpath="lib"
         fi
         ;;
 
     *-*-linux* )
         fi
         ;;
 
     *-*-linux* )
-                if test "$ac_cv_sizeof_void_p" = 8 -a \
-                -d "/usr/lib64" -a ! -h "/usr/lib64"; then
-            wx_cv_std_libpath="lib64"
+                                        if test "$ac_cv_sizeof_void_p" = 8; then
+            if test -d "/usr/lib/`uname -m`-linux-gnu"; then
+                wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu"
+            elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+                wx_cv_std_libpath="lib64"
+            fi
         else
         else
-            wx_cv_std_libpath="lib"
+            case "${host}" in
+                i*86-*-linux* )
+                    if test -d '/usr/lib/i386-linux-gnu'; then
+                        wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu'
+                    fi
+            esac
         fi
         fi
-        ;;
 
 
-    *)
-        wx_cv_std_libpath="lib";
+                                if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then
+            wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib"
+        fi
         ;;
 esac
 
         ;;
 esac
 
-{ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
-echo "${ECHO_T}$wx_cv_std_libpath" >&6; }
+if test -z "$wx_cv_std_libpath"; then
+    wx_cv_std_libpath="lib"
+fi
+
+if test -z "$wx_cv_std_libfullpath"; then
+    wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath"
+fi
+
 
 
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5
+$as_echo "$wx_cv_std_libfullpath" >&6; }
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
 
 if test "$build" != "$host" -a "$GCC" = yes; then
                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
 
 if test "$build" != "$host" -a "$GCC" = yes; then
                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
@@ -27274,7 +21992,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
                                 if test -z "$x_includes" -o "$x_includes" = NONE; then
 
 ac_find_includes=
                                 if test -z "$x_includes" -o "$x_includes" = NONE; then
 
 ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /usr/include;
+for ac_dir in $SEARCH_INCLUDE /usr/include
   do
     if test -f "$ac_dir/X11/Intrinsic.h"; then
       ac_find_includes=$ac_dir
   do
     if test -f "$ac_dir/X11/Intrinsic.h"; then
       ac_find_includes=$ac_dir
@@ -27287,7 +22005,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include;
         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
 
   ac_find_libraries=
         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in  $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXt.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXt.$ac_extension"; then
@@ -27330,12 +22048,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
     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;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
       esac ;;
     esac
   done
@@ -27343,8 +22062,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `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"
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -27367,492 +22086,82 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
 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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     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;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
   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; }
-if test "${wx_cv_lib_glibc21+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 <features.h>
-int
-main ()
-{
-
-                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
-                not glibc 2.1
-                #endif
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-
-                wx_cv_lib_glibc21=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                wx_cv_lib_glibc21=no
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ 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
-_ACEOF
-
-    fi
-fi
-
-if test "x$wx_cv_lib_glibc21" = "xyes"; then
-    if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-    fi
-fi
-
 have_cos=0
 have_floor=0
 have_cos=0
 have_floor=0
-
 for ac_func in cos
 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "cos" "ac_cv_func_cos"
+if test "x$ac_cv_func_cos" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_COS 1
 _ACEOF
  have_cos=1
 fi
 done
 
 _ACEOF
  have_cos=1
 fi
 done
 
-
 for ac_func in floor
 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor"
+if test "x$ac_cv_func_floor" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_FLOOR 1
 _ACEOF
  have_floor=1
 fi
 done
 
 _ACEOF
  have_floor=1
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if floating point functions link without -lm" >&5
+$as_echo_n "checking if floating point functions link without -lm... " >&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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
-    have_ceil=0
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_sin=1
-fi
-done
-
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
+    have_ceil=0
+    for ac_func in sin
+do :
+  ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
+if test "x$ac_cv_func_sin" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SIN 1
+_ACEOF
+ have_sin=1
 fi
 fi
+done
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+    for ac_func in ceil
+do :
+  ac_fn_c_check_func "$LINENO" "ceil" "ac_cv_func_ceil"
+if test "x$ac_cv_func_ceil" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_CEIL 1
 _ACEOF
  have_ceil=1
 fi
 done
 
 _ACEOF
  have_ceil=1
 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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if floating point functions link with -lm" >&5
+$as_echo_n "checking if floating point functions link with -lm... " >&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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
     else
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         # not sure we should warn the user, crash, etc.
     fi
 fi
         # not sure we should warn the user, crash, etc.
     fi
 fi
@@ -27867,21 +22176,17 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 /* end confdefs.h.  */
 
 
+
                 $ac_includes_default
 
 int
                 $ac_includes_default
 
 int
@@ -27898,44 +22203,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -27949,21 +22233,17 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 /* end confdefs.h.  */
 
 
+
                 $ac_includes_default
 
 int
                 $ac_includes_default
 
 int
@@ -27980,44 +22260,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -28038,153 +22297,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 if test "$wxUSE_REGEX" != "no"; then
 
 
 if test "$wxUSE_REGEX" != "no"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_REGEX 1
-_ACEOF
+    $as_echo "#define wxUSE_REGEX 1" >>confdefs.h
 
 
     if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
 
 
     if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
-        { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5
-echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Defaulting to the builtin regex library for Unicode build." >&5
+$as_echo "$as_me: WARNING: Defaulting to the builtin regex library for Unicode build." >&2;}
         wxUSE_REGEX=builtin
     fi
 
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
         wxUSE_REGEX=builtin
     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; }
-if test "${ac_cv_header_regex_h+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 <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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_regex_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_regex_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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`
-{ 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+                        ac_fn_c_check_header_compile "$LINENO" "regex.h" "ac_cv_header_regex_h" "
+"
+if test "x$ac_cv_header_regex_h" = x""yes; then :
+  for ac_func in regcomp re_search
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -28196,19 +22328,15 @@ fi
 
         if test "x$ac_cv_func_regcomp" != "xyes"; then
             if test "$wxUSE_REGEX" = "sys" ; then
 
         if test "x$ac_cv_func_regcomp" != "xyes"; then
             if test "$wxUSE_REGEX" = "sys" ; then
-                { { echo "$as_me:$LINENO: error: system regex library not found! Use --with-regex to use built-in version" >&5
-echo "$as_me: error: system regex library not found! Use --with-regex to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
+                as_fn_error $? "system regex library not found! Use --with-regex to use built-in version" "$LINENO" 5
             else
             else
-                { echo "$as_me:$LINENO: WARNING: system regex library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system regex library not found, will use built-in instead" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system regex library not found, will use built-in instead" >&5
+$as_echo "$as_me: WARNING: system regex library not found, will use built-in instead" >&2;}
                 wxUSE_REGEX=builtin
             fi
         else
                         wxUSE_REGEX=sys
                 wxUSE_REGEX=builtin
             fi
         else
                         wxUSE_REGEX=sys
-                        cat >>confdefs.h <<\_ACEOF
-#define WX_NO_REGEX_ADVANCED 1
-_ACEOF
+                        $as_echo "#define WX_NO_REGEX_ADVANCED 1" >>confdefs.h
 
         fi
     fi
 
         fi
     fi
@@ -28217,29 +22345,23 @@ fi
 
 ZLIB_LINK=
 if test "$wxUSE_ZLIB" != "no" ; then
 
 ZLIB_LINK=
 if test "$wxUSE_ZLIB" != "no" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ZLIB 1
-_ACEOF
+    $as_echo "#define wxUSE_ZLIB 1" >>confdefs.h
 
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
                                                 if test "$USE_DARWIN" = 1; then
             system_zlib_h_ok="yes"
         else
 
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
                                                 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; }
-if test "${ac_cv_header_zlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                                                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5
+$as_echo_n "checking for zlib.h >= 1.1.4... " >&6; }
+if test "${ac_cv_header_zlib_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
                       unset ac_cv_header_zlib_h
 
 else
                       unset ac_cv_header_zlib_h
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                         #include <zlib.h>
 /* end confdefs.h.  */
 
                         #include <zlib.h>
@@ -28258,87 +22380,24 @@ cat >>conftest.$ac_ext <<_ACEOF
                         }
 
 _ACEOF
                         }
 
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_header_zlib_h=`cat conftestval`
 else
   ac_cv_header_zlib_h=`cat conftestval`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_zlib_h=no
+  ac_cv_header_zlib_h=no
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam 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: 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
 
 
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_zlib_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_header_zlib_h=no
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_zlib_h" >&5
+$as_echo "$ac_cv_header_zlib_h" >&6; }
+                                    ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "
+"
+if test "x$ac_cv_header_zlib_h" = x""yes; then :
 
 
-rm -f core 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; }
 
 
 
 
 
 
@@ -28346,18 +22405,14 @@ 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; }
-if test "${ac_cv_lib_z_deflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
+$as_echo_n "checking for deflate in -lz... " >&6; }
+if test "${ac_cv_lib_z_deflate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -28375,39 +22430,18 @@ return deflate ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_z_deflate=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_z_deflate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
+$as_echo "$ac_cv_lib_z_deflate" >&6; }
+if test "x$ac_cv_lib_z_deflate" = x""yes; then :
   ZLIB_LINK=" -lz"
 fi
 
   ZLIB_LINK=" -lz"
 fi
 
@@ -28415,12 +22449,10 @@ fi
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then
-                { { echo "$as_me:$LINENO: error: zlib library not found or too old! Use --with-zlib=builtin to use built-in version" >&5
-echo "$as_me: error: zlib library not found or too old! Use --with-zlib=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
+                as_fn_error $? "zlib library not found or too old! Use --with-zlib=builtin to use built-in version" "$LINENO" 5
             else
             else
-                { echo "$as_me:$LINENO: WARNING: zlib library not found or too old, will use built-in instead" >&5
-echo "$as_me: WARNING: zlib library not found or too old, will use built-in instead" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib library not found or too old, will use built-in instead" >&5
+$as_echo "$as_me: WARNING: zlib library not found or too old, will use built-in instead" >&2;}
                 wxUSE_ZLIB=builtin
             fi
         else
                 wxUSE_ZLIB=builtin
             fi
         else
@@ -28432,151 +22464,71 @@ fi
 
 PNG_LINK=
 if test "$wxUSE_LIBPNG" != "no" ; then
 
 PNG_LINK=
 if test "$wxUSE_LIBPNG" != "no" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBPNG 1
-_ACEOF
+    $as_echo "#define wxUSE_LIBPNG 1" >>confdefs.h
 
 
 
 
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
-        { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&5
-echo "$as_me: WARNING: wxMGL doesn't work with builtin png library, will use MGL one instead" >&2;}
-        wxUSE_LIBPNG=sys
-    fi
-
-                if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
-        { echo "$as_me:$LINENO: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5
-echo "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;}
+            if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&5
+$as_echo "$as_me: WARNING: system png library doesn't work without system zlib, will use built-in instead" >&2;}
         wxUSE_LIBPNG=builtin
     fi
 
         wxUSE_LIBPNG=builtin
     fi
 
-    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; }
-if test "${ac_cv_header_png_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png.h > 0.90" >&5
+$as_echo_n "checking for png.h > 0.90... " >&6; }
+if test "${ac_cv_header_png_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  if test "$cross_compiling" = yes; then
-                      unset ac_cv_header_png_h
+  if test "$cross_compiling" = yes; then :
+                  unset ac_cv_header_png_h
 
 else
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                        #include <png.h>
-                        #include <stdio.h>
+                    #include <png.h>
+                    #include <stdio.h>
 
 
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
-                        }
+                    int main()
+                    {
+                        FILE *f=fopen("conftestval", "w");
+                        if (!f) exit(1);
+                        fprintf(f, "%s",
+                                 PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                        exit(0);
+                    }
 
 _ACEOF
 
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_header_png_h=`cat conftestval`
 else
   ac_cv_header_png_h=`cat conftestval`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( 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
+  ac_cv_header_png_h=no
 fi
 fi
-
-
-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam 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: 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
 
 
 
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_png_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_png_h=no
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_png_h" >&5
+$as_echo "$ac_cv_header_png_h" >&6; }
+        ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" "
+"
+if test "x$ac_cv_header_png_h" = x""yes; then :
 
 
-rm -f core 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; }
 
 
 
 
 
 
-            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; }
-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        if test "$ac_cv_header_png_h" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5
+$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -28585,103 +22537,64 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-char png_check_sig ();
+char png_sig_cmp ();
 int
 main ()
 {
 int
 main ()
 {
-return png_check_sig ();
+return png_sig_cmp ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_png_png_check_sig=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_png_png_sig_cmp=yes
 else
 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_sig_cmp=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_png_png_check_sig = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5
+$as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }
+if test "x$ac_cv_lib_png_png_sig_cmp" = x""yes; then :
   PNG_LINK=" -lpng -lz"
 fi
 
   PNG_LINK=" -lpng -lz"
 fi
 
-            fi
+        fi
 
 
-            if test "x$PNG_LINK" = "x" ; then
-                if test "$wxUSE_LIBPNG" = "sys" ; then
-                    { { echo "$as_me:$LINENO: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&5
-echo "$as_me: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
-                else
-                    { echo "$as_me:$LINENO: WARNING: system png library not found or too old, will use built-in instead" >&5
-echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;}
-                    wxUSE_LIBPNG=builtin
-                fi
+        if test "x$PNG_LINK" = "x" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
+                as_fn_error $? "system png library not found or too old! Use --with-libpng=builtin to use built-in version" "$LINENO" 5
             else
             else
-                                wxUSE_LIBPNG=sys
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system png library not found or too old, will use built-in instead" >&5
+$as_echo "$as_me: WARNING: system png library not found or too old, will use built-in instead" >&2;}
+                wxUSE_LIBPNG=builtin
             fi
             fi
+        else
+                        wxUSE_LIBPNG=sys
         fi
     fi
         fi
     fi
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
 
 JPEG_LINK=
 if test "$wxUSE_LIBJPEG" != "no" ; then
 fi
 
 
 JPEG_LINK=
 if test "$wxUSE_LIBJPEG" != "no" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBJPEG 1
-_ACEOF
-
+    $as_echo "#define wxUSE_LIBJPEG 1" >>confdefs.h
 
 
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
-        { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&5
-echo "$as_me: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&2;}
-        wxUSE_LIBJPEG=sys
-    fi
 
 
-    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; }
-            if test "${ac_cv_header_jpeglib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5
+$as_echo_n "checking for jpeglib.h... " >&6; }
+        if test "${ac_cv_header_jpeglib_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                        #undef HAVE_STDLIB_H
-                        #include <stdio.h>
-                        #include <jpeglib.h>
+                    #undef HAVE_STDLIB_H
+                    #include <stdio.h>
+                    #include <jpeglib.h>
 
 int
 main ()
 
 int
 main ()
@@ -28692,52 +22605,28 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_jpeglib_h=yes
 else
   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
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-            { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_jpeglib_h" >&5
+$as_echo "$ac_cv_header_jpeglib_h" >&6; }
 
 
-            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; }
-if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5
+$as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; }
+if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -28755,551 +22644,74 @@ return jpeg_read_header ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_jpeg_jpeg_read_header=yes
 else
   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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
-  JPEG_LINK=" -ljpeg"
-fi
-
-            fi
-
-            if test "x$JPEG_LINK" = "x" ; then
-                if test "$wxUSE_LIBJPEG" = "sys" ; then
-                    { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5
-echo "$as_me: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
-                else
-                    { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;}
-                    wxUSE_LIBJPEG=builtin
-                fi
-            else
-                                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; }
-if test "${ac_cv_type_boolean+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 <windows.h>
-
-typedef boolean ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_boolean=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_boolean=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-#define HAVE_BOOLEAN 1
-_ACEOF
-
-
-                            { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-
-
-typedef boolean ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_boolean=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_boolean=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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; }
-if test "${ac_cv_sizeof_boolean+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-
-
-   typedef boolean ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-
-
-   typedef boolean ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-
-
-   typedef boolean ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-
-
-   typedef boolean ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core 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`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-
-
-   typedef boolean ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-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)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (boolean)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_boolean=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.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_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-       return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
+  ac_cv_lib_jpeg_jpeg_read_header=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then :
+  JPEG_LINK=" -ljpeg"
+fi
 
 
-  ;
-  return 0;
-}
+        fi
+
+        if test "x$JPEG_LINK" = "x" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
+                as_fn_error $? "system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" "$LINENO" 5
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system jpeg library not found, will use built-in instead" >&5
+$as_echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;}
+                wxUSE_LIBJPEG=builtin
+            fi
+        else
+                        wxUSE_LIBJPEG=sys
+
+            if test "$wxUSE_MSW" = 1; then
+                                                                                ac_fn_c_check_type "$LINENO" "boolean" "ac_cv_type_boolean" "#include <windows.h>
+"
+if test "x$ac_cv_type_boolean" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_BOOLEAN 1
 _ACEOF
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_boolean=`cat conftest.val`
+
+
+                        # 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of boolean" >&5
+$as_echo_n "checking size of boolean... " >&6; }
+if test "${ac_cv_sizeof_boolean+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (boolean))" "ac_cv_sizeof_boolean"        "
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
+
+"; then :
 
 
-( exit $ac_status )
-if test "$ac_cv_type_boolean" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (boolean)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+else
+  if test "$ac_cv_type_boolean" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (boolean)
+See \`config.log' for more details" "$LINENO" 5 ; }
    else
      ac_cv_sizeof_boolean=0
    fi
 fi
    else
      ac_cv_sizeof_boolean=0
    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
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_boolean" >&5
-echo "${ECHO_T}$ac_cv_sizeof_boolean" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_boolean" >&5
+$as_echo "$ac_cv_sizeof_boolean" >&6; }
 
 
 
 
 
 
@@ -29308,14 +22720,13 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
 _ACEOF
 
 
-                            cat >>confdefs.h <<_ACEOF
+                        cat >>confdefs.h <<_ACEOF
 #define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean`
 _ACEOF
 
 
 fi
 
 #define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean`
 _ACEOF
 
 
 fi
 
-                fi
             fi
         fi
     fi
             fi
         fi
     fi
@@ -29325,9 +22736,7 @@ fi
 TIFF_LINK=
 TIFF_PREREQ_LINKS=-lm
 if test "$wxUSE_LIBTIFF" != "no" ; then
 TIFF_LINK=
 TIFF_PREREQ_LINKS=-lm
 if test "$wxUSE_LIBTIFF" != "no" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBTIFF 1
-_ACEOF
+    $as_echo "#define wxUSE_LIBTIFF 1" >>confdefs.h
 
 
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
 
 
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
@@ -29337,65 +22746,19 @@ _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; }
-if test "${ac_cv_header_tiffio_h+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 <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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_tiffio_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_tiffio_h=no
-fi
+        ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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 "x$ac_cv_header_tiffio_h" = x""yes; then :
 
 
-                            { 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
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5
+$as_echo_n "checking for TIFFError in -ltiff... " >&6; }
+if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -29413,39 +22776,18 @@ return TIFFError ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_tiff_TIFFError=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_tiff_TIFFError = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFError" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFError" = x""yes; then :
   TIFF_LINK=" -ltiff"
 fi
 
   TIFF_LINK=" -ltiff"
 fi
 
@@ -29456,100 +22798,48 @@ fi
 
         if test "x$TIFF_LINK" = "x" ; then
             if test "$wxUSE_LIBTIFF" = "sys" ; then
 
         if test "x$TIFF_LINK" = "x" ; then
             if test "$wxUSE_LIBTIFF" = "sys" ; then
-                { { echo "$as_me:$LINENO: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&5
-echo "$as_me: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
+                as_fn_error $? "system tiff library not found! Use --with-libtiff=builtin to use built-in version" "$LINENO" 5
             else
             else
-                { echo "$as_me:$LINENO: WARNING: system tiff library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system tiff library not found, will use built-in instead" >&5
+$as_echo "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;}
                 wxUSE_LIBTIFF=builtin
             fi
         else
                         wxUSE_LIBTIFF=sys
         fi
     fi
                 wxUSE_LIBTIFF=builtin
             fi
         else
                         wxUSE_LIBTIFF=sys
         fi
     fi
-fi
+    if test "$wxUSE_LIBTIFF" = "builtin" ; then
+        if test "$wxUSE_LIBJPEG" = "no"; then
+                                                                                    ac_configure_args="$ac_configure_args --disable-jpeg"
+        fi
 
 
 
 
-if test "$wxUSE_WCHAR_T" != "yes"; then
-    if test "$wxUSE_EXPAT" != "no"; then
-        { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&5
-echo "$as_me: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&2;}
-        wxUSE_EXPAT=no
-    fi
-    if test "$wxUSE_XML" != "no"; then
-        { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&5
-echo "$as_me: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&2;}
-        wxUSE_XML=no
+subdirs="$subdirs src/tiff"
+
     fi
 fi
 
     fi
 fi
 
+
 if test "$wxUSE_EXPAT" != "no"; then
     wxUSE_XML=yes
 if test "$wxUSE_EXPAT" != "no"; then
     wxUSE_XML=yes
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EXPAT 1
-_ACEOF
+    $as_echo "#define wxUSE_EXPAT 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_XML 1
-_ACEOF
+    $as_echo "#define wxUSE_XML 1" >>confdefs.h
 
 
     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; }
-if test "${ac_cv_header_expat_h+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 <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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_expat_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_expat_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
+        ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" "
+"
+if test "x$ac_cv_header_expat_h" = x""yes; then :
   found_expat_h=1
 fi
 
 
         if test "x$found_expat_h" = "x1"; 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; }
-if test "${wx_cv_expat_is_not_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if expat.h is valid C++ header" >&5
+$as_echo_n "checking if expat.h is valid C++ header... " >&6; }
+if test "${wx_cv_expat_is_not_broken+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                 ac_ext=cpp
 else
 
                 ac_ext=cpp
@@ -29558,11 +22848,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <expat.h>
 int
 /* end confdefs.h.  */
 #include <expat.h>
 int
@@ -29573,32 +22859,12 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_expat_is_not_broken=yes
 else
   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
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -29609,21 +22875,17 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_expat_is_not_broken" >&5
+$as_echo "$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; }
-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexpat  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -29641,39 +22903,18 @@ return XML_ParserCreate ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_expat_XML_ParserCreate=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
   EXPAT_LINK=" -lexpat"
 fi
 
   EXPAT_LINK=" -lexpat"
 fi
 
@@ -29681,12 +22922,10 @@ fi
         fi
         if test "x$EXPAT_LINK" = "x" ; then
             if test "$wxUSE_EXPAT" = "sys" ; then
         fi
         if test "x$EXPAT_LINK" = "x" ; then
             if test "$wxUSE_EXPAT" = "sys" ; then
-                { { echo "$as_me:$LINENO: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&5
-echo "$as_me: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
+                as_fn_error $? "system expat library not found! Use --with-expat=builtin to use built-in version" "$LINENO" 5
             else
             else
-                { echo "$as_me:$LINENO: WARNING: system expat library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: system expat library not found, will use built-in instead" >&5
+$as_echo "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;}
                 wxUSE_EXPAT=builtin
             fi
         else
                 wxUSE_EXPAT=builtin
             fi
         else
@@ -29702,68 +22941,22 @@ 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; }
-if test "${ac_cv_header_mspack_h+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 <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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_mspack_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_mspack_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
+    ac_fn_c_check_header_compile "$LINENO" "mspack.h" "ac_cv_header_mspack_h" "
+"
+if test "x$ac_cv_header_mspack_h" = x""yes; then :
   found_mspack_h=1
 fi
 
 
     if test "x$found_mspack_h" = "x1"; 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; }
-if test "${ac_cv_lib_mspack_mspack_create_chm_decompressor+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mspack_create_chm_decompressor in -lmspack" >&5
+$as_echo_n "checking for mspack_create_chm_decompressor in -lmspack... " >&6; }
+if test "${ac_cv_lib_mspack_mspack_create_chm_decompressor+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmspack  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmspack  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -29781,39 +22974,18 @@ return mspack_create_chm_decompressor ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_mspack_mspack_create_chm_decompressor=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_mspack_mspack_create_chm_decompressor = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5
+$as_echo "$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6; }
+if test "x$ac_cv_lib_mspack_mspack_create_chm_decompressor" = x""yes; then :
   MSPACK_LINK=" -lmspack"
 fi
 
   MSPACK_LINK=" -lmspack"
 fi
 
@@ -29824,9 +22996,7 @@ fi
 fi
 
 if test "$wxUSE_LIBMSPACK" != "no"; then
 fi
 
 if test "$wxUSE_LIBMSPACK" != "no"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBMSPACK 1
-_ACEOF
+    $as_echo "#define wxUSE_LIBMSPACK 1" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -29840,110 +23010,37 @@ TOOLKIT_INCLUDE=
 WIDGET_SET=
 
 if test "$USE_WIN32" = 1 ; then
 WIDGET_SET=
 
 if test "$USE_WIN32" = 1 ; then
-    { echo "$as_me:$LINENO: checking for w32api.h" >&5
-echo $ECHO_N "checking for w32api.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_w32api_h+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 <w32api.h>
+    for ac_header in w32api.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "w32api.h" "ac_cv_header_w32api_h" "
+"
+if test "x$ac_cv_header_w32api_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_W32API_H 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_w32api_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_w32api_h=no
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_w32api_h" >&5
-echo "${ECHO_T}$ac_cv_header_w32api_h" >&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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
 
+done
 
 
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_windows_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_windows_h=no
-fi
+    ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "
+"
+if test "x$ac_cv_header_windows_h" = x""yes; then :
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
 
 else
 
-        { { echo "$as_me:$LINENO: error: please set CFLAGS to contain the location of windows.h" >&5
-echo "$as_me: error: please set CFLAGS to contain the location of windows.h" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error $? "please set CFLAGS to contain the location of windows.h" "$LINENO" 5
 
 fi
 
 
 
 
 fi
 
 
 
-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32"
+    case "${host}" in
+        x86_64-*-mingw32* )
+                                                WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
+        ;;
+    esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     fi
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     fi
@@ -29953,78 +23050,12 @@ fi
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
-        if test "$wxUSE_ODBC" = "sys" ; then
-        wxUSE_ODBC = "yes"
-    fi
-    if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
-    fi
-
-        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
-                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
 
         WIN32INSTALL=win32install
 
         WIN32INSTALL=win32install
-
-        { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_pbt_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_pbt_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-  cat >>confdefs.h <<\_ACEOF
-#define NEED_PBT_H 1
-_ACEOF
-
-fi
-
-
 fi
 
 if test "$wxUSE_GUI" = "yes"; then
 fi
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -30032,25 +23063,24 @@ if test "$wxUSE_GUI" = "yes"; then
 
     GUI_TK_LIBRARY=
 
 
     GUI_TK_LIBRARY=
 
-    WXGTK12=
     WXGTK127=
     WXGTK127=
-    WXGTK20=
+    WXGTK2=
     WXGPE=
 
     WXGPE=
 
-    if test "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
         if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
         if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
-            { echo "$as_me:$LINENO: WARNING: Printing not supported under wxCocoa yet, disabled" >&5
-echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Printing not supported under wxCocoa yet, disabled" >&5
+$as_echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;}
             wxUSE_PRINTING_ARCHITECTURE=no
         fi
         if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
             wxUSE_PRINTING_ARCHITECTURE=no
         fi
         if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
-            { echo "$as_me:$LINENO: WARNING: Drag and Drop not supported under wxCocoa yet, disabled" >&5
-echo "$as_me: WARNING: Drag and Drop not supported under wxCocoa yet, disabled" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Drag and Drop not supported under wxCocoa yet, disabled" >&5
+$as_echo "$as_me: WARNING: Drag and Drop not supported under wxCocoa yet, disabled" >&2;}
             wxUSE_DRAG_AND_DROP=no
         fi
         if test "$wxUSE_DRAGIMAGE" = "yes"; then
             wxUSE_DRAG_AND_DROP=no
         fi
         if test "$wxUSE_DRAGIMAGE" = "yes"; then
-            { echo "$as_me:$LINENO: WARNING: wxDragImage not supported under wxCocoa yet, disabled" >&5
-echo "$as_me: WARNING: wxDragImage not supported under wxCocoa yet, disabled" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDragImage not supported under wxCocoa yet, disabled" >&5
+$as_echo "$as_me: WARNING: wxDragImage not supported under wxCocoa yet, disabled" >&2;}
             wxUSE_DRAGIMAGE=no
         fi
     fi
             wxUSE_DRAGIMAGE=no
         fi
     fi
@@ -30066,17 +23096,17 @@ 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; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ version" >&5
+$as_echo_n "checking for GTK+ version... " >&6; }
 
         gtk_version_cached=1
 
         gtk_version_cached=1
-        if test "${wx_cv_lib_gtk+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        if test "${wx_cv_lib_gtk+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                                                 gtk_version_cached=0
 else
 
                                                 gtk_version_cached=0
-                { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then
 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then
@@ -30094,7 +23124,7 @@ echo "${ECHO_T}" >&6; }
                     esac
 
                     # Check whether --enable-gtktest was given.
                     esac
 
                     # Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
+if test "${enable_gtktest+set}" = set; then :
   enableval=$enable_gtktest;
 else
   enable_gtktest=yes
   enableval=$enable_gtktest;
 else
   enable_gtktest=yes
@@ -30115,10 +23145,10 @@ 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; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -30130,14 +23160,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -30146,11 +23176,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -30167,9 +23197,9 @@ fi
     no_gtk=yes
   fi
 
     no_gtk=yes
   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; }
+  min_gtk_version=2.4.0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
+$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&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
@@ -30200,14 +23230,10 @@ echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
       CFLAGS="$CFLAGS $GTK_CFLAGS"
       LIBS="$GTK_LIBS $LIBS"
       rm -f conf.gtktest
       CFLAGS="$CFLAGS $GTK_CFLAGS"
       LIBS="$GTK_LIBS $LIBS"
       rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
@@ -30238,7 +23264,7 @@ main ()
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If pkg-config was correct, then it is best\n");
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If pkg-config was correct, then it is best\n");
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
       printf("*** required on your system.\n");
       printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
       printf("*** required on your system.\n");
       printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
@@ -30274,7 +23300,7 @@ main ()
         printf("*** being found. The easiest way to fix this is to remove the old version\n");
         printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
         printf("*** correct copy of pkg-config. (In this case, you will have to\n");
         printf("*** being found. The easiest way to fix this is to remove the old version\n");
         printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
         printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
         printf("*** so that the correct libraries are found at run-time))\n");
       }
     }
         printf("*** so that the correct libraries are found at run-time))\n");
       }
     }
@@ -30282,50 +23308,26 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
 
-( exit $ac_status )
-no_gtk=yes
+else
+  no_gtk=yes
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam 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; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+$as_echo "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; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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"
@@ -30338,11 +23340,7 @@ echo "${ECHO_T}no" >&6; }
          ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
          ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
@@ -30356,24 +23354,7 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; 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"
@@ -30384,15 +23365,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
-  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 "*** exact error that occured. This usually means GTK+ is incorrectly installed."
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
@@ -30405,20 +23382,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
   rm -f conf.gtktest
 
 
   rm -f conf.gtktest
 
-
-                                        case "${host}" in
-                        *-*-solaris2* )
-                            if test "$wxUSE_SHARED" != "yes"; then
-                                GTK_LIBS="$GTK_LIBS -lX11"
-                            fi
-                    esac
                 fi
 
                                 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.
                 fi
 
                                 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.
-if test "${with_gtk_prefix+set}" = set; then
+if test "${with_gtk_prefix+set}" = set; then :
   withval=$with_gtk_prefix; gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
   withval=$with_gtk_prefix; gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
@@ -30426,14 +23396,14 @@ fi
 
 
 # Check whether --with-gtk-exec-prefix was given.
 
 
 # Check whether --with-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"
 else
   gtk_config_exec_prefix=""
 fi
 
 # Check whether --enable-gtktest was given.
   withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""
 fi
 
 # Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
+if test "${enable_gtktest+set}" = set; then :
   enableval=$enable_gtktest;
 else
   enable_gtktest=yes
   enableval=$enable_gtktest;
 else
   enable_gtktest=yes
@@ -30464,10 +23434,10 @@ 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; }
-if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GTK_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $GTK_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $GTK_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -30479,14 +23449,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
@@ -30495,17 +23465,17 @@ esac
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
 if test -n "$GTK_CONFIG"; then
 fi
 GTK_CONFIG=$ac_cv_path_GTK_CONFIG
 if test -n "$GTK_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5
+$as_echo "$GTK_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   min_gtk_version=1.2.7
 fi
 
 
   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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5
+$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; }
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -30524,14 +23494,10 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
       CFLAGS="$CFLAGS $GTK_CFLAGS"
       LIBS="$GTK_LIBS $LIBS"
       rm -f conf.gtktest
       CFLAGS="$CFLAGS $GTK_CFLAGS"
       LIBS="$GTK_LIBS $LIBS"
       rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
@@ -30562,7 +23528,7 @@ main ()
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If gtk-config was correct, then it is best\n");
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If gtk-config was correct, then it is best\n");
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
       printf("*** required on your system.\n");
       printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
       printf("*** required on your system.\n");
       printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
@@ -30601,7 +23567,7 @@ main ()
         printf("*** being found. The easiest way to fix this is to remove the old version\n");
         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
         printf("*** correct copy of gtk-config. (In this case, you will have to\n");
         printf("*** being found. The easiest way to fix this is to remove the old version\n");
         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
         printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
         printf("*** so that the correct libraries are found at run-time))\n");
       }
     }
         printf("*** so that the correct libraries are found at run-time))\n");
       }
     }
@@ -30609,50 +23575,298 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  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;;
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  no_gtk=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     wx_cv_lib_gtk=1.2.7
+  else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int
+main ()
+{
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; 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 "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+         echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel"
+else
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. 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$ac_exeext conftest.$ac_ext
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     :
+  fi
+
+
+  rm -f conf.gtktest
+
+
+                        if test -z "$wx_cv_lib_gtk"; then
+
+# Check whether --with-gtk-prefix was given.
+if test "${with_gtk_prefix+set}" = set; then :
+  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
+else
+  gtk_config_prefix=""
+fi
+
+
+# Check whether --with-gtk-exec-prefix was given.
+if test "${with_gtk_exec_prefix+set}" = set; then :
+  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
+else
+  gtk_config_exec_prefix=""
+fi
+
+# Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then :
+  enableval=$enable_gtktest;
+else
+  enable_gtktest=yes
+fi
+
+
+  for module in . $GTK_MODULES
+  do
+      case "$module" in
+         gthread)
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  # Extract the first word of "gtk-config", so it can be a program name with args.
+set dummy gtk-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GTK_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTK_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$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
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+fi
+GTK_CONFIG=$ac_cv_path_GTK_CONFIG
+if test -n "$GTK_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5
+$as_echo "$GTK_CONFIG" >&6; }
 else
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  min_gtk_version=1.2.3
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5
+$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; }
+  no_gtk=""
+  if test "$GTK_CONFIG" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+      rm -f conf.gtktest
+      if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If gtk-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    }
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+          (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+            GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+            gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+              major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
 
 
-( exit $ac_status )
-no_gtk=yes
+else
+  no_gtk=yes
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam 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; }
-     wx_cv_lib_gtk=1.2.7
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     wx_cv_lib_gtk=1.2.3
   else
   else
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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"
@@ -30665,11 +23879,7 @@ echo "${ECHO_T}no" >&6; }
           echo "*** Could not run GTK test program, checking why..."
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           echo "*** Could not run GTK test program, checking why..."
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
 /* end confdefs.h.  */
 
 #include <gtk/gtk.h>
@@ -30683,24 +23893,7 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; 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"
@@ -30716,17 +23909,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
           echo "***"
           echo "***    rpm --erase --nodeps gtk gtk-devel"
 else
           echo "***"
           echo "***    rpm --erase --nodeps gtk gtk-devel"
 else
-  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 "*** exact error that occured. This usually means GTK was incorrectly installed"
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. 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 "*** 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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
@@ -30739,681 +23928,1111 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
   rm -f conf.gtktest
 
 
   rm -f conf.gtktest
 
+                        fi
+                    fi
+                fi
 
 
-                        if test -z "$wx_cv_lib_gtk"; then
+                if test -z "$wx_cv_lib_gtk"; then
+                                        wx_cv_lib_gtk=none
+                else
+                                        GTK_LIBS="$GTK_LIBS -lX11"
+
+                                                            wx_cv_cflags_gtk=$GTK_CFLAGS
+                    wx_cv_libs_gtk=$GTK_LIBS
+                fi
+
+
+fi
+
+
+                        if test "$gtk_version_cached" = 1; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gtk" >&5
+$as_echo "$wx_cv_lib_gtk" >&6; }
+        fi
+
+        case "$wx_cv_lib_gtk" in
+            2.0)    WXGTK2=1
+                    TOOLKIT_VERSION=2
+                    ;;
+            1.2.7)  WXGTK127=1
+                    ;;
+            1.2*) ;;
+            *)      as_fn_error $? "
+The development files for GTK+ were not found. For GTK+ 2, please
+ensure that pkg-config is in the path and that gtk+-2.0.pc is
+installed. For GTK+ 1.2 please check that gtk-config is in the path,
+and that the version is 1.2.3 or above. Also check that the
+libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+--libs' are in the LD_LIBRARY_PATH or equivalent.
+                            " "$LINENO" 5
+                    ;;
+        esac
+
+        if test "$WXGTK2" = 1; then
+            save_CFLAGS="$CFLAGS"
+            save_LIBS="$LIBS"
+            CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
+            LIBS="$LIBS $wx_cv_libs_gtk"
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.18" >&5
+$as_echo_n "checking if GTK+ is version >= 2.18... " >&6; }
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                            #include <gtk/gtk.h>
+
+int
+main ()
+{
+
+                            #if !GTK_CHECK_VERSION(2,18,0)
+                            Not GTK+ 2.18
+                            #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                            $as_echo "#define __WXGTK218__ 1" >>confdefs.h
+
+                            $as_echo "#define __WXGTK210__ 1" >>confdefs.h
+
+                            $as_echo "#define __WXGTK26__ 1" >>confdefs.h
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                            ac_wxgtk218=1
 
 
-# Check whether --with-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval=$with_gtk_prefix; gtk_config_prefix="$withval"
 else
 else
-  gtk_config_prefix=""
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                            ac_wxgtk218=0
+
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+            if test "$ac_wxgtk218" = 0; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.10" >&5
+$as_echo_n "checking if GTK+ is version >= 2.10... " >&6; }
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
+                                #include <gtk/gtk.h>
+
+int
+main ()
+{
+
+                                #if !GTK_CHECK_VERSION(2,10,0)
+                                Not GTK+ 2.10
+                                #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                                $as_echo "#define __WXGTK210__ 1" >>confdefs.h
+
+                                $as_echo "#define __WXGTK26__ 1" >>confdefs.h
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                                ac_wxgtk210=1
 
 
-# Check whether --with-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"
 else
 else
-  gtk_config_exec_prefix=""
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                                ac_wxgtk210=0
+
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+                if test "$ac_wxgtk210" = 0; then
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.6" >&5
+$as_echo_n "checking if GTK+ is version >= 2.6... " >&6; }
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                                    #include <gtk/gtk.h>
+
+int
+main ()
+{
+
+                                    #if !GTK_CHECK_VERSION(2,6,0)
+                                    Not GTK+ 2.6
+                                    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                                    $as_echo "#define __WXGTK26__ 1" >>confdefs.h
+
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                                    ac_wxgtk26=1
 
 
-# Check whether --enable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval=$enable_gtktest;
 else
 else
-  enable_gtktest=yes
+
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                                    ac_wxgtk26=0
+
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                fi
+            fi
 
 
+            CFLAGS="$save_CFLAGS"
+            LIBS="$save_LIBS"
+        else
+            if test "$wxUSE_UNICODE" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unicode configuration not supported with GTK+ 1.x" >&5
+$as_echo "$as_me: WARNING: Unicode configuration not supported with GTK+ 1.x" >&2;}
+                wxUSE_UNICODE=no
+            fi
 
 
-  for module in . $GTK_MODULES
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_im_open in -lgdk" >&5
+$as_echo_n "checking for gdk_im_open in -lgdk... " >&6; }
+if test "${ac_cv_lib_gdk_gdk_im_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgdk  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdk_im_open ();
+int
+main ()
+{
+return gdk_im_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gdk_gdk_im_open=yes
+else
+  ac_cv_lib_gdk_gdk_im_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_gdk_im_open" >&5
+$as_echo "$ac_cv_lib_gdk_gdk_im_open" >&6; }
+if test "x$ac_cv_lib_gdk_gdk_im_open" = x""yes; then :
+  $as_echo "#define HAVE_XIM 1" >>confdefs.h
+
+fi
+
+
+                                    if test "$USE_DARWIN" != 1; then
+                for ac_func in poll
+do :
+  ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+if test "x$ac_cv_func_poll" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_POLL 1
+_ACEOF
+
+fi
+done
+
+            fi
+        fi
+
+        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
+        AFMINSTALL=afminstall
+        TOOLKIT=GTK
+        GUIDIST=GTK_DIST
+
+                if test "$wxUSE_GPE" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpewidget library" >&5
+$as_echo_n "checking for gpewidget library... " >&6; }
+
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
   do
   do
-      case "$module" in
-         gthread)
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libgpewidget.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
   done
 
   done
 
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
+            if test "$ac_find_libraries" != "" ; then
+
+    if test "$ac_find_libraries" = "default location"; then
+    ac_path_to_link=""
+  else
+    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi
   fi
   fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
+
+                                                GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
+                WXGPE=1
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5
+$as_echo "found in $ac_find_libraries" >&6; }
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+            fi
+
+                                                                                                                    fi
+    fi
+
+    if test "$wxUSE_DFB" = 1; then
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$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
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$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
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
+
+fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
+$as_echo_n "checking for DIRECTFB... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DIRECTFB_CFLAGS"; then
+        pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.23" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DIRECTFB_LIBS"; then
+        pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.23" 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
+               DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= 0.9.23"`
+        else
+               DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= 0.9.23"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$DIRECTFB_PKG_ERRORS" >&5
+
+
+                           as_fn_error $? "DirectFB not found." "$LINENO" 5
+
+
+elif test $pkg_failed = untried; then
+
+                           as_fn_error $? "DirectFB not found." "$LINENO" 5
+
+
+else
+       DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
+       DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                           wxUSE_UNIVERSAL="yes"
+                           TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"
+                           GUI_TK_LIBRARY="$DIRECTFB_LIBS"
+                           TOOLKIT=DFB
+                           GUIDIST=DFB_DIST
+
+fi
+    fi
+
+    if test "$wxUSE_MICROWIN" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MicroWindows" >&5
+$as_echo_n "checking for MicroWindows... " >&6; }
+        if test "x$MICROWINDOWS" = x ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+            as_fn_error $? "Cannot find MicroWindows library. Make sure MICROWINDOWS is set." "$LINENO" 5
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MICROWINDOWS" >&5
+$as_echo "$MICROWINDOWS" >&6; }
+        fi
+
+        if test -f $MICROWINDOWS/lib/libmwin.a; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: MicroWindows' libraries found." >&5
+$as_echo "MicroWindows' libraries found." >&6; }
+        else
+            as_fn_error $? "Cannot find MicroWindows libraries, make sure they are compiled." "$LINENO" 5
+        fi
+
+        TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"
+        GUI_TK_LIBRARY="-L$MICROWINDOWS/lib -lmwin -lmwengine -mwfonts -mwdrivers -mwinlib"
+
+        wxUSE_UNIVERSAL="yes"
+
+        AFMINSTALL=afminstall
+        TOOLKIT=MICROWIN
+        GUIDIST=MICROWIN_DIST
+
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1"
+    fi
+
+        if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
+
+
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+  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
+  case $x_includes,$x_libraries in #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+if mkdir conftest.dir; then
+  cd conftest.dir
+  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
+    # 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
+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+    for ac_extension in a so sl dylib la dll; do
+      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
+    # Screen out bogus values from the imake configuration.  They are
+    # 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= ;;
+       *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+    esac
+    case $ac_im_usrlibdir in
+       /usr/lib | /usr/lib64 | /lib | /lib64) ;;
+       *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+    esac
+  fi
+  cd ..
+  rm -f -r conftest.dir
+fi
+
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R7/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+
+/usr/include/X11
+/usr/include/X11R7
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+
+/usr/local/X11/include
+/usr/local/X11R7/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+
+/usr/local/include/X11
+/usr/local/include/X11R7
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
+if test "$ac_x_includes" = no; then
+  # Guess where to find include files, by looking for Xlib.h.
+  # First, try using that file with no special directory specified.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <X11/Xlib.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # We can compile using X headers with no special include directory.
+ac_x_includes=
+else
+  for ac_dir in $ac_x_header_dirs; do
+  if test -r "$ac_dir/X11/Xlib.h"; then
+    ac_x_includes=$ac_dir
+    break
   fi
   fi
+done
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+fi # $ac_x_includes = no
 
 
-  # 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; }
-if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "$ac_x_libraries" = no; then
+  # Check for the libraries.
+  # See if we find them without any special options.
+  # Don't add to $LIBS permanently.
+  ac_save_LIBS=$LIBS
+  LIBS="-lX11 $LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <X11/Xlib.h>
+int
+main ()
+{
+XrmInitialize ()
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
+ac_x_libraries=
 else
 else
-  case $GTK_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
 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_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
+  # Don't even attempt the hair of trying to link an X program!
+  for ac_extension in a so sl dylib la dll; do
+    if test -r "$ac_dir/libX11.$ac_extension"; then
+      ac_x_libraries=$ac_dir
+      break 2
+    fi
+  done
 done
 done
-IFS=$as_save_IFS
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi # $ac_x_libraries = no
 
 
-  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="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
 fi
 esac
 fi
-GTK_CONFIG=$ac_cv_path_GTK_CONFIG
-if test -n "$GTK_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6; }
+;; #(
+    *) have_x=yes;;
+  esac
+  eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
+  no_x=yes
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  # 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'"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
 fi
 
+if test "$no_x" = yes; then
+  # Not all programs may use this symbol, but it does not hurt to define it.
 
 
-  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; }
-  no_gtk=""
-  if test "$GTK_CONFIG" = "no" ; then
-    no_gtk=yes
-  else
-    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
-    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
-    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
-           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-      rm -f conf.gtktest
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+
+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  if test -n "$x_includes"; then
+    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  fi
 
 
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
+  # It would also be nice to do this for all -L options, not just this one.
+  if test -n "$x_libraries"; then
+    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 . . . .
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+$as_echo_n "checking whether -R must be followed by a space... " >&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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 int
 main ()
 {
 
 int
 main ()
 {
-  int major, minor, micro;
-  char *tmp_version;
 
 
-  system ("touch conf.gtktest");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       X_LIBS="$X_LIBS -R$x_libraries"
+else
+  LIBS="$ac_xsave_LIBS -R $x_libraries"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
+int
+main ()
+{
 
 
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If gtk-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-      printf("*** before re-running configure\n");
-    }
-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-          (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-            GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-            gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-#endif /* defined (GTK_MAJOR_VERSION) ... */
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-              major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
+  ;
+  return 0;
 }
 }
-
 _ACEOF
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+         X_LIBS="$X_LIBS -R $x_libraries"
 else
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-no_gtk=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+$as_echo "neither works" >&6; }
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    ac_c_werror_flag=$ac_xsave_c_werror_flag
+    LIBS=$ac_xsave_LIBS
+  fi
 
 
+  # Check for system-dependent libraries X programs must link with.
+  # Do this before checking for the system-independent R6 libraries
+  # (-lICE), since we may need -lsocket or whatever for X linking.
 
 
-       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; }
-     wx_cv_lib_gtk=1.2.3
+  if test "$ISC" = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
   else
   else
-     { 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"
-       echo "*** your path, or set the GTK_CONFIG environment variable to the"
-       echo "*** full path to gtk-config."
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK test program, checking why..."
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    # Martyn Johnson says this is needed for Ultrix, if the X
+    # libraries were built with DECnet support.  And Karl Berry says
+    # the Alpha needs dnet_stub (dnet does not exist).
+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-#include <gtk/gtk.h>
-#include <stdio.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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XOpenDisplay ();
 int
 main ()
 {
 int
 main ()
 {
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+return XOpenDisplay ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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 "*** 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 "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-         echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
-          echo "***"
-          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
-          echo "*** came with the system with the command"
-          echo "***"
-          echo "***    rpm --erase --nodeps gtk gtk-devel"
+if ac_fn_c_try_link "$LINENO"; then :
+
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
-        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"
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
+int
+main ()
+{
+return dnet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dnet_dnet_ntoa=yes
+else
+  ac_cv_lib_dnet_dnet_ntoa=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     :
-  fi
-
-
-  rm -f conf.gtktest
-
-                        fi
-                    fi
-                fi
-
-                if test -z "$wx_cv_lib_gtk"; then
-                                        wx_cv_lib_gtk=none
-                else
-                                                            wx_cv_cflags_gtk=$GTK_CFLAGS
-                    wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[^ ]*cairo[^ ]*//g'`
-                fi
-
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
 fi
 
-
-                        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; }
-        fi
-
-        case "$wx_cv_lib_gtk" in
-            2.0)    WXGTK20=1
-                    TOOLKIT_VERSION=2
-                    ;;
-            1.2.7)  WXGTK127=1
-                    WXGTK12=1
-                    ;;
-            1.2.3)  WXGTK12=1
-                    ;;
-            *)      { { echo "$as_me:$LINENO: error:
-The development files for GTK+ were not found. For GTK+ 2, please
-ensure that pkg-config is in the path and that gtk+-2.0.pc is
-installed. For GTK+ 1.2 please check that gtk-config is in the path,
-and that the version is 1.2.3 or above. Also check that the
-libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
---libs' are in the LD_LIBRARY_PATH or equivalent.
-                            " >&5
-echo "$as_me: error:
-The development files for GTK+ were not found. For GTK+ 2, please
-ensure that pkg-config is in the path and that gtk+-2.0.pc is
-installed. For GTK+ 1.2 please check that gtk-config is in the path,
-and that the version is 1.2.3 or above. Also check that the
-libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
---libs' are in the LD_LIBRARY_PATH or equivalent.
-                            " >&2;}
-   { (exit 1); exit 1; }; }
-                    ;;
-        esac
-
-        if test "$WXGTK20" = 1; then
-            save_CFLAGS="$CFLAGS"
-            save_LIBS="$LIBS"
-            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; }
-if test "${ac_cv_have_decl_gtk_icon_size_lookup+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet_stub  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-#include <gtk/gtk.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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
 int
 main ()
 {
 int
 main ()
 {
-#ifndef gtk_icon_size_lookup
-  (void) gtk_icon_size_lookup;
-#endif
-
+return dnet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_have_decl_gtk_icon_size_lookup=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
 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_lib_dnet_stub_dnet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
 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; }
-if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LIBS="$ac_xsave_LIBS"
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1
-_ACEOF
+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+    # to get the SysV transport functions.
+    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # needs -lnsl.
+    # The nsl library prevents programs from opening the X display
+    # 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.
+    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
 
 
+fi
 
 
+    if test $ac_cv_func_gethostbyname = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0
-_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
-cat >>confdefs.h <<\_ACEOF
-#define NEED_GTK_ICON_SIZE_LOOKUP 1
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+  ;
+  return 0;
+}
 _ACEOF
 _ACEOF
-
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_nsl_gethostbyname=yes
+else
+  ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
 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; }
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      if test $ac_cv_lib_nsl_gethostbyname = no; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                            #include <gtk/gtk.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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
 int
 main ()
 {
 int
 main ()
 {
-
-                            #if !GTK_CHECK_VERSION(2,10,0)
-                            Not GTK+ 2.10
-                            #endif
-
+return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-
-                            cat >>confdefs.h <<\_ACEOF
-#define __WXGTK210__ 1
-_ACEOF
-
-                            cat >>confdefs.h <<\_ACEOF
-#define __WXGTK26__ 1
-_ACEOF
-
-                            cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
-_ACEOF
-
-                            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                            ac_wxgtk210=1
-
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_bsd_gethostbyname=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_lib_bsd_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+fi
 
 
+      fi
+    fi
 
 
-                            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                            ac_wxgtk210=0
+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
+    # socket/setsockopt and other routines are undefined under SCO ODT
+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+    # on later versions), says Simon Leinen: it contains gethostby*
+    # 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.
+    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
 
 fi
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-            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; }
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    if test $ac_cv_func_connect = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                                #include <gtk/gtk.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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char connect ();
 int
 main ()
 {
 int
 main ()
 {
-
-                                #if !GTK_CHECK_VERSION(2,6,0)
-                                Not GTK+ 2.6
-                                #endif
-
+return connect ();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-
-                                cat >>confdefs.h <<\_ACEOF
-#define __WXGTK26__ 1
-_ACEOF
-
-                                cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
-_ACEOF
-
-                                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                                ac_wxgtk26=1
-
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_socket_connect=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_lib_socket_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+fi
 
 
+    fi
 
 
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                                ac_wxgtk26=0
+    # Guillermo Gomez says -lposix is necessary on A/UX.
+    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
 
 fi
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-            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; }
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    if test $ac_cv_func_remove = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lposix  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                                #include <gtk/gtk.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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char remove ();
 int
 main ()
 {
 int
 main ()
 {
-
-                                #if !GTK_CHECK_VERSION(2,4,0)
-                                Not GTK+ 2.4
-                                #endif
-
+return remove ();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-
-                                cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
-_ACEOF
-
-                                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_posix_remove=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_lib_posix_remove=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+fi
 
 
+    fi
 
 
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
 
 fi
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-            fi
-
-            CFLAGS="$save_CFLAGS"
-            LIBS="$save_LIBS"
-        else
-            if test "$wxUSE_UNICODE" = "yes"; then
-                { echo "$as_me:$LINENO: WARNING: Unicode configuration not supported with GTK+ 1.x" >&5
-echo "$as_me: WARNING: Unicode configuration not supported with GTK+ 1.x" >&2;}
-                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; }
-if test "${ac_cv_lib_gdk_gdk_im_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test $ac_cv_func_shmat = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgdk  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lipc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -31422,87 +25041,51 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdk_im_open ();
+char shmat ();
 int
 main ()
 {
 int
 main ()
 {
-return gdk_im_open ();
+return shmat ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_gdk_gdk_im_open=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ipc_shmat=yes
 else
 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_ipc_shmat=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_gdk_gdk_im_open = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_XIM 1
-_ACEOF
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
 fi
 
+    fi
+  fi
 
 
-                                    if test "$USE_DARWIN" != 1; then
-
-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 $ECHO_N "(cached) $ECHO_C" >&6
+  # Check for libraries that X11R6 Xt/Xaw programs need.
+  ac_save_LDFLAGS=$LDFLAGS
+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+  # check for ICE first), but we must link in the order -lSM -lICE or
+  # we get undefined symbols.  So assume we have SM if we have ICE.
+  # 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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* 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 GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -31510,199 +25093,73 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-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
-#endif
-
+char IceConnectionNumber ();
 int
 main ()
 {
 int
 main ()
 {
-return $ac_func ();
+return IceConnectionNumber ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ICE_IceConnectionNumber=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
+  ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 fi
-done
-
-            fi
-        fi
 
 
-        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
-        GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
+  LDFLAGS=$ac_save_LDFLAGS
 
 
-        AFMINSTALL=afminstall
-        TOOLKIT=GTK
-        GUIDIST=GTK_DIST
+fi
 
 
-                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; }
 
 
-  ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libgpewidget.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+        if test "$no_x" = "yes"; then
+          as_fn_error $? "X11 not found, please use --x-includes and/or --x-libraries options (see config.log for details)" "$LINENO" 5
+        fi
 
 
-            if test "$ac_find_libraries" != "" ; then
+                                GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
+        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
+        AFMINSTALL=afminstall
+        COMPILED_X_PROGRAM=0
 
 
-    if test "$ac_find_libraries" = "default location"; then
-    ac_path_to_link=""
-  else
-    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_link=""
-    else
-      ac_path_to_link=" -L$ac_find_libraries"
     fi
     fi
-  fi
 
 
-                                                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; }
+    if test "$wxUSE_X11" = 1; then
+        if test "$wxUSE_NANOX" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MicroWindows/NanoX distribution" >&5
+$as_echo_n "checking for MicroWindows/NanoX distribution... " >&6; }
+            if test "x$MICROWIN" = x ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+                as_fn_error $? "Cannot find MicroWindows library. Make sure MICROWIN is set." "$LINENO" 5
             else
             else
-                { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-            fi
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MICROWIN" >&5
+$as_echo "$MICROWIN" >&6; }
+                $as_echo "#define wxUSE_NANOX 1" >>confdefs.h
 
 
-                                                                                                                    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; }
-        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: 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; }
-        fi
-
-        { 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
-                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
-              else
-                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
-              fi
-              ;;
-            *-pc-msdosdjgpp )
-              mgl_os_candidates="dos32/dj2"
-              ;;
-            *)
-              { { echo "$as_me:$LINENO: error: This system type ${host} is not yet supported by wxMGL." >&5
-echo "$as_me: error: This system type ${host} is not yet supported by wxMGL." >&2;}
-   { (exit 1); exit 1; }; }
-        esac
-
-        mgl_lib_type=""
-        mgl_os=""
-
-        for mgl_os_i in $mgl_os_candidates ; do
-            if test "x$mgl_os" = x ; then
-                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=debug
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-                if test "x$mgl_lib_type" = x ; then
-                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=release
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
             fi
             fi
-        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: 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
         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; }
-
-        wxUSE_UNIVERSAL="yes"
-
-        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
-        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
 
 
-        AFMINSTALL=afminstall
-        TOOLKIT=MGL
-        GUIDIST=MGL_DIST
-    fi
-
-    if test "$wxUSE_DFB" = 1; then
+        if test "$wxUSE_UNICODE" = "yes"; then
 
 
 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 "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
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -31714,14 +25171,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
 IFS=$as_save_IFS
 
   ;;
@@ -31729,11 +25186,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -31742,10 +25199,10 @@ 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
   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; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -31757,14 +25214,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
 IFS=$as_save_IFS
 
   ;;
@@ -31772,11 +25229,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -31784,12 +25241,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -31801,14 +25254,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; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&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; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
        else
        else
-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                PKG_CONFIG=""
        fi
 
                PKG_CONFIG=""
        fi
 
@@ -31816,20 +25269,20 @@ fi
 
 
 pkg_failed=no
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for DIRECTFB" >&5
-echo $ECHO_N "checking for DIRECTFB... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOX" >&5
+$as_echo_n "checking for PANGOX... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$DIRECTFB_CFLAGS"; then
-        pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
+    if test -n "$PANGOX_CFLAGS"; then
+        pkg_cv_PANGOX_CFLAGS="$PANGOX_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\"") >&5
-  ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangox\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangox") 2>&5
   ac_status=$?
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.23" 2>/dev/null`
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -31838,16 +25291,16 @@ else
        pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
        pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$DIRECTFB_LIBS"; then
-        pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
+    if test -n "$PANGOX_LIBS"; then
+        pkg_cv_PANGOX_LIBS="$PANGOX_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\"") >&5
-  ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangox\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangox") 2>&5
   ac_status=$?
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.23" 2>/dev/null`
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANGOX_LIBS=`$PKG_CONFIG --libs "pangox" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -31866,797 +25319,441 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= 0.9.23"`
+               PANGOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangox"`
         else
         else
-               DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= 0.9.23"`
+               PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"`
         fi
        # Put the nasty error message in config.log where it belongs
         fi
        # Put the nasty error message in config.log where it belongs
-       echo "$DIRECTFB_PKG_ERRORS" >&5
+       echo "$PANGOX_PKG_ERRORS" >&5
 
 
 
 
-                           { { echo "$as_me:$LINENO: error: DirectFB not found." >&5
-echo "$as_me: error: DirectFB not found." >&2;}
-   { (exit 1); exit 1; }; }
+                    as_fn_error $? "pangox library not found, library cannot be compiled in Unicode mode" "$LINENO" 5
 
 
 elif test $pkg_failed = untried; then
 
 
 
 elif test $pkg_failed = untried; then
 
-                           { { echo "$as_me:$LINENO: error: DirectFB not found." >&5
-echo "$as_me: error: DirectFB not found." >&2;}
-   { (exit 1); exit 1; }; }
+                    as_fn_error $? "pangox library not found, library cannot be compiled in Unicode mode" "$LINENO" 5
 
 
 else
 
 
 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; }
+       PANGOX_CFLAGS=$pkg_cv_PANGOX_CFLAGS
+       PANGOX_LIBS=$pkg_cv_PANGOX_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-                           wxUSE_UNIVERSAL="yes"
-                           TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"
-                           GUI_TK_LIBRARY="$DIRECTFB_LIBS"
-                           TOOLKIT=DFB
-                           GUIDIST=DFB_DIST
+                    CFLAGS="$PANGOX_CFLAGS $CFLAGS"
+                    CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
 
 fi
 
 fi
-    fi
-
-    if test "$wxUSE_MICROWIN" = 1; then
-        { echo "$as_me:$LINENO: checking for MicroWindows" >&5
-echo $ECHO_N "checking for MicroWindows... $ECHO_C" >&6; }
-        if test "x$MICROWINDOWS" = x ; then
-            { 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: result: $MICROWINDOWS" >&5
-echo "${ECHO_T}$MICROWINDOWS" >&6; }
-        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; }
-        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;}
-   { (exit 1); exit 1; }; }
-        fi
-
-        TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"
-        GUI_TK_LIBRARY="-L$MICROWINDOWS/lib -lmwin -lmwengine -mwfonts -mwdrivers -mwinlib"
 
 
-        wxUSE_UNIVERSAL="yes"
-
-        AFMINSTALL=afminstall
-        TOOLKIT=MICROWIN
-        GUIDIST=MICROWIN_DIST
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOFT2" >&5
+$as_echo_n "checking for PANGOFT2... " >&6; }
 
 
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1"
+if test -n "$PKG_CONFIG"; then
+    if test -n "$PANGOFT2_CFLAGS"; then
+        pkg_cv_PANGOFT2_CFLAGS="$PANGOFT2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$PANGOFT2_LIBS"; then
+        pkg_cv_PANGOFT2_LIBS="$PANGOFT2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoft2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
     fi
     fi
+else
+       pkg_failed=untried
+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; }
 
 
 
 
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then
-  withval=$with_x;
-fi
+if test $pkg_failed = yes; then
 
 
-# $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
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
 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
-if mkdir conftest.dir; then
-  cd conftest.dir
-  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
-    # 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
-    # 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
-       ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # 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= ;;
-       *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-       /usr/lib | /lib) ;;
-       *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -f -r conftest.dir
+        _pkg_short_errors_supported=no
 fi
 fi
+        if test $_pkg_short_errors_supported = yes; then
+               PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangoft2"`
+        else
+               PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$PANGOFT2_PKG_ERRORS" >&5
 
 
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
 
 
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5
+$as_echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;}
+                    wxUSE_PRINTING_ARCHITECTURE="no"
 
 
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
 
 
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
+elif test $pkg_failed = untried; then
 
 
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5
+$as_echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;}
+                    wxUSE_PRINTING_ARCHITECTURE="no"
 
 
-/usr/openwin/include
-/usr/openwin/share/include'
 
 
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
-  # First, try using that file with no special directory specified.
-  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>
-_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
-  ac_status=$?
-  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
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+       PANGOFT2_CFLAGS=$pkg_cv_PANGOFT2_CFLAGS
+       PANGOFT2_LIBS=$pkg_cv_PANGOFT2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                    CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
+                    CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
 
 
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
 fi
 
 fi
 
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOXFT" >&5
+$as_echo_n "checking for PANGOXFT... " >&6; }
 
 
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lX11 $LIBS"
-  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>
-int
-main ()
-{
-XrmInitialize ()
-  ;
-  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 test -n "$PKG_CONFIG"; then
+    if test -n "$PANGOXFT_CFLAGS"; then
+        pkg_cv_PANGOXFT_CFLAGS="$PANGOXFT_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangoxft") 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
-  (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
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft" 2>/dev/null`
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       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
-    if test -r "$ac_dir/libX11.$ac_extension"; then
-      ac_x_libraries=$ac_dir
-      break 2
+  pkg_failed=yes
+fi
     fi
     fi
-  done
-done
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$PANGOXFT_LIBS"; then
+        pkg_cv_PANGOXFT_LIBS="$PANGOXFT_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pangoxft\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "pangoxft") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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
-fi
-;; #(
-    *) have_x=yes;;
-  esac
-  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; }
-  no_x=yes
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
 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; }
+        _pkg_short_errors_supported=no
 fi
 fi
+        if test $_pkg_short_errors_supported = yes; then
+               PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangoxft"`
+        else
+               PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$PANGOXFT_PKG_ERRORS" >&5
 
 
-if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
 
 
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5
+$as_echo "$as_me: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&2;}
 
 
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
 
 
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+elif test $pkg_failed = untried; then
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5
+$as_echo "$as_me: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&2;}
 
 
-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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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"
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+       PANGOXFT_CFLAGS=$pkg_cv_PANGOXFT_CFLAGS
+       PANGOXFT_LIBS=$pkg_cv_PANGOXFT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-       LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+                    $as_echo "#define HAVE_PANGO_XFT 1" >>confdefs.h
 
 
-int
-main ()
-{
+                    CFLAGS="$PANGOXFT_CFLAGS $CFLAGS"
+                    CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
 
 
-  ;
-  return 0;
-}
+fi
+            save_LIBS="$LIBS"
+            LIBS="$LIBS $PANGOX_LIBS"
+            for ac_func in pango_font_family_is_monospace
+do :
+  ac_fn_c_check_func "$LINENO" "pango_font_family_is_monospace" "ac_cv_func_pango_font_family_is_monospace"
+if test "x$ac_cv_func_pango_font_family_is_monospace" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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"
-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
 fi
+done
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
+            LIBS="$save_LIBS"
+        fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-    ac_c_werror_flag=$ac_xsave_c_werror_flag
-    LIBS=$ac_xsave_LIBS
-  fi
+        wxUSE_UNIVERSAL="yes"
 
 
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
+        if test "$wxUSE_NANOX" = "yes"; then
+            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
+        else
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
+        fi
 
 
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+        TOOLKIT=X11
+        GUIDIST=X11_DIST
+    fi
+
+    if test "$wxUSE_MOTIF" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif headers" >&5
+$as_echo_n "checking for Motif/Lesstif headers... " >&6; }
+
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE /usr/include
+  do
+    if test -f "$ac_dir/Xm/Xm.h"; then
+      ac_find_includes=$ac_dir
+      break
+    fi
+  done
+
+        if test "$ac_find_includes" != "" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5
+$as_echo "found in $ac_find_includes" >&6; }
+
+    if test "x$ac_find_includes" = "x/usr/include"; then
+    ac_path_to_include=""
   else
   else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+    echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_include=""
+    else
+      ac_path_to_include=" -I$ac_find_includes"
+    fi
+  fi
 
 
-/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
+        else
+            save_CFLAGS=$CFLAGS
+            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
 
 
-       { 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
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
+                    #include <Xm/Xm.h>
+
 int
 main ()
 {
 int
 main ()
 {
-return dnet_ntoa ();
+
+                    int version;
+                    version = xmUseVersion;
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_dnet_dnet_ntoa=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5
+$as_echo "found in default search path" >&6; }
+                    COMPILED_X_PROGRAM=1
+
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_lib_dnet_dnet_ntoa=no
-fi
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                    as_fn_error $? "please set CPPFLAGS to contain the location of Xm/Xm.h" "$LINENO" 5
+
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-    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; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+            CFLAGS=$save_CFLAGS
+        fi
 
 
-/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif library" >&5
+$as_echo_n "checking for Motif/Lesstif library... " >&6; }
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libXm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
 
 
-    fi
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_xsave_LIBS"
+        if test "x$ac_find_libraries" != "x" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5
+$as_echo "found in $ac_find_libraries" >&6; }
 
 
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # 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; }
-if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
 
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+    if test "$ac_find_libraries" = "default location"; then
+    ac_path_to_link=""
+  else
+    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi
+  fi
 
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+        else
+                                                save_CFLAGS=$CFLAGS
+            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+            save_LIBS="$LIBS"
+            LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
 
 
-#undef gethostbyname
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
+                    #include <Xm/Xm.h>
 
 int
 main ()
 {
 
 int
 main ()
 {
-return gethostbyname ();
+
+                    int version;
+                    version = xmUseVersion;
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_gethostbyname=yes
+if ac_fn_c_try_link "$LINENO"; then :
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5
+$as_echo "found in default search path" >&6; }
+                    COMPILED_X_PROGRAM=1
+
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_func_gethostbyname=no
-fi
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                    as_fn_error $? "please set LDFLAGS to contain the location of libXm" "$LINENO" 5
+
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
-    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; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            CFLAGS=$save_CFLAGS
+            LIBS="$save_LIBS"
+        fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need -lXp and/or -lSM -lICE" >&5
+$as_echo_n "checking if we need -lXp and/or -lSM -lICE... " >&6; }
+        libp_link=""
+        libsm_ice_link=""
+        libs_found=0
+        for libp in "" " -lXp"; do
+            if test "$libs_found" = 0; then
+                for libsm_ice in "" " -lSM -lICE"; do
+                    if test "$libs_found" = 0; then
+                        save_LIBS="$LIBS"
+                        LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
+                        save_CFLAGS=$CFLAGS
+                        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
+                                #include <Xm/Xm.h>
+                                #include <Xm/List.h>
+
 int
 main ()
 {
 int
 main ()
 {
-return gethostbyname ();
+
+                                XmString string = NULL;
+                                Widget w = NULL;
+                                int position = 0;
+                                XmListAddItem(w, string, position);
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_nsl_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
 
 
-       ac_cv_lib_nsl_gethostbyname=no
-fi
+                                libp_link="$libp"
+                                libsm_ice_link="$libsm_ice"
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: need${libp_link}${libsm_ice_link}" >&5
+$as_echo "need${libp_link}${libsm_ice_link}" >&6; }
+                                libs_found=1
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
-      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; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                        LIBS="$save_LIBS"
+                        CFLAGS=$save_CFLAGS
+                    fi
+                done
+            fi
+        done
+
+        if test "$libs_found" = 0; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find the right libraries" >&5
+$as_echo "can't find the right libraries" >&6; }
+            as_fn_error $? "can't link a simple motif program" "$LINENO" 5
+        fi
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SgCreateList in -lSgm" >&5
+$as_echo_n "checking for SgCreateList in -lSgm... " >&6; }
+if test "${ac_cv_lib_Sgm_SgCreateList+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lSgm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -32665,307 +25762,214 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostbyname ();
+char SgCreateList ();
 int
 main ()
 {
 int
 main ()
 {
-return gethostbyname ();
+return SgCreateList ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_bsd_gethostbyname=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Sgm_SgCreateList=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_bsd_gethostbyname=no
+  ac_cv_lib_Sgm_SgCreateList=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Sgm_SgCreateList" >&5
+$as_echo "$ac_cv_lib_Sgm_SgCreateList" >&6; }
+if test "x$ac_cv_lib_Sgm_SgCreateList" = x""yes; then :
+  libsgm_link=" -lSgm"
 fi
 
 fi
 
-      fi
-    fi
 
 
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # 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; }
-if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        save_CFLAGS=$CFLAGS
+        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif 2" >&5
+$as_echo_n "checking for Motif 2... " >&6; }
+if test "${wx_cv_lib_motif2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
+                            #include <Xm/Xm.h>
 
 int
 main ()
 {
 
 int
 main ()
 {
-return connect ();
+
+                            #if XmVersion < 2000
+                            Not Motif 2
+                            #endif
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_connect=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_lib_motif2="yes"
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_connect=no
+  wx_cv_lib_motif2="no"
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_motif2" >&5
+$as_echo "$wx_cv_lib_motif2" >&6; }
+        if test "$wx_cv_lib_motif2" = "yes"; then
+            $as_echo "#define __WXMOTIF20__ 1" >>confdefs.h
 
 
-    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; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        else
+            $as_echo "#define __WXMOTIF20__ 0" >>confdefs.h
+
+        fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Motif is Lesstif" >&5
+$as_echo_n "checking whether Motif is Lesstif... " >&6; }
+if test "${wx_cv_lib_lesstif+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
+                            #include <Xm/Xm.h>
+
 int
 main ()
 {
 int
 main ()
 {
-return connect ();
+
+                            #if !defined(LesstifVersion) || LesstifVersion <= 0
+                            Not Lesstif
+                            #endif
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_socket_connect=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_lib_lesstif="yes"
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_socket_connect=no
+  wx_cv_lib_lesstif="no"
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_socket_connect = yes; then
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_lesstif" >&5
+$as_echo "$wx_cv_lib_lesstif" >&6; }
+        if test "$wx_cv_lib_lesstif" = "yes"; then
+            $as_echo "#define __WXLESSTIF__ 1" >>confdefs.h
+
+        else
+            $as_echo "#define __WXLESSTIF__ 0" >>confdefs.h
+
+        fi
+
+        CFLAGS=$save_CFLAGS
+
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
+        TOOLKIT=MOTIF
+        GUIDIST=MOTIF_DIST
+    fi
+
+        if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
+                if test "$wxUSE_LIBXPM" = "sys"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xpm library" >&5
+$as_echo_n "checking for Xpm library... " >&6; }
+
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libXpm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+            if test "$ac_find_libraries" != "" ; then
 
 
+    if test "$ac_find_libraries" = "default location"; then
+    ac_path_to_link=""
+  else
+    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
     fi
     fi
+  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; }
-if test "${ac_cv_func_remove+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 remove to an innocuous variant, in case <limits.h> declares remove.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define remove innocuous_remove
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5
+$as_echo "found in $ac_find_libraries" >&6; }
 
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/xpm.h" >&5
+$as_echo_n "checking for X11/xpm.h... " >&6; }
+if test "${wx_cv_x11_xpm_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+                        save_CFLAGS=$CFLAGS
+                        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
 
 
-#undef remove
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
+                                #include <X11/xpm.h>
 
 int
 main ()
 {
 
 int
 main ()
 {
-return remove ();
+
+                                int version;
+                                version = XpmLibraryVersion();
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_remove=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_x11_xpm_h=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_x11_xpm_h=no
 
 
-       ac_cv_func_remove=no
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+                        CFLAGS=$save_CFLAGS
+
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_x11_xpm_h" >&5
+$as_echo "$wx_cv_x11_xpm_h" >&6; }
 
 
-    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; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                if test $wx_cv_x11_xpm_h = "yes"; then
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm"
+                    $as_echo "#define wxHAVE_LIB_XPM 1" >>confdefs.h
+
+                else
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: built-in less efficient XPM decoder will be used" >&5
+$as_echo "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2;}
+                fi
+            fi
+
+        fi
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
+$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
+if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -32974,328 +25978,248 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-char remove ();
+char XShapeQueryExtension ();
 int
 main ()
 {
 int
 main ()
 {
-return remove ();
+return XShapeQueryExtension ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_posix_remove=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xext_XShapeQueryExtension=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_posix_remove=no
+  ac_cv_lib_Xext_XShapeQueryExtension=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_posix_remove = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
+if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then :
 
 
-    fi
+                      GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
+                      wxHAVE_XEXT_LIB=1
 
 
-    # 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; }
-if test "${ac_cv_func_shmat+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 shmat to an innocuous variant, in case <limits.h> declares shmat.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shmat innocuous_shmat
+fi
 
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); 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
+        if test "$wxHAVE_XEXT_LIB" = 1; then
+            save_CFLAGS="$CFLAGS"
+            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
 
 
-#undef shmat
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/extensions/shape.h" >&5
+$as_echo_n "checking for X11/extensions/shape.h... " >&6; }
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
+                            #include <X11/Xlib.h>
+                            #include <X11/extensions/shape.h>
 
 int
 main ()
 {
 
 int
 main ()
 {
-return shmat ();
+
+                            int dummy1, dummy2;
+                            XShapeQueryExtension((Display*)NULL,
+                                                 (int*)NULL, (int*)NULL);
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_shmat=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+
+                            $as_echo "#define HAVE_XSHAPE 1" >>confdefs.h
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_func_shmat=no
-fi
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+            CFLAGS="$save_CFLAGS"
 
 
-    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; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        fi
+    fi
+
+    if test "$wxUSE_OSX_CARBON" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler syntax to enable Pascal strings" >&5
+$as_echo_n "checking for compiler syntax to enable Pascal strings... " >&6; }
+        if test "$GCC" = yes; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: gcc" >&5
+$as_echo "gcc" >&6; }
+            CPPFLAGS_PASCAL="-fpascal-strings"
+        elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: xlc" >&5
+$as_echo "xlc" >&6; }
+            CPPFLAGS_PASCAL="-qmacpstr"
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+        fi
+
+        if test "x$wxUSE_UNIX" = "xyes"; then
+            CPPFLAGS="$CPPFLAGS_PASCAL -I/Developer/Headers/FlatCarbon $CPPFLAGS"
+        else
+                        CPPFLAGS="$CPPFLAGS_PASCAL -DTARGET_CARBON $CPPFLAGS"
+        fi
+
+        TOOLKIT=OSX_CARBON
+                GUIDIST=OSX_CARBON_DIST
+                        WXBASEPORT="_carbon"
+
+                                        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
+    fi
+
+    if test "$wxUSE_OSX_COCOA" = 1; then
+        TOOLKIT=OSX_COCOA
+        GUIDIST=OSX_COCOA_DIST
+
+                TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
+    fi
+
+    if test "$wxUSE_OSX_IPHONE" = 1; then
+        TOOLKIT=OSX_IPHONE
+    fi
+
+    if test "$wxUSE_OLD_COCOA" = 1; then
+        TOOLKIT=COCOA
+        GUIDIST=COCOA_DIST
+    fi
+
+    if test "$wxUSE_PM" = 1; then
+        TOOLKIT=PM
+        GUIDIST=PM_DIST
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type SPBCDATA" >&5
+$as_echo_n "checking for type SPBCDATA... " >&6; }
+if test "${wx_cv_spbcdata+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
+                        #define INCL_PM
+                        #include <os2.h>
+
 int
 main ()
 {
 int
 main ()
 {
-return shmat ();
+
+                        SPBCDATA test;
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_ipc_shmat=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_spbcdata=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_spbcdata=no
 
 
-       ac_cv_lib_ipc_shmat=no
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_ipc_shmat = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_spbcdata" >&5
+$as_echo "$wx_cv_spbcdata" >&6; }
 
 
+        if test $wx_cv_spbcdata = "yes"; then
+            $as_echo "#define HAVE_SPBCDATA 1" >>confdefs.h
+
+        fi
     fi
     fi
-  fi
 
 
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # 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; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+        if test "$TOOLKIT" = "PM" ; then
+        TOOLKIT_DIR="os2"
+    else
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'`
+    fi
 
 
-/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char IceConnectionNumber ();
-int
-main ()
-{
-return IceConnectionNumber ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_ICE_IceConnectionNumber=yes
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
+        WIDGET_SET=univ
+    fi
+
+        GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
+    DISTDIR="wx\$(TOOLKIT)"
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    USE_GUI=0
 
 
-       ac_cv_lib_ICE_IceConnectionNumber=no
-fi
+            TOOLKIT_DIR="base"
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+        if test "$USE_WIN32" = 1 ; then
+                        TOOLKIT="MSW"
+    fi
+
+        GUIDIST="BASE_DIST"
+    DISTDIR="wxBase"
 fi
 
 fi
 
-  LDFLAGS=$ac_save_LDFLAGS
+
+
+if test "$wxUSE_GUI" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
+                for ac_header in X11/Xlib.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "
+"
+if test "x$ac_cv_header_X11_Xlib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_X11_XLIB_H 1
+_ACEOF
 
 fi
 
 
 fi
 
+done
 
 
-        if test "$no_x" = "yes"; then
-          { { echo "$as_me:$LINENO: error: X11 not found, please use --x-includes and/or --x-libraries options (see config.log for details)" >&5
-echo "$as_me: error: X11 not found, please use --x-includes and/or --x-libraries options (see config.log for details)" >&2;}
-   { (exit 1); exit 1; }; }
-        fi
+        for ac_header in X11/XKBlib.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "
+                          #if HAVE_X11_XLIB_H
+                            #include <X11/Xlib.h>
+                          #endif
 
 
-                                GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
-        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
-        AFMINSTALL=afminstall
-        COMPILED_X_PROGRAM=0
+"
+if test "x$ac_cv_header_X11_XKBlib_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_X11_XKBLIB_H 1
+_ACEOF
+
+fi
+
+done
 
     fi
 
     fi
+fi
 
 
-    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; }
-            if test "x$MICROWIN" = x ; then
-                { 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: result: $MICROWIN" >&5
-echo "${ECHO_T}$MICROWIN" >&6; }
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NANOX 1
-_ACEOF
 
 
-            fi
-        fi
 
 
-        if test "$wxUSE_UNICODE" = "yes"; then
+USE_XINERAMA=0
+if test "$wxUSE_DISPLAY" = "yes"; then
+        if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then
+
+  ac_find_libraries=
+
+    fl_pkgname=`echo "Xinerama" | tr [:upper:] [:lower:]`
 
 
 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 "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
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -33307,14 +26231,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
 IFS=$as_save_IFS
 
   ;;
@@ -33322,11 +26246,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -33335,10 +26259,10 @@ 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
   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; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -33350,14 +26274,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
 IFS=$as_save_IFS
 
   ;;
@@ -33365,11 +26289,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -33377,12 +26301,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -33394,201 +26314,34 @@ 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; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&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; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
        else
        else
-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                PKG_CONFIG=""
        fi
 
                PKG_CONFIG=""
        fi
 
-fi
-
-
-pkg_failed=no
-{ 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
-        pkg_cv_PANGOX_CFLAGS="$PANGOX_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangox\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pangox") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-       pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PANGOX_LIBS"; then
-        pkg_cv_PANGOX_LIBS="$PANGOX_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangox\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pangox") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PANGOX_LIBS=`$PKG_CONFIG --libs "pangox" 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
-               PANGOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangox"`
-        else
-               PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$PANGOX_PKG_ERRORS" >&5
-
-
-                    { { echo "$as_me:$LINENO: error: pangox library not found, library cannot be compiled in Unicode mode" >&5
-echo "$as_me: error: pangox library not found, library cannot be compiled in Unicode mode" >&2;}
-   { (exit 1); exit 1; }; }
-
-
-elif test $pkg_failed = untried; then
-
-                    { { echo "$as_me:$LINENO: error: pangox library not found, library cannot be compiled in Unicode mode" >&5
-echo "$as_me: error: pangox library not found, library cannot be compiled in Unicode mode" >&2;}
-   { (exit 1); exit 1; }; }
-
-
-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; }
-
-                    CFLAGS="$PANGOX_CFLAGS $CFLAGS"
-                    CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
-                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
-
-fi
-
-pkg_failed=no
-{ 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
-        pkg_cv_PANGOFT2_CFLAGS="$PANGOFT2_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangoft2\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-       pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$PANGOFT2_LIBS"; then
-        pkg_cv_PANGOFT2_LIBS="$PANGOFT2_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangoft2\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pangoft2") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 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
-               PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangoft2"`
-        else
-               PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$PANGOFT2_PKG_ERRORS" >&5
-
-
-                    { echo "$as_me:$LINENO: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5
-echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;}
-                    wxUSE_PRINTING_ARCHITECTURE="no"
-
-
-elif test $pkg_failed = untried; then
-
-                    { echo "$as_me:$LINENO: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5
-echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;}
-                    wxUSE_PRINTING_ARCHITECTURE="no"
-
-
-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; }
-
-                    CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
-                    CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
-                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
-
-fi
+fi 6> /dev/null
 
 pkg_failed=no
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for PANGOXFT" >&5
-echo $ECHO_N "checking for PANGOXFT... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xinerama" >&5
+$as_echo_n "checking for Xinerama... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$PANGOXFT_CFLAGS"; then
-        pkg_cv_PANGOXFT_CFLAGS="$PANGOXFT_CFLAGS"
+    if test -n "$Xinerama_CFLAGS"; then
+        pkg_cv_Xinerama_CFLAGS="$Xinerama_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangoxft\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pangoxft") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
   ac_status=$?
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft" 2>/dev/null`
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_Xinerama_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -33597,16 +26350,16 @@ else
        pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
        pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$PANGOXFT_LIBS"; then
-        pkg_cv_PANGOXFT_LIBS="$PANGOXFT_LIBS"
+    if test -n "$Xinerama_LIBS"; then
+        pkg_cv_Xinerama_LIBS="$Xinerama_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangoxft\"") >&5
-  ($PKG_CONFIG --exists --print-errors "pangoxft") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
   ac_status=$?
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft" 2>/dev/null`
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_Xinerama_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -33625,72 +26378,25 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pangoxft"`
+               Xinerama_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"`
         else
         else
-               PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft"`
+               Xinerama_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"`
         fi
        # Put the nasty error message in config.log where it belongs
         fi
        # Put the nasty error message in config.log where it belongs
-       echo "$PANGOXFT_PKG_ERRORS" >&5
-
-
-                    { echo "$as_me:$LINENO: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5
-echo "$as_me: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&2;}
-
-
-elif test $pkg_failed = untried; then
-
-                    { echo "$as_me:$LINENO: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5
-echo "$as_me: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&2;}
-
-
-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; }
-
-                    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PANGO_XFT 1
-_ACEOF
-
-                    CFLAGS="$PANGOXFT_CFLAGS $CFLAGS"
-                    CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
-                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
+       echo "$Xinerama_PKG_ERRORS" >&5
 
 
-fi
-            save_LIBS="$LIBS"
-            LIBS="$LIBS $PANGOX_LIBS"
 
 
-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 $ECHO_N "(cached) $ECHO_C" >&6
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xXineramaQueryScreens" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5
+$as_echo_n "checking for XineramaQueryScreens in -lXinerama... " >&6; }
+if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXinerama  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* 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 GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -33698,205 +26404,155 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-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
-#endif
-
+char XineramaQueryScreens ();
 int
 main ()
 {
 int
 main ()
 {
-return $ac_func ();
+return XineramaQueryScreens ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xinerama_XineramaQueryScreens=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
+  ac_cv_lib_Xinerama_XineramaQueryScreens=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
+$as_echo "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; }
+if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = x""yes; then :
+  ac_find_libraries="std"
 fi
 fi
-done
-
-            LIBS="$save_LIBS"
-        fi
-
-        wxUSE_UNIVERSAL="yes"
-
-        if test "$wxUSE_NANOX" = "yes"; then
-            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
-        else
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
-        fi
-
-        TOOLKIT=X11
-        GUIDIST=X11_DIST
-    fi
 
 
-    if test "$wxUSE_MOTIF" = 1; then
-        if test "$wxUSE_UNICODE" = "yes"; then
-            { { echo "$as_me:$LINENO: error: Unicode configuration not supported with Motif" >&5
-echo "$as_me: error: Unicode configuration not supported with Motif" >&2;}
-   { (exit 1); exit 1; }; }
         fi
         fi
+      fi
 
 
-        { echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5
-echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; }
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
 
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /usr/include;
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
   do
   do
-    if test -f "$ac_dir/Xm/Xm.h"; then
-      ac_find_includes=$ac_dir
-      break
-    fi
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libXinerama.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
   done
 
   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; }
-
-    if test "x$ac_find_includes" = "x/usr/include"; then
-    ac_path_to_include=""
-  else
-    echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_include=""
-    else
-      ac_path_to_include=" -I$ac_find_includes"
-    fi
-  fi
-
-            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         else
         else
-            save_CFLAGS=$CFLAGS
-            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
 
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+elif test $pkg_failed = untried; then
 
 
-                    #include <Xm/Xm.h>
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xXineramaQueryScreens" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5
+$as_echo_n "checking for XineramaQueryScreens in -lXinerama... " >&6; }
+if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXinerama  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XineramaQueryScreens ();
 int
 main ()
 {
 int
 main ()
 {
-
-                    int version;
-                    version = xmUseVersion;
-
+return XineramaQueryScreens ();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6; }
-                    COMPILED_X_PROGRAM=1
-
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xinerama_XineramaQueryScreens=yes
 else
 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: 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; }; }
-
-
+  ac_cv_lib_Xinerama_XineramaQueryScreens=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5
+$as_echo "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; }
+if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = x""yes; then :
+  ac_find_libraries="std"
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-            CFLAGS=$save_CFLAGS
         fi
         fi
+      fi
 
 
-
-        { echo "$as_me:$LINENO: checking for Motif/Lesstif library" >&5
-echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; }
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
   ac_find_libraries=
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in  $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
   do
     for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libXm.$ac_extension"; then
+      if test -f "$ac_dir/libXinerama.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
+
+else
+       Xinerama_CFLAGS=$pkg_cv_Xinerama_CFLAGS
+       Xinerama_LIBS=$pkg_cv_Xinerama_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+            ac_find_libraries="std"
 
 
-        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; }
+                                                eval ac_find_cflags=\$Xinerama_CFLAGS
+      eval fl_libs=\$Xinerama_LIBS
 
 
+                  for fl_path in $fl_libs
+      do
+        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
+                              ac_find_libraries=`echo "$fl_path" | cut -c 3-`
+        fi
+      done
+
+fi
+
+        if test "$ac_find_libraries" != "" ; then
+            if test "$ac_find_libraries" != "std" ; then
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
   else
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
   else
-    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
     result=$?
     if test $result = 0; then
       ac_path_to_link=""
     result=$?
     if test $result = 0; then
       ac_path_to_link=""
@@ -33905,177 +26561,220 @@ echo "${ECHO_T}found in $ac_find_libraries" >&6; }
     fi
   fi
 
     fi
   fi
 
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+              if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                  LDFLAGS="$LDFLAGS $ac_path_to_link"
+              fi
+            fi
+            USE_XINERAMA=1
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
         else
         else
-                                                save_CFLAGS=$CFLAGS
-            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
-            save_LIBS="$LIBS"
-            LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
-
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                    #include <Xm/Xm.h>
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Xinerama not found; disabling wxDisplay" >&5
+$as_echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;}
+            wxUSE_DISPLAY="no"
+        fi
+    elif test "$wxUSE_MSW" = 1; then
+                ac_fn_c_check_header_compile "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "#include <windows.h>
+"
+if test "x$ac_cv_header_ddraw_h" = x""yes; then :
 
 
-int
-main ()
-{
+fi
 
 
-                    int version;
-                    version = xmUseVersion;
 
 
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+    fi
+fi
 
 
-                    { echo "$as_me:$LINENO: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6; }
-                    COMPILED_X_PROGRAM=1
+if test "$wxUSE_DISPLAY" = "yes"; then
+        if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then
 
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_find_libraries=
 
 
+    fl_pkgname=`echo "Xxf86vm" | tr [:upper:] [:lower:]`
 
 
-                    { 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; }; }
 
 
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$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
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 
 
-            CFLAGS=$save_CFLAGS
-            LIBS="$save_LIBS"
-        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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 
-        { 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
-        for libp in "" " -lXp"; do
-            if test "$libs_found" = "0"; then
-                for libsm_ice in "" " -lSM -lICE"; do
-                    if test "$libs_found" = "0"; then
-                        save_LIBS="$LIBS"
-                        LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
-                        save_CFLAGS=$CFLAGS
-                        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
 
 
-                                #include <Xm/Xm.h>
-                                #include <Xm/List.h>
+fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
 
 
-int
-main ()
-{
+fi 6> /dev/null
 
 
-                                XmString string = NULL;
-                                Widget w = NULL;
-                                int position = 0;
-                                XmListAddItem(w, string, position);
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xxf86vm" >&5
+$as_echo_n "checking for Xxf86vm... " >&6; }
 
 
-  ;
-  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 test -n "$PKG_CONFIG"; then
+    if test -n "$Xxf86vm_CFLAGS"; then
+        pkg_cv_Xxf86vm_CFLAGS="$Xxf86vm_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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
-  (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
-
-                                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; }
-                                libs_found=1
-
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_Xxf86vm_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null`
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$Xxf86vm_LIBS"; then
+        pkg_cv_Xxf86vm_LIBS="$Xxf86vm_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_Xxf86vm_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 
 
-                        LIBS="$save_LIBS"
-                        CFLAGS=$save_CFLAGS
-                    fi
-                done
-            fi
-        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: 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; }; }
+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
+               Xxf86vm_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"`
+        else
+               Xxf86vm_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"`
         fi
         fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$Xxf86vm_PKG_ERRORS" >&5
+
 
 
-                        { 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
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xXF86VidModeQueryExtension" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
+$as_echo_n "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; }
+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSgm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lXxf86vm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -34084,321 +26783,364 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-char SgCreateList ();
+char XF86VidModeQueryExtension ();
 int
 main ()
 {
 int
 main ()
 {
-return SgCreateList ();
+return XF86VidModeQueryExtension ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_Sgm_SgCreateList=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_Sgm_SgCreateList=no
+  ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_Sgm_SgCreateList = yes; then
-  libsgm_link=" -lSgm"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5
+$as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; }
+if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = x""yes; then :
+  ac_find_libraries="std"
 fi
 
 fi
 
+        fi
+      fi
+
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
 
-        save_CFLAGS=$CFLAGS
-        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
 
 
-        { 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
+elif test $pkg_failed = untried; then
+
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xXF86VidModeQueryExtension" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
+$as_echo_n "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; }
+if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXxf86vm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                            #include <Xm/Xm.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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XF86VidModeQueryExtension ();
 int
 main ()
 {
 int
 main ()
 {
-
-                            #if XmVersion < 2000
-                            Not Motif 2
-                            #endif
-
+return XF86VidModeQueryExtension ();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  wx_cv_lib_motif2="yes"
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_lib_motif2="no"
+  ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5
+$as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; }
+if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = x""yes; then :
+  ac_find_libraries="std"
 fi
 fi
-{ 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
-_ACEOF
 
 
-        else
-            cat >>confdefs.h <<\_ACEOF
-#define __WXMOTIF20__ 0
-_ACEOF
+        fi
+      fi
+
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
+
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
 
 
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
         fi
+      fi
 
 
-        { 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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+       Xxf86vm_CFLAGS=$pkg_cv_Xxf86vm_CFLAGS
+       Xxf86vm_LIBS=$pkg_cv_Xxf86vm_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-                            #include <Xm/Xm.h>
-
-int
-main ()
-{
+            ac_find_libraries="std"
 
 
-                            #if !defined(LesstifVersion) || LesstifVersion <= 0
-                            Not Lesstif
-                            #endif
+                                                eval ac_find_cflags=\$Xxf86vm_CFLAGS
+      eval fl_libs=\$Xxf86vm_LIBS
 
 
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  wx_cv_lib_lesstif="yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+                  for fl_path in $fl_libs
+      do
+        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
+                              ac_find_libraries=`echo "$fl_path" | cut -c 3-`
+        fi
+      done
 
 
-       wx_cv_lib_lesstif="no"
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        if test "$ac_find_libraries" != "" ; then
+            for ac_header in X11/extensions/xf86vmode.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" "
+                                  #if HAVE_X11_XLIB_H
+                                    #include <X11/Xlib.h>
+                                  #endif
 
 
-fi
-{ 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 "x$ac_cv_header_X11_extensions_xf86vmode_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_X11_EXTENSIONS_XF86VMODE_H 1
 _ACEOF
 
 _ACEOF
 
-        else
-            cat >>confdefs.h <<\_ACEOF
-#define __WXLESSTIF__ 0
-_ACEOF
+                              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
 
 
-        fi
+fi
 
 
-        CFLAGS=$save_CFLAGS
+done
 
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
-        TOOLKIT=MOTIF
-        GUIDIST=MOTIF_DIST
+        fi
     fi
     fi
+fi
 
 
-        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; }
+if test "$wxUSE_DETECT_SM" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
 
   ac_find_libraries=
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libXpm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
 
 
-            if test "$ac_find_libraries" != "" ; then
+    fl_pkgname=`echo "SM" | tr [:upper:] [:lower:]`
 
 
-    if test "$ac_find_libraries" = "default location"; then
-    ac_path_to_link=""
-  else
-    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_link=""
-    else
-      ac_path_to_link=" -L$ac_find_libraries"
-    fi
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
   fi
+done
+  done
+IFS=$as_save_IFS
 
 
-                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; }
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 
-                { 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
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
 else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-                        save_CFLAGS=$CFLAGS
-                        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
-
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
 
 
-                                #include <X11/xpm.h>
+fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
 
 
-int
-main ()
-{
+fi 6> /dev/null
 
 
-                                int version;
-                                version = XpmLibraryVersion();
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SM" >&5
+$as_echo_n "checking for SM... " >&6; }
 
 
-  ;
-  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 test -n "$PKG_CONFIG"; then
+    if test -n "$SM_CFLAGS"; then
+        pkg_cv_SM_CFLAGS="$SM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  wx_cv_x11_xpm_h=yes
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SM_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null`
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_x11_xpm_h=no
-
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$SM_LIBS"; then
+        pkg_cv_SM_LIBS="$SM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SM_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-                        CFLAGS=$save_CFLAGS
 
 
+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
 fi
-{ 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"
-                    cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_LIB_XPM 1
-_ACEOF
-
-                else
-                    { echo "$as_me:$LINENO: WARNING: built-in less efficient XPM decoder will be used" >&5
-echo "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2;}
-                fi
-            fi
-
+        if test $_pkg_short_errors_supported = yes; then
+               SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"`
+        else
+               SM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"`
         fi
         fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$SM_PKG_ERRORS" >&5
 
 
-                { 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
+
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xSmcOpenConnection" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5
+$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; }
+if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lSM  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -34407,569 +27149,424 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-char XShapeQueryExtension ();
+char SmcOpenConnection ();
 int
 main ()
 {
 int
 main ()
 {
-return XShapeQueryExtension ();
+return SmcOpenConnection ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_Xext_XShapeQueryExtension=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_SM_SmcOpenConnection=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_Xext_XShapeQueryExtension=no
+  ac_cv_lib_SM_SmcOpenConnection=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
+$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; }
+if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then :
+  ac_find_libraries="std"
+fi
 
 
-                      GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
-                      wxHAVE_XEXT_LIB=1
+        fi
+      fi
 
 
-fi
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
 
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libSM.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
 
 
-        if test "$wxHAVE_XEXT_LIB" = 1; then
-            save_CFLAGS="$CFLAGS"
-            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
 
 
-            { 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 confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+elif test $pkg_failed = untried; then
 
 
-                            #include <X11/Xlib.h>
-                            #include <X11/extensions/shape.h>
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xSmcOpenConnection" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5
+$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; }
+if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSM  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SmcOpenConnection ();
 int
 main ()
 {
 int
 main ()
 {
-
-                            int dummy1, dummy2;
-                            XShapeQueryExtension((Display*)NULL,
-                                                 (int*)NULL, (int*)NULL);
-
+return SmcOpenConnection ();
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-
-                            cat >>confdefs.h <<\_ACEOF
-#define HAVE_XSHAPE 1
-_ACEOF
-
-                            { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
-
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_SM_SmcOpenConnection=yes
 else
 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; }
-
+  ac_cv_lib_SM_SmcOpenConnection=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
+$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; }
+if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then :
+  ac_find_libraries="std"
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-            CFLAGS="$save_CFLAGS"
 
         fi
 
         fi
-    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; }
-        if test "$GCC" = yes; then
-            { 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
-            { echo "$as_me:$LINENO: result: xlc" >&5
-echo "${ECHO_T}xlc" >&6; }
-            CPPFLAGS_PASCAL="-qmacpstr"
-        else
-            { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
-        fi
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
 
-        if test "x$wxUSE_UNIX" = "xyes"; then
-            CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon $CPPFLAGS"
+  ac_find_libraries=
+  for ac_dir in  $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libSM.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         else
         else
-                        CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
         fi
+      fi
 
 
-        TOOLKIT=MAC
-                GUIDIST=MACX_DIST
-                        WXBASEPORT="_carbon"
-    fi
-
-    if test "$wxUSE_COCOA" = 1; then
-        TOOLKIT=COCOA
-        GUIDIST=COCOA_DIST
-    fi
-
-    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; }
-if test "${wx_cv_spbcdata+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 INCL_PM
-                        #include <os2.h>
-
-int
-main ()
-{
-
-                        SPBCDATA test;
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  wx_cv_spbcdata=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+       SM_CFLAGS=$pkg_cv_SM_CFLAGS
+       SM_LIBS=$pkg_cv_SM_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-       wx_cv_spbcdata=no
-
-fi
+            ac_find_libraries="std"
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                                                eval ac_find_cflags=\$SM_CFLAGS
+      eval fl_libs=\$SM_LIBS
 
 
+                  for fl_path in $fl_libs
+      do
+        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
+                              ac_find_libraries=`echo "$fl_path" | cut -c 3-`
+        fi
+      done
 
 fi
 
 fi
-{ 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
-#define HAVE_SPBCDATA 1
-_ACEOF
-
-        fi
-    fi
+        if test "$ac_find_libraries" != "" ; then
+            if test "$ac_find_libraries" != "std" ; then
 
 
-        if test "$TOOLKIT" = "PM" ; then
-        TOOLKIT_DIR="os2"
+    if test "$ac_find_libraries" = "default location"; then
+    ac_path_to_link=""
+  else
+    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
     else
     else
-        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+      ac_path_to_link=" -L$ac_find_libraries"
     fi
     fi
+  fi
 
 
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
-        WIDGET_SET=univ
+              if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                LDFLAGS="$LDFLAGS $ac_path_to_link"
+              fi
+            fi
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libSM not found; disabling session management detection" >&5
+$as_echo "$as_me: WARNING: libSM not found; disabling session management detection" >&2;}
+            wxUSE_DETECT_SM="no"
+        fi
+    else
+        wxUSE_DETECT_SM="no"
     fi
     fi
+fi
 
 
-        GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
-    DISTDIR="wx\$(TOOLKIT)"
-else
-    USE_GUI=0
 
 
-            TOOLKIT_DIR="base"
 
 
-        if test "$USE_WIN32" = 1 ; then
-                        TOOLKIT="MSW"
-    fi
+USE_OPENGL=0
+if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
 
 
-        GUIDIST="BASE_DIST"
-    DISTDIR="wxBase"
-fi
 
 
+    if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+        OPENGL_LIBS="-framework OpenGL -framework AGL"
+    elif test "$wxUSE_MSW" = 1; then
+        OPENGL_LIBS="-lopengl32 -lglu32"
+    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then
 
 
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL headers" >&5
+$as_echo_n "checking for OpenGL headers... " >&6; }
 
 
-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
-        wxUSE_UNICODE_UTF8=yes
-    elif test "$USE_OS2" = "1" ; then
-                                wxUSE_UNICODE_UTF8=yes
-    else
-        wxUSE_UNICODE_UTF8=no
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include
+  do
+    if test -f "$ac_dir/GL/gl.h"; then
+      ac_find_includes=$ac_dir
+      break
     fi
     fi
-fi
+  done
 
 
+        if test "$ac_find_includes" != "" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5
+$as_echo "found in $ac_find_includes" >&6; }
 
 
-if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
-                { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
-echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_Xlib_h+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.  */
+    if test "x$ac_find_includes" = "x/usr/include"; then
+    ac_path_to_include=""
+  else
+    echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_include=""
+    else
+      ac_path_to_include=" -I$ac_find_includes"
+    fi
+  fi
 
 
+            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+        fi
 
 
-#include <X11/Xlib.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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_X11_Xlib_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+        ac_fn_c_check_header_compile "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "
+"
+if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
 
 
-       ac_cv_header_X11_Xlib_h=no
-fi
+            ac_fn_c_check_header_compile "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" "
+"
+if test "x$ac_cv_header_GL_glu_h" = x""yes; then :
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; }
+                found_gl=0
 
 
 
 
-        { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
-echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_XKBlib_h+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.  */
+  ac_find_libraries=
 
 
-                          #if HAVE_X11_XLIB_H
-                            #include <X11/Xlib.h>
-                          #endif
+    fl_pkgname=`echo "GL" | tr [:upper:] [:lower:]`
 
 
 
 
-#include <X11/XKBlib.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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_X11_XKBlib_h=yes
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 
-       ac_cv_header_X11_XKBlib_h=no
+  ;;
+esac
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; }
 
 
 
 
-    fi
 fi
 fi
-
-
-
-IODBC_C_SRC=""
-
-
-if test "$TOOLKIT" != "MSW" ; 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; }
-if test "${ac_cv_header_sql_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 
-#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
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_sql_h=yes
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_sql_h=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 fi
-{ 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
 fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
 
 
+fi 6> /dev/null
 
 
-        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; }
-if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-liodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5
+$as_echo_n "checking for GL... " >&6; }
 
 
-/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  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 test -n "$PKG_CONFIG"; then
+    if test -n "$GL_CFLAGS"; then
+        pkg_cv_GL_CFLAGS="$GL_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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
-  (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_lib_iodbc_SQLAllocEnv=yes
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null`
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_iodbc_SQLAllocEnv=no
+  pkg_failed=yes
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    fi
+else
+       pkg_failed=untried
 fi
 fi
-{ 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"
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GL_LIBS"; then
+        pkg_cv_GL_LIBS="$GL_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null`
 else
 else
-
-                { 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
+  pkg_failed=yes
+fi
+    fi
 else
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lunixodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+       pkg_failed=untried
+fi
 
 
-/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_unixodbc_SQLAllocEnv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_lib_unixodbc_SQLAllocEnv=no
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -lunixodbc"
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
 else
 else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"`
+        else
+               GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$GL_PKG_ERRORS" >&5
+
 
 
-                    { 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
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xglBegin" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5
+$as_echo_n "checking for glBegin in -lGL... " >&6; }
+if test "${ac_cv_lib_GL_glBegin+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lGL  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -34978,109 +27575,150 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-char SQLAllocEnv ();
+char glBegin ();
 int
 main ()
 {
 int
 main ()
 {
-return SQLAllocEnv ();
+return glBegin ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_lib_odbc_SQLAllocEnv=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_GL_glBegin=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_odbc_SQLAllocEnv=no
+  ac_cv_lib_GL_glBegin=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -lodbc"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5
+$as_echo "$ac_cv_lib_GL_glBegin" >&6; }
+if test "x$ac_cv_lib_GL_glBegin" = x""yes; then :
+  ac_find_libraries="std"
 fi
 
 fi
 
+        fi
+      fi
 
 
-fi
-
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
 
-fi
+  ac_find_libraries=
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libGL.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
 
 
-        fi
-        if test "x$ODBC_LINK" = "x" ; then
-            if test "$wxUSE_ODBC" = "sys" ; then
-                { { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5
-echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
-            else
-                { echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;}
-                wxUSE_ODBC=builtin
-            fi
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         else
         else
-                        wxUSE_ODBC=sys
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
         fi
-    fi
+      fi
 
 
-    if test "$wxUSE_ODBC" = "builtin" ; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BUILTIN_IODBC 1
-_ACEOF
+elif test $pkg_failed = untried; then
 
 
-    fi
-fi
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xglBegin" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5
+$as_echo_n "checking for glBegin in -lGL... " >&6; }
+if test "${ac_cv_lib_GL_glBegin+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lGL  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
-if test "$wxUSE_ODBC" != "no" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char glBegin ();
+int
+main ()
+{
+return glBegin ();
+  ;
+  return 0;
+}
 _ACEOF
 _ACEOF
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_GL_glBegin=yes
+else
+  ac_cv_lib_GL_glBegin=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5
+$as_echo "$ac_cv_lib_GL_glBegin" >&6; }
+if test "x$ac_cv_lib_GL_glBegin" = x""yes; then :
+  ac_find_libraries="std"
 fi
 
 fi
 
+        fi
+      fi
 
 
-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; }
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
   ac_find_libraries=
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
   do
     for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libXinerama.$ac_extension"; then
+      if test -f "$ac_dir/libGL.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
-        if test "$ac_find_libraries" != "" ; then
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
+
+else
+       GL_CFLAGS=$pkg_cv_GL_CFLAGS
+       GL_LIBS=$pkg_cv_GL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+            ac_find_libraries="std"
+
+                                                eval ac_find_cflags=\$GL_CFLAGS
+      eval fl_libs=\$GL_LIBS
+
+                  for fl_path in $fl_libs
+      do
+        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
+                              ac_find_libraries=`echo "$fl_path" | cut -c 3-`
+        fi
+      done
+
+fi
+
+                if test "$ac_find_libraries" != "" ; then
+                    if test "$ac_find_libraries" != "std" ; then
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
@@ -35094,164 +27732,353 @@ echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; }
     fi
   fi
 
     fi
   fi
 
-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
-                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; }
+                      if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                        LDFLAGS_GL="$ac_path_to_link"
+                      fi
+                    fi
 
 
-            { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
-echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
 
   ac_find_libraries=
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
+
+    fl_pkgname=`echo "GLU" | tr [:upper:] [:lower:]`
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
   done
+IFS=$as_save_IFS
 
 
-            if test "$ac_find_libraries" != "" ; then
-                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                { echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5
-echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-                                      #if HAVE_X11_XLIB_H
-                                        #include <X11/Xlib.h>
-                                      #endif
 
 
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
 
-#include <X11/extensions/xf86vmode.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
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_X11_extensions_xf86vmode_h=yes
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-       ac_cv_header_X11_extensions_xf86vmode_h=no
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6; }
-if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
+
+fi 6> /dev/null
 
 
-                                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLU" >&5
+$as_echo_n "checking for GLU... " >&6; }
 
 
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GLU_CFLAGS"; then
+        pkg_cv_GLU_CFLAGS="$GLU_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLU_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GLU_LIBS"; then
+        pkg_cv_GLU_LIBS="$GLU_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLU_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
 fi
 
 
 fi
 
 
-            else
-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-            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
+               GLU_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"`
         else
         else
-            { 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"
+               GLU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"`
         fi
         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; }
-if test "${ac_cv_header_ddraw_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+       # Put the nasty error message in config.log where it belongs
+       echo "$GLU_PKG_ERRORS" >&5
+
+
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xgluBeginCurve" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5
+$as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; }
+if test "${ac_cv_lib_GLU_gluBeginCurve+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lGLU  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-#include <windows.h>
 
 
-#include <ddraw.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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gluBeginCurve ();
+int
+main ()
+{
+return gluBeginCurve ();
+  ;
+  return 0;
+}
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_ddraw_h=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_GLU_gluBeginCurve=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_ddraw_h=no
+  ac_cv_lib_GLU_gluBeginCurve=no
 fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5
-echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
+$as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; }
+if test "x$ac_cv_lib_GLU_gluBeginCurve" = x""yes; then :
+  ac_find_libraries="std"
+fi
+
+        fi
+      fi
 
 
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
 
-    fi
+  ac_find_libraries=
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
+  do
+    for ac_extension in a so sl dylib dll.a; do
+      if test -f "$ac_dir/libGLU.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
+
+elif test $pkg_failed = untried; then
+
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xgluBeginCurve" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5
+$as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; }
+if test "${ac_cv_lib_GLU_gluBeginCurve+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lGLU  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gluBeginCurve ();
+int
+main ()
+{
+return gluBeginCurve ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_GLU_gluBeginCurve=yes
+else
+  ac_cv_lib_GLU_gluBeginCurve=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
+$as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; }
+if test "x$ac_cv_lib_GLU_gluBeginCurve" = x""yes; then :
+  ac_find_libraries="std"
 fi
 
 fi
 
-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; }
+        fi
+      fi
+
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
   ac_find_libraries=
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
   do
     for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libSM.$ac_extension"; then
+      if test -f "$ac_dir/libGLU.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
-        if test "$ac_find_libraries" != "" ; then
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
+
+else
+       GLU_CFLAGS=$pkg_cv_GLU_CFLAGS
+       GLU_LIBS=$pkg_cv_GLU_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+            ac_find_libraries="std"
+
+                                                eval ac_find_cflags=\$GLU_CFLAGS
+      eval fl_libs=\$GLU_LIBS
+
+                  for fl_path in $fl_libs
+      do
+        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
+                              ac_find_libraries=`echo "$fl_path" | cut -c 3-`
+        fi
+      done
+
+fi
+
+                    if test "$ac_find_libraries" != "" ; then
+                      if test "$ac_find_libraries" != "std" ; then
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
@@ -35265,348 +28092,360 @@ echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; }
     fi
   fi
 
     fi
   fi
 
-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
-                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; }
-        else
-            { 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"
-        fi
-    else
-        wxUSE_DETECT_SM="no"
-    fi
-fi
+                        if test "$ac_path_to_link" != " -L/usr/lib" -a \
+                                "$ac_path_to_link" != "$LDFLAGS_GL" ; then
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                        fi
+                      fi
 
 
+                        found_gl=1
+                        OPENGL_LIBS="-lGL -lGLU"
+                    fi
+                fi
 
 
+                if test "$found_gl" != 1; then
 
 
-USE_OPENGL=0
-if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
-        { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
-echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
-        wxUSE_OPENGL="no"
-    elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
-        OPENGL_LIBS="-framework OpenGL -framework AGL"
-    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; }
+  ac_find_libraries=
 
 
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;
-  do
-    if test -f "$ac_dir/GL/gl.h"; then
-      ac_find_includes=$ac_dir
-      break
-    fi
-  done
+    fl_pkgname=`echo "MesaGL" | tr [:upper:] [:lower:]`
 
 
-        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; }
 
 
-    if test "x$ac_find_includes" = "x/usr/include"; then
-    ac_path_to_include=""
-  else
-    echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_include=""
-    else
-      ac_path_to_include=" -I$ac_find_includes"
-    fi
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
   fi
+done
+  done
+IFS=$as_save_IFS
 
 
-            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
-        else
-            { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-        fi
-
-        { 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
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
 
 
-#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;;
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
 esac
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_GL_gl_h=yes
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-       ac_cv_header_GL_gl_h=no
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
 fi
 
-rm -f core 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; }
-if test $ac_cv_header_GL_gl_h = yes; then
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
+
+fi 6> /dev/null
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MesaGL" >&5
+$as_echo_n "checking for MesaGL... " >&6; }
 
 
-            if test "${ac_cv_header_GL_glu_h+set}" = set; then
-  { 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
+if test -n "$PKG_CONFIG"; then
+    if test -n "$MesaGL_CFLAGS"; then
+        pkg_cv_MesaGL_CFLAGS="$MesaGL_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MesaGL_CFLAGS=`$PKG_CONFIG --cflags "$fl_pkgname" 2>/dev/null`
+else
+  pkg_failed=yes
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; }
+    fi
 else
 else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking GL/glu.h usability" >&5
-echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6; }
-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
-#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
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$MesaGL_LIBS"; then
+        pkg_cv_MesaGL_LIBS="$MesaGL_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$fl_pkgname\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$fl_pkgname") 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
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_MesaGL_LIBS=`$PKG_CONFIG --libs "$fl_pkgname" 2>/dev/null`
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_header_compiler=no
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 
-# Is the header present?
-{ echo "$as_me:$LINENO: checking GL/glu.h presence" >&5
-echo $ECHO_N "checking GL/glu.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <GL/glu.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
-  ac_status=$?
-  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
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-  ac_header_preproc=no
+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
 fi
+        if test $_pkg_short_errors_supported = yes; then
+               MesaGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$fl_pkgname"`
+        else
+               MesaGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$fl_pkgname"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$MesaGL_PKG_ERRORS" >&5
 
 
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
 
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: GL/glu.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: GL/glu.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: GL/glu.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: GL/glu.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwidgets.org ##
-## ----------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ 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
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xglEnable" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5
+$as_echo_n "checking for glEnable in -lMesaGL... " >&6; }
+if test "${ac_cv_lib_MesaGL_glEnable+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lMesaGL  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char glEnable ();
+int
+main ()
+{
+return glEnable ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_MesaGL_glEnable=yes
 else
 else
-  ac_cv_header_GL_glu_h=$ac_header_preproc
+  ac_cv_lib_MesaGL_glEnable=no
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; }
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5
+$as_echo "$ac_cv_lib_MesaGL_glEnable" >&6; }
+if test "x$ac_cv_lib_MesaGL_glEnable" = x""yes; then :
+  ac_find_libraries="std"
 fi
 fi
-if test $ac_cv_header_GL_glu_h = yes; then
 
 
-                found_gl=0
+        fi
+      fi
 
 
-                { echo "$as_me:$LINENO: checking for -lGL" >&5
-echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
   ac_find_libraries=
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib;
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
   do
     for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libGL.$ac_extension"; then
+      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   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; }
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
 
 
+elif test $pkg_failed = untried; then
 
 
-    if test "$ac_find_libraries" = "default location"; then
-    ac_path_to_link=""
-  else
-    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_link=""
-    else
-      ac_path_to_link=" -L$ac_find_libraries"
-    fi
-  fi
+      if test "x$ac_find_libraries" = "x"; then
+                if test "xglEnable" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5
+$as_echo_n "checking for glEnable in -lMesaGL... " >&6; }
+if test "${ac_cv_lib_MesaGL_glEnable+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lMesaGL  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
-                    if test "$ac_path_to_link" != " -L/usr/lib" ; then
-                        LDFLAGS_GL="$ac_path_to_link"
-                    fi
+/* 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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char glEnable ();
+int
+main ()
+{
+return glEnable ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_MesaGL_glEnable=yes
+else
+  ac_cv_lib_MesaGL_glEnable=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5
+$as_echo "$ac_cv_lib_MesaGL_glEnable" >&6; }
+if test "x$ac_cv_lib_MesaGL_glEnable" = x""yes; then :
+  ac_find_libraries="std"
+fi
+
+        fi
+      fi
 
 
-                                                                                { echo "$as_me:$LINENO: checking for -lGLU" >&5
-echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; }
+      if test "x$ac_find_libraries" = "x"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking elsewhere" >&5
+$as_echo_n "checking elsewhere... " >&6; }
 
   ac_find_libraries=
 
   ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
+  for ac_dir in /opt/graphics/OpenGL/lib $SEARCH_LIB
   do
     for ac_extension in a so sl dylib dll.a; do
   do
     for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libGLU.$ac_extension"; then
+      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
         ac_find_libraries=$ac_dir
         break 2
       fi
     done
   done
 
-                    if test "$ac_find_libraries" != "" ; then
+        if test "x$ac_find_libraries" != "x"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        else
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        fi
+      fi
 
 
-    if test "$ac_find_libraries" = "default location"; then
-    ac_path_to_link=""
-  else
-    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
-    result=$?
-    if test $result = 0; then
-      ac_path_to_link=""
-    else
-      ac_path_to_link=" -L$ac_find_libraries"
-    fi
-  fi
+else
+       MesaGL_CFLAGS=$pkg_cv_MesaGL_CFLAGS
+       MesaGL_LIBS=$pkg_cv_MesaGL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-                        if test "$ac_path_to_link" != " -L/usr/lib" -a \
-                                    "$ac_path_to_link" != "$LDFLAGS_GL"; then
-                            LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
-                        fi
+            ac_find_libraries="std"
 
 
-                        found_gl=1
-                        OPENGL_LIBS="-lGL -lGLU"
-                        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                    else
-                        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                    fi
-                else
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                fi
+                                                eval ac_find_cflags=\$MesaGL_CFLAGS
+      eval fl_libs=\$MesaGL_LIBS
 
 
-                if test "$found_gl" != 1; then
-                    { echo "$as_me:$LINENO: checking for -lMesaGL" >&5
-echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; }
+                  for fl_path in $fl_libs
+      do
+        if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
+                              ac_find_libraries=`echo "$fl_path" | cut -c 3-`
+        fi
+      done
 
 
-  ac_find_libraries=
-  for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib dll.a; do
-      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+fi
 
                     if test "$ac_find_libraries" != "" ; then
 
                     if test "$ac_find_libraries" != "" ; then
+                      if test "$ac_find_libraries" != "std" ; then
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
@@ -35620,13 +28459,11 @@ echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; }
     fi
   fi
 
     fi
   fi
 
-                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
-                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
-                        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                    else
-                        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                        if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                        fi
+                      fi
+                      OPENGL_LIBS="-lMesaGL -lMesaGLU"
                     fi
                 fi
 
                     fi
                 fi
 
@@ -35639,21 +28476,30 @@ fi
 
 
         if test "x$OPENGL_LIBS" = "x"; then
 
 
         if test "x$OPENGL_LIBS" = "x"; then
-                                                { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5
-echo "$as_me: error: OpenGL libraries not available" >&2;}
-   { (exit 1); exit 1; }; }
+            if test "$wxUSE_OPENGL" = "yes"; then
+                as_fn_error $? "OpenGL libraries not available" "$LINENO" 5
+            else
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5
+$as_echo "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;}
+                wxUSE_OPENGL=no
+                USE_OPENGL=0
+            fi
         fi
         fi
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
+$as_echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
+        wxUSE_OPENGL="no"
+    fi
+
+    if test "$wxUSE_OPENGL" = "auto"; then
+                                wxUSE_OPENGL=yes
     fi
 
     if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
     fi
 
     if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_OPENGL 1
-_ACEOF
+        $as_echo "#define wxUSE_OPENGL 1" >>confdefs.h
 
 
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GLCANVAS 1
-_ACEOF
+        $as_echo "#define wxUSE_GLCANVAS 1" >>confdefs.h
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
     fi
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
     fi
@@ -35670,8 +28516,8 @@ if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in
       *-pc-msdosdjgpp )
                 wxUSE_SHARED=no
     case "${host}" in
       *-pc-msdosdjgpp )
                 wxUSE_SHARED=no
-        { echo "$as_me:$LINENO: WARNING: Host system doesn't support shared libraries, disabling" >&5
-echo "$as_me: WARNING: Host system doesn't support shared libraries, disabling" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Host system doesn't support shared libraries, disabling" >&5
+$as_echo "$as_me: WARNING: Host system doesn't support shared libraries, disabling" >&2;}
       ;;
     esac
 fi
       ;;
     esac
 fi
@@ -35685,10 +28531,10 @@ 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; }
-if test "${wx_cv_version_script+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts --version-script" >&5
+$as_echo_n "checking if the linker accepts --version-script... " >&6; }
+if test "${wx_cv_version_script+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                 echo "VER_1 { *; };" >conftest.sym
 else
 
                 echo "VER_1 { *; };" >conftest.sym
@@ -35697,11 +28543,11 @@ else
                 if { ac_try='
                         $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                         -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'
                 if { ac_try='
                         $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                         -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } ; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } ; then
                   if test -s conftest.stderr ; then
                       wx_cv_version_script=no
                   else
                   if test -s conftest.stderr ; then
                       wx_cv_version_script=no
                   else
@@ -35720,28 +28566,28 @@ else
                   if { ac_try='
                         $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                         -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null'
                   if { ac_try='
                         $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                         -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
                      { ac_try='
                         $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                         -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null'
                      { ac_try='
                         $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                         -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
                   then
                     if { ac_try='
                           $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                           -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null'
                   then
                     if { ac_try='
                           $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
                           -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
                     then
                       wx_cv_version_script=yes
                     else
                     then
                       wx_cv_version_script=yes
                     else
@@ -35754,8 +28600,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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_version_script" >&5
+$as_echo "$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"
@@ -35770,10 +28616,10 @@ 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; }
-    if test "${wx_cv_cc_visibility+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbols visibility support" >&5
+$as_echo_n "checking for symbols visibility support... " >&6; }
+    if test "${wx_cv_cc_visibility+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
       wx_save_CXXFLAGS="$CXXFLAGS"
 else
 
       wx_save_CXXFLAGS="$CXXFLAGS"
@@ -35784,11 +28630,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
          /* we need gcc >= 4.0, older versions with visibility support
 /* end confdefs.h.  */
 
          /* we need gcc >= 4.0, older versions with visibility support
@@ -35797,6 +28639,16 @@ 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
+
+         /* at the time of Xcode 4.1 / Clang 3, Clang++ still didn't have the bugs sorted out: */
+         #if defined(__clang__)
+         clang compiler is still broken w.r.t. 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);
@@ -35813,31 +28665,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_cc_visibility=yes
 else
   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
       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -35848,13 +28680,124 @@ 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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility" >&5
+$as_echo "$wx_cv_cc_visibility" >&6; }
     if test $wx_cv_cc_visibility = yes; then
     if test $wx_cv_cc_visibility = yes; then
-      cat >>confdefs.h <<\_ACEOF
-#define HAVE_VISIBILITY 1
+                              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libstdc++ visibility" >&5
+$as_echo_n "checking for broken libstdc++ visibility... " >&6; }
+      if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        wx_save_CXXFLAGS="$CXXFLAGS"
+        wx_save_LDFLAGS="$LDFLAGS"
+        CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+        LDFLAGS="$LDFLAGS -shared -fPIC"
+        ac_ext=cpp
+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
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            #include <string>
+
+int
+main ()
+{
+
+            std::string s("hello");
+            return s.length();
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  wx_cv_cc_broken_libstdcxx_visibility=no
+else
+  wx_cv_cc_broken_libstdcxx_visibility=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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
+
+        CXXFLAGS="$wx_save_CXXFLAGS"
+        LDFLAGS="$wx_save_LDFLAGS"
+fi
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5
+$as_echo "$wx_cv_cc_broken_libstdcxx_visibility" >&6; }
+
+      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can work around it" >&5
+$as_echo_n "checking whether we can work around it... " >&6; }
+        if test "${wx_cv_cc_visibility_workaround+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+          ac_ext=cpp
+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
+
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+              #pragma GCC visibility push(default)
+              #include <string>
+              #pragma GCC visibility pop
+
+int
+main ()
+{
+
+              std::string s("hello");
+              return s.length();
+
+  ;
+  return 0;
+}
 _ACEOF
 _ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  wx_cv_cc_visibility_workaround=no
+else
+  wx_cv_cc_visibility_workaround=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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
+
+
+fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc_visibility_workaround" >&5
+$as_echo "$wx_cv_cc_visibility_workaround" >&6; }
 
 
+        if test $wx_cv_cc_visibility_workaround = no; then
+                    wx_cv_cc_visibility=no
+        fi
+      fi
+    fi
+
+    if test $wx_cv_cc_visibility = yes; then
+      $as_echo "#define HAVE_VISIBILITY 1" >>confdefs.h
+
+      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
+        $as_echo "#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1" >>confdefs.h
+
+      fi
     else
       CFLAGS_VISIBILITY=""
       CXXFLAGS_VISIBILITY=""
     else
       CFLAGS_VISIBILITY=""
       CXXFLAGS_VISIBILITY=""
@@ -35881,13 +28824,9 @@ _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; }
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -rpath" >&5
+$as_echo_n "checking if the linker accepts -rpath... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -35898,45 +28837,21 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
 
 
-                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                 SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
                 WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
 
 else
                 SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
                 WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
 
 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 the linker accepts -R" >&5
-echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts -R" >&5
+$as_echo_n "checking if the linker accepts -R... " >&6; }
                 LDFLAGS="$saveLdflags -Wl,-R,/"
                 LDFLAGS="$saveLdflags -Wl,-R,/"
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -35947,69 +28862,50 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
 
 
-                        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                         SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
                         WXCONFIG_RPATH="-Wl,-R,\$libdir"
 
 else
                         SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
                         WXCONFIG_RPATH="-Wl,-R,\$libdir"
 
 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; }
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$saveLdflags"
       ;;
 
       *-*-darwin* )
         LDFLAGS="$saveLdflags"
       ;;
 
       *-*-darwin* )
-        install_name_tool=`which install_name_tool`
+        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
         if test "$install_name_tool" -a -x "$install_name_tool"; then
         if test "$install_name_tool" -a -x "$install_name_tool"; then
-            SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
             cat <<EOF >change-install-names
 #!/bin/sh
             cat <<EOF >change-install-names
 #!/bin/sh
-libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
-inst_cmd="install_name_tool "
+libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
 for i in \${libnames} ; do
 for i in \${libnames} ; do
-    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
+    for dep in \${libnames} ; do
+        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
+    done
 done
 done
-\${inst_cmd} \${3}
 EOF
             chmod +x change-install-names
 EOF
             chmod +x change-install-names
+            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
         fi
         fi
+
+                                        HEADER_PAD_OPTION="-headerpad_max_install_names"
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
-                        WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
         ;;
 
       *-*-hpux* )
         ;;
 
       *-*-hpux* )
@@ -36020,9 +28916,11 @@ EOF
     esac
     fi
 
     esac
     fi
 
+            WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
+
     if test $wxUSE_RPATH = "no"; then
         SAMPLES_RPATH_FLAG=''
     if test $wxUSE_RPATH = "no"; then
         SAMPLES_RPATH_FLAG=''
-        SAMPLES_RPATH_POSTLINK=''
+        DYLIB_PATH_POSTLINK=''
         WXCONFIG_RPATH=''
     fi
 
         WXCONFIG_RPATH=''
     fi
 
@@ -36045,15 +28943,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
     UNICODE=1
 fi
 
     UNICODE=1
 fi
 
-lib_debug_suffix=
-WX_DEBUGTYPE="release"
-DEBUG_FLAG=0
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-    lib_debug_suffix=d
-    WX_DEBUGTYPE="debug"
-    DEBUG_FLAG=1
-fi
-
 WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
 WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
 
 WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
 WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
 
@@ -36062,28 +28951,27 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
     DEBUG_INFO=1
 fi
 
     DEBUG_INFO=1
 fi
 
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
 
 
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 
 
-TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
 
 
-if test "$cross_compiling" = "yes"; then
-    HOST_SUFFIX="-$host_alias"
-    TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
-    TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME"
-fi
 
 
-WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
+else
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
+fi
 if test "${TOOLKIT_DIR}" = "os2"; then
 if test "${TOOLKIT_DIR}" = "os2"; then
-    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
 else
 else
-    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
 fi
 
 
 
 fi
 
 
 
-if test "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_OLD_COCOA" = 1; then
 
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -36093,13 +28981,9 @@ 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; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if AppKit/NSEvent.h conflicts with CoreFoundation" >&5
+$as_echo_n "checking if AppKit/NSEvent.h conflicts with CoreFoundation... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <AppKit/NSEvent.h>
 #include <CoreFoundation/CoreFoundation.h>
 /* end confdefs.h.  */
 #include <AppKit/NSEvent.h>
 #include <CoreFoundation/CoreFoundation.h>
@@ -36112,38 +28996,15 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
 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; }
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if defining __Point__ will fix it" >&5
+$as_echo_n "checking if defining __Point__ will fix it... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define __Point__ 1
 #include <AppKit/NSEvent.h>
 /* end confdefs.h.  */
 #define __Point__ 1
 #include <AppKit/NSEvent.h>
@@ -36157,46 +29018,22 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
-            cat >>confdefs.h <<\_ACEOF
-#define __Point__ 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            $as_echo "#define __Point__ 1" >>confdefs.h
 
 
 else
 
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       { { 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; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 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_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -36206,210 +29043,10 @@ 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="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
-        RESCOMP="echo -n \| $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; }
-if test "${ac_cv_type_mode_t+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.  */
-$ac_includes_default
-typedef mode_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_mode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_type_mode_t=no
-fi
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = x""yes; then :
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
 
 cat >>confdefs.h <<_ACEOF
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -36418,61 +29055,9 @@ _ACEOF
 
 fi
 
 
 fi
 
-{ 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
-  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
-typedef off_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_off_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_off_t=no
-fi
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = x""yes; then :
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -36481,61 +29066,9 @@ _ACEOF
 
 fi
 
 
 fi
 
-{ 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
-  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
-typedef pid_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_pid_t=no
-fi
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
 
 cat >>confdefs.h <<_ACEOF
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -36544,162 +29077,20 @@ _ACEOF
 
 fi
 
 
 fi
 
-{ 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
-  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
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_size_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-#define size_t unsigned int
-_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; }
-if test "${ac_cv_type_uid_t+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 <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-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; }
-if test $ac_cv_type_uid_t = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-
-fi
-
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
 
-{ 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
-  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
-typedef ssize_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_ssize_t=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_type_ssize_t=no
-fi
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
 
 
-rm -f core 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; }
-if test $ac_cv_type_ssize_t = yes; then
+
+
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SSIZE_T 1
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SSIZE_T 1
@@ -36714,17 +29105,13 @@ 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_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; }
-if test "${wx_cv_size_t_is_uint+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned int" >&5
+$as_echo_n "checking if size_t is unsigned int... " >&6; }
+if test "${wx_cv_size_t_is_uint+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
 int
 /* end confdefs.h.  */
 #include <stddef.h>
 int
@@ -36741,55 +29128,29 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_size_t_is_uint=no
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_size_t_is_uint" >&5
-echo "${ECHO_T}$wx_cv_size_t_is_uint" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_uint" >&5
+$as_echo "$wx_cv_size_t_is_uint" >&6; }
 
 if test "$wx_cv_size_t_is_uint" = "yes"; then
 
 if test "$wx_cv_size_t_is_uint" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxSIZE_T_IS_UINT 1
-_ACEOF
+    $as_echo "#define wxSIZE_T_IS_UINT 1" >>confdefs.h
 
 else
 
 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; }
-if test "${wx_cv_size_t_is_ulong+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned long" >&5
+$as_echo_n "checking if size_t is unsigned long... " >&6; }
+if test "${wx_cv_size_t_is_ulong+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
 int
 /* end confdefs.h.  */
 #include <stddef.h>
 int
@@ -36806,56 +29167,30 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_size_t_is_ulong=no
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_size_t_is_ulong" >&5
-echo "${ECHO_T}$wx_cv_size_t_is_ulong" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_size_t_is_ulong" >&5
+$as_echo "$wx_cv_size_t_is_ulong" >&6; }
 
     if test "$wx_cv_size_t_is_ulong" = "yes"; then
 
     if test "$wx_cv_size_t_is_ulong" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxSIZE_T_IS_ULONG 1
-_ACEOF
+        $as_echo "#define wxSIZE_T_IS_ULONG 1" >>confdefs.h
 
     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; }
-if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if wchar_t is separate type" >&5
+$as_echo_n "checking if wchar_t is separate type... " >&6; }
+if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
 int
 /* end confdefs.h.  */
 #include <wchar.h>
 int
@@ -36875,47 +29210,23 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_wchar_t_is_separate_type=yes
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_wchar_t_is_separate_type" >&5
+$as_echo "$wx_cv_wchar_t_is_separate_type" >&6; }
 
 if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
 
 if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxWCHAR_T_IS_REAL_TYPE 1
-_ACEOF
+    $as_echo "#define wxWCHAR_T_IS_REAL_TYPE 1" >>confdefs.h
 
 else
 
 else
-    cat >>confdefs.h <<\_ACEOF
-#define wxWCHAR_T_IS_REAL_TYPE 0
-_ACEOF
+    $as_echo "#define wxWCHAR_T_IS_REAL_TYPE 0" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -36926,17 +29237,13 @@ 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; }
-if test "${wx_cv_struct_pw_gecos+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pw_gecos in struct passwd" >&5
+$as_echo_n "checking for pw_gecos in struct passwd... " >&6; }
+if test "${wx_cv_struct_pw_gecos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pwd.h>
 int
 /* end confdefs.h.  */
 #include <pwd.h>
 int
@@ -36951,168 +29258,53 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
                 wx_cv_struct_pw_gecos=yes
 
 else
 
                 wx_cv_struct_pw_gecos=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
                 wx_cv_struct_pw_gecos=no
 
 
 fi
 
                 wx_cv_struct_pw_gecos=no
 
 
 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
-{ echo "$as_me:$LINENO: result: $wx_cv_struct_pw_gecos" >&5
-echo "${ECHO_T}$wx_cv_struct_pw_gecos" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_pw_gecos" >&5
+$as_echo "$wx_cv_struct_pw_gecos" >&6; }
 
 if test "$wx_cv_struct_pw_gecos" = "yes"; then
 
 if test "$wx_cv_struct_pw_gecos" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_PW_GECOS 1
-_ACEOF
+    $as_echo "#define HAVE_PW_GECOS 1" >>confdefs.h
 
 fi
 
 
 
 fi
 
 
-if test "$wxUSE_WCHAR_T" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WCHAR_T 1
-_ACEOF
-
-
-        WCSLEN_FOUND=0
-    WCHAR_LINK=
-
+WCSLEN_FOUND=0
+WCHAR_LINK=
 for ac_func in wcslen
 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen"
+if test "x$ac_cv_func_wcslen" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_WCSLEN 1
 _ACEOF
  WCSLEN_FOUND=1
 fi
 done
 
 
 _ACEOF
  WCSLEN_FOUND=1
 fi
 done
 
 
-    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; }
-if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "$WCSLEN_FOUND" = 0; then
+    if test "$TOOLKIT" = "MSW"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lmsvcrt" >&5
+$as_echo_n "checking for wcslen in -lmsvcrt... " >&6; }
+if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmsvcrt  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmsvcrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -37130,55 +29322,30 @@ return wcslen ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_msvcrt_wcslen=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_msvcrt_wcslen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_msvcrt_wcslen" >&5
+$as_echo "$ac_cv_lib_msvcrt_wcslen" >&6; }
+if test "x$ac_cv_lib_msvcrt_wcslen" = x""yes; then :
   WCHAR_OK=1
 fi
 
   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; }
-if test "${ac_cv_lib_w_wcslen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lw" >&5
+$as_echo_n "checking for wcslen in -lw... " >&6; }
+if test "${ac_cv_lib_w_wcslen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lw  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lw  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -37196,303 +29363,63 @@ return wcslen ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_w_wcslen=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_w_wcslen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wcslen" >&5
+$as_echo "$ac_cv_lib_w_wcslen" >&6; }
+if test "x$ac_cv_lib_w_wcslen" = x""yes; then :
 
 
-                            WCHAR_LINK=" -lw"
-                            WCSLEN_FOUND=1
+                        WCHAR_LINK=" -lw"
+                        WCSLEN_FOUND=1
 
 fi
 
 
 fi
 
-        fi
-    fi
-
-    if test "$WCSLEN_FOUND" = 1; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_WCSLEN 1
-_ACEOF
-
     fi
     fi
+fi
 
 
+if test "$WCSLEN_FOUND" = 1; then
+    $as_echo "#define HAVE_WCSLEN 1" >>confdefs.h
 
 
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
 _ACEOF
 
 fi
 done
 
 
-                    if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
-        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; }
-if test "${ac_cv_type_mbstate_t+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 <wchar.h>
-
-typedef mbstate_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_type_mbstate_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_mbstate_t=no
+if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
+    CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
+ac_fn_c_check_type "$LINENO" "mbstate_t" "ac_cv_type_mbstate_t" "#include <wchar.h>
+"
+if test "x$ac_cv_type_mbstate_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_MBSTATE_T 1
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_MBSTATE_T 1
 _ACEOF
 
-
 for ac_func in wcsrtombs
 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "wcsrtombs" "ac_cv_func_wcsrtombs"
+if test "x$ac_cv_func_wcsrtombs" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_WCSRTOMBS 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -37500,129 +29427,38 @@ done
 
 fi
 
 
 fi
 
-else
-    { echo "$as_me:$LINENO: WARNING: Wide character support is unavailable" >&5
-echo "$as_me: WARNING: Wide character support is unavailable" >&2;}
-fi
-
-
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+for ac_func in snprintf vsnprintf vsscanf
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
 _ACEOF
 
 fi
 done
 
 
+ac_ext=cpp
+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 "$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; }
-if test "${wx_cv_func_vsnprintf_decl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vsnprintf declaration" >&5
+$as_echo_n "checking for vsnprintf declaration... " >&6; }
+if test "${wx_cv_func_vsnprintf_decl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                                                            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                     #include <stdio.h>
                     #include <stdarg.h>
 /* end confdefs.h.  */
 
                     #include <stdio.h>
                     #include <stdarg.h>
-                    #ifdef __MSL__
-                    #if __MSL__ >= 0x6000
-                    namespace std {}
-                    using namespace std;
-                    #endif
-                    #endif
 
 int
 main ()
 
 int
 main ()
@@ -37636,56 +29472,30 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_func_vsnprintf_decl=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_vsnprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_vsnprintf_decl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_vsnprintf_decl" >&5
+$as_echo "$wx_cv_func_vsnprintf_decl" >&6; }
 
     if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
 
     if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_VSNPRINTF_DECL 1
-_ACEOF
+        $as_echo "#define HAVE_VSNPRINTF_DECL 1" >>confdefs.h
 
 
 
 
-                        { 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
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if vsnprintf declaration is broken" >&5
+$as_echo_n "checking if vsnprintf declaration is broken... " >&6; }
+if test "${wx_cv_func_broken_vsnprintf_decl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                         #include <stdio.h>
 /* end confdefs.h.  */
 
                         #include <stdio.h>
@@ -37710,60 +29520,34 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_func_broken_vsnprintf_decl=no
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_vsnprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_vsnprintf_decl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_broken_vsnprintf_decl" >&5
+$as_echo "$wx_cv_func_broken_vsnprintf_decl" >&6; }
 
         if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
 
         if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_VSNPRINTF_DECL 1
-_ACEOF
+            $as_echo "#define HAVE_BROKEN_VSNPRINTF_DECL 1" >>confdefs.h
 
         fi
     fi
 fi
 
 if test "$ac_cv_func_snprintf" = "yes"; then
 
         fi
     fi
 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; }
-if test "${wx_cv_func_snprintf_decl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snprintf declaration" >&5
+$as_echo_n "checking for snprintf declaration... " >&6; }
+if test "${wx_cv_func_snprintf_decl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                     #include <stdio.h>
 /* end confdefs.h.  */
 
                     #include <stdio.h>
@@ -37786,143 +29570,43 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_func_snprintf_decl=yes
 else
   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
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_snprintf_decl" >&5
+$as_echo "$wx_cv_func_snprintf_decl" >&6; }
 
     if test "$wx_cv_func_snprintf_decl" = "yes"; then
 
     if test "$wx_cv_func_snprintf_decl" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_SNPRINTF_DECL 1
-_ACEOF
-
-
-                        { 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
-
-                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>
-                        #include <stdarg.h>
-                        #ifdef __MSL__
-                        #if __MSL__ >= 0x6000
-                        namespace std {}
-                        using namespace std;
-                        #endif
-                        #endif
-
-int
-main ()
-{
-
-                        char *buf;
-                        const char *fmt = "%s";
-                        snprintf(buf, 10u, fmt, "wx");
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ 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
-#define HAVE_BROKEN_SNPRINTF_DECL 1
-_ACEOF
+        $as_echo "#define HAVE_SNPRINTF_DECL 1" >>confdefs.h
 
 
-        fi
     fi
 
     if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
 
     fi
 
     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; }
-if test "${wx_cv_func_snprintf_pos_params+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if snprintf supports positional arguments" >&5
+$as_echo_n "checking if snprintf supports positional arguments... " >&6; }
+if test "${wx_cv_func_snprintf_pos_params+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                if test "$cross_compiling" = yes; then
+                if test "$cross_compiling" = yes; then :
 
 
-                        { echo "$as_me:$LINENO: WARNING: Assuming Unix98 printf() is not available,
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming Unix98 printf() is not available,
 define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5
 define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5
-echo "$as_me: WARNING: Assuming Unix98 printf() is not available,
+$as_echo "$as_me: WARNING: Assuming Unix98 printf() is not available,
 define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;}
                         wx_cv_func_snprintf_pos_params=no
 
 
 else
 define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;}
                         wx_cv_func_snprintf_pos_params=no
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                         #include <stdio.h>
 /* end confdefs.h.  */
 
                         #include <stdio.h>
@@ -37937,271 +29621,102 @@ cat >>conftest.$ac_ext <<_ACEOF
                         }
 
 _ACEOF
                         }
 
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_cxx_try_run "$LINENO"; then :
   wx_cv_func_snprintf_pos_params=no
 else
   wx_cv_func_snprintf_pos_params=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-wx_cv_func_snprintf_pos_params=yes
+  wx_cv_func_snprintf_pos_params=yes
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_snprintf_pos_params" >&5
+$as_echo "$wx_cv_func_snprintf_pos_params" >&6; }
 
         if test "$wx_cv_func_snprintf_pos_params" = "yes"; then
 
         if test "$wx_cv_func_snprintf_pos_params" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNIX98_PRINTF 1
-_ACEOF
+            $as_echo "#define HAVE_UNIX98_PRINTF 1" >>confdefs.h
 
         fi
     fi
 fi
 
 
         fi
     fi
 fi
 
-if test "$wxUSE_UNICODE" = yes; then
-
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-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
-
-
-    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; }
-if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "$ac_cv_func_vsscanf" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vsscanf declaration" >&5
+$as_echo_n "checking for vsscanf declaration... " >&6; }
+if test "${wx_cv_func_vsscanf_decl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                        #include <stdio.h>
-                        #include <stdarg.h>
-                        #include <wchar.h>
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                    #ifdef __MSL__
+                    #if __MSL__ >= 0x6000
+                    namespace std {}
+                    using namespace std;
+                    #endif
+                    #endif
 
 int
 main ()
 {
 
 
 int
 main ()
 {
 
-                        wchar_t *buf;
-                        const wchar_t *fmt = L"test";
-                        swprintf(buf, 10u, fmt);
+                    char *buf;
+                    va_list args;
+                    vsscanf(buf, "%s", args);
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  wx_cv_func_broken_swprintf_decl=no
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_func_vsscanf_decl=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_func_broken_swprintf_decl=yes
+  wx_cv_func_vsscanf_decl=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
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_vsscanf_decl" >&5
+$as_echo "$wx_cv_func_vsscanf_decl" >&6; }
 
 
-        if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_SWPRINTF_DECL 1
-_ACEOF
+    if test "$wx_cv_func_vsscanf_decl" = "yes"; then
+        $as_echo "#define HAVE_VSSCANF_DECL 1" >>confdefs.h
 
 
-        fi
     fi
     fi
+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
+
+
+if test "$wxUSE_UNICODE" = yes; then
 
             wchar_headers="#include <stdio.h>
 #include <wchar.h>"
     case "${host}" in
         *-*-solaris2* )
 
             wchar_headers="#include <stdio.h>
 #include <wchar.h>"
     case "${host}" in
         *-*-solaris2* )
-            { echo "$as_me:$LINENO: checking for widec.h" >&5
-echo $ECHO_N "checking for widec.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_widec_h+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.  */
-$ac_includes_default
-
-#include <widec.h>
+            for ac_header in widec.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "widec.h" "ac_cv_header_widec_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_widec_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WIDEC_H 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_widec_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_widec_h=no
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_widec_h" >&5
-echo "${ECHO_T}$ac_cv_header_widec_h" >&6; }
 
 
+done
 
             if test "$ac_cv_header_widec_h" = "yes"; then
                 wchar_headers="$wchar_headers
 
             if test "$ac_cv_header_widec_h" = "yes"; then
                 wchar_headers="$wchar_headers
@@ -38210,22 +29725,18 @@ echo "${ECHO_T}$ac_cv_header_widec_h" >&6; }
     esac
 
 
     esac
 
 
-  for wx_func in wputc wputchar putws fputws wprintf vswprintf
+  for wx_func in putws fputws wprintf vswprintf vswscanf
   do
   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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
+
                 $wchar_headers
                 $ac_includes_default
 
                 $wchar_headers
                 $ac_includes_default
 
@@ -38243,44 +29754,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -38291,13 +29781,9 @@ _ACEOF
   done
 
 
   done
 
 
-                { 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 confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _vsnwprintf" >&5
+$as_echo_n "checking for _vsnwprintf... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
 int
 /* end confdefs.h.  */
 #include <wchar.h>
 int
@@ -38308,143 +29794,33 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
-                    cat >>confdefs.h <<\_ACEOF
-#define HAVE__VSNWPRINTF 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                    $as_echo "#define HAVE__VSNWPRINTF 1" >>confdefs.h
 
 else
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 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
 
-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 $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 <fnmatch.h>
-                $ac_includes_default
-
-int
-main ()
-{
-
-                #ifndef $wx_func
-                  &$wx_func;
-                #endif
-
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-
-    if eval test \$wx_cv_func_$wx_func = yes
-    then
-      cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
-_ACEOF
-
-
-    else
-      :
-
-    fi
-  done
-
-fi
-
 if test "$wxUSE_FILE" = "yes"; then
 
   for wx_func in fsync
   do
 if test "$wxUSE_FILE" = "yes"; then
 
   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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 /* end confdefs.h.  */
 
 
+
                 $ac_includes_default
 
 int
                 $ac_includes_default
 
 int
@@ -38461,44 +29837,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -38519,20 +29874,16 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
+
                 #include <math.h>
                 $ac_includes_default
 
                 #include <math.h>
                 $ac_includes_default
 
@@ -38550,44 +29901,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -38606,12 +29936,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test "$TOOLKIT" != "MSW"; then
 
 
 if test "$TOOLKIT" != "MSW"; then
 
-
+if test "$wxUSE_LIBICONV" != "no" ; then
 
 
 
 # Check whether --with-libiconv-prefix was given.
 
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
+if test "${with_libiconv_prefix+set}" = set; then :
   withval=$with_libiconv_prefix;
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
   withval=$with_libiconv_prefix;
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
@@ -38621,19 +29951,15 @@ if test "${with_libiconv_prefix+set}" = set; then
 fi
 
 
 fi
 
 
-  { 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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -38647,42 +29973,15 @@ iconv_t cd = iconv_open("","");
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_func_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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -38696,57 +29995,28 @@ iconv_t cd = iconv_open("","");
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
 
   if test "$am_cv_func_iconv" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
 
-    { 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
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv needs const" >&5
+$as_echo_n "checking if iconv needs const... " >&6; }
+if test "${wx_cv_func_iconv_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -38769,37 +30039,17 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   wx_cv_func_iconv_const="no"
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_iconv_const" >&5
-echo "${ECHO_T}$wx_cv_func_iconv_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_iconv_const" >&5
+$as_echo "$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
@@ -38818,98 +30068,16 @@ _ACEOF
   fi
 
 
   fi
 
 
-LIBS="$LIBICONV $LIBS"
-
-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`
-{ 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
+    LIBS="$LIBICONV $LIBS"
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+    for ac_func in sigaction
+do :
+  ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
+if test "x$ac_cv_func_sigaction" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SIGACTION 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -38917,16 +30085,16 @@ done
 
 
     if test "$ac_cv_func_sigaction" = "no"; then
 
 
     if test "$ac_cv_func_sigaction" = "no"; then
-        { echo "$as_me:$LINENO: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&5
-echo "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&5
+$as_echo "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&2;}
         wxUSE_ON_FATAL_EXCEPTION=no
     fi
 
     if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
         wxUSE_ON_FATAL_EXCEPTION=no
     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; }
-if test "${wx_cv_type_sa_handler+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_handler type" >&5
+$as_echo_n "checking for sa_handler type... " >&6; }
+if test "${wx_cv_type_sa_handler+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                 ac_ext=cpp
 else
 
                 ac_ext=cpp
@@ -38935,11 +30103,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <signal.h>
 int
 /* end confdefs.h.  */
 #include <signal.h>
 int
@@ -38955,35 +30119,15 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
                         wx_cv_type_sa_handler=int
 
 else
 
                         wx_cv_type_sa_handler=int
 
 else
-  echo "$as_me: failed program was:" >&5
-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
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -38993,8 +30137,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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sa_handler" >&5
+$as_echo "$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
@@ -39004,10 +30148,10 @@ _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; }
-if test "${wx_cv_func_backtrace+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace() in <execinfo.h>" >&5
+$as_echo_n "checking for backtrace() in <execinfo.h>... " >&6; }
+if test "${wx_cv_func_backtrace+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
             ac_ext=cpp
 else
 
             ac_ext=cpp
@@ -39016,11 +30160,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <execinfo.h>
 int
 /* end confdefs.h.  */
 #include <execinfo.h>
 int
@@ -39037,32 +30177,12 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_func_backtrace=yes
 else
   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
             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -39073,19 +30193,19 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_backtrace" >&5
+$as_echo "$wx_cv_func_backtrace" >&6; }
 
 
     if test "$wx_cv_func_backtrace" = "no"; then
 
 
     if test "$wx_cv_func_backtrace" = "no"; then
-        { echo "$as_me:$LINENO: WARNING: backtrace() is not available, wxStackWalker will not be available" >&5
-echo "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: backtrace() is not available, wxStackWalker will not be available" >&5
+$as_echo "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;}
         wxUSE_STACKWALKER=no
     else
         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; }
-if test "${wx_cv_func_cxa_demangle+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in <cxxabi.h>" >&5
+$as_echo_n "checking for __cxa_demangle() in <cxxabi.h>... " >&6; }
+if test "${wx_cv_func_cxa_demangle+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                 ac_ext=cpp
 else
 
                 ac_ext=cpp
@@ -39094,11 +30214,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <cxxabi.h>
 int
 /* end confdefs.h.  */
 #include <cxxabi.h>
 int
@@ -39112,35 +30228,14 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_link "$LINENO"; then :
   wx_cv_func_cxa_demangle=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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'
@@ -39150,131 +30245,42 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_cxa_demangle" >&5
+$as_echo "$wx_cv_func_cxa_demangle" >&6; }
 
         if test "$wx_cv_func_cxa_demangle" = "yes"; then
 
         if test "$wx_cv_func_cxa_demangle" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_CXA_DEMANGLE 1
-_ACEOF
+            $as_echo "#define HAVE_CXA_DEMANGLE 1" >>confdefs.h
 
         fi
     fi
 fi
 
 
         fi
     fi
 fi
 
-if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then
-    { echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5
-echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;}
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5
+$as_echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;}
     wxUSE_STACKWALKER=no
 fi
 
 
     wxUSE_STACKWALKER=no
 fi
 
 
-
-
 for ac_func in mkstemp mktemp
 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
 done
 
 
 _ACEOF
  break
 fi
 done
 
 
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs" >&5
+$as_echo_n "checking for statfs... " >&6; }
+if test "${wx_cv_func_statfs+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
              #if defined(__BSD__)
 /* end confdefs.h.  */
 
              #if defined(__BSD__)
@@ -39299,43 +30305,23 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   wx_cv_func_statfs=yes
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_statfs" >&5
-echo "${ECHO_T}$wx_cv_func_statfs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs" >&5
+$as_echo "$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; }
-if test "${wx_cv_func_statfs_decl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs declaration" >&5
+$as_echo_n "checking for statfs declaration... " >&6; }
+if test "${wx_cv_func_statfs_decl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 else
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -39343,11 +30329,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                  #if defined(__BSD__)
 /* end confdefs.h.  */
 
                  #if defined(__BSD__)
@@ -39368,32 +30350,12 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_func_statfs_decl=yes
 else
   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
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -39403,32 +30365,24 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statfs_decl" >&5
+$as_echo "$wx_cv_func_statfs_decl" >&6; }
 
     if test "$wx_cv_func_statfs_decl" = "yes"; then
 
     if test "$wx_cv_func_statfs_decl" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_STATFS_DECL 1
-_ACEOF
+        $as_echo "#define HAVE_STATFS_DECL 1" >>confdefs.h
 
     fi
 
     wx_cv_type_statvfs_t="struct statfs"
 
     fi
 
     wx_cv_type_statvfs_t="struct statfs"
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_STATFS 1
-_ACEOF
+    $as_echo "#define HAVE_STATFS 1" >>confdefs.h
 
 else
 
 else
-    { 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
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statvfs" >&5
+$as_echo_n "checking for statvfs... " >&6; }
+if test "${wx_cv_func_statvfs+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                 #include <stddef.h>
 /* end confdefs.h.  */
 
                 #include <stddef.h>
@@ -39444,43 +30398,23 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   wx_cv_func_statvfs=yes
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_statvfs" >&5
-echo "${ECHO_T}$wx_cv_func_statvfs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_statvfs" >&5
+$as_echo "$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; }
-if test "${wx_cv_type_statvfs_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statvfs argument type" >&5
+$as_echo_n "checking for statvfs argument type... " >&6; }
+if test "${wx_cv_type_statvfs_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 else
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -39488,11 +30422,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                     #include <sys/statvfs.h>
 /* end confdefs.h.  */
 
                     #include <sys/statvfs.h>
@@ -39502,549 +30432,162 @@ main ()
 {
 
                     long l;
 {
 
                     long l;
-                    statvfs_t fs;
-                    statvfs("/", &fs);
-                    l = fs.f_bsize;
-                    l += fs.f_blocks;
-                    l += fs.f_bavail;
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_type_statvfs_t=statvfs_t
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                            #include <sys/statvfs.h>
-
-int
-main ()
-{
-
-                            long l;
-                            struct statvfs fs;
-                            statvfs("/", &fs);
-                            l = fs.f_bsize;
-                            l += fs.f_blocks;
-                            l += fs.f_bavail;
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  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"
-
-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_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
-
-
-fi
-{ 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
-#define HAVE_STATVFS 1
-_ACEOF
-
-        fi
-    else
-                wx_cv_type_statvfs_t="unknown"
-    fi
-fi
-
-if test "$wx_cv_type_statvfs_t" != "unknown"; then
-    cat >>confdefs.h <<_ACEOF
-#define WX_STATFS_T $wx_cv_type_statvfs_t
-_ACEOF
-
-else
-    { echo "$as_me:$LINENO: WARNING: wxGetDiskSpace() function won't work without statfs()" >&5
-echo "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;}
-fi
-
-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`
-{ 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-    if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: wxSingleInstanceChecker not available" >&5
-echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;}
-        wxUSE_SNGLINST_CHECKER=no
-    fi
-fi
-
-
-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 $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.  */
+                    statvfs_t fs;
+                    statvfs("/", &fs);
+                    l = fs.f_bsize;
+                    l += fs.f_blocks;
+                    l += fs.f_bavail;
 
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_type_statvfs_t=statvfs_t
+else
 
 
-#undef $ac_func
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
+                            #include <sys/statvfs.h>
 
 int
 main ()
 {
 
 int
 main ()
 {
-return $ac_func ();
+
+                            long l;
+                            struct statvfs fs;
+                            statvfs("/", &fs);
+                            l = fs.f_bsize;
+                            l += fs.f_blocks;
+                            l += fs.f_bavail;
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_type_statvfs_t="struct statvfs"
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_type_statvfs_t="unknown"
 
 
-       eval "$as_ac_var=no"
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
 
 fi
 
 fi
-done
+rm -f core 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
 
 
 
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_statvfs_t" >&5
+$as_echo "$wx_cv_type_statvfs_t" >&6; }
 
 
+        if test "$wx_cv_type_statvfs_t" != "unknown"; then
+            $as_echo "#define HAVE_STATVFS 1" >>confdefs.h
 
 
-for ac_func in putenv setenv
-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 $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+        fi
+    else
+                wx_cv_type_statvfs_t="unknown"
+    fi
+fi
+
+if test "$wx_cv_type_statvfs_t" != "unknown"; then
+    cat >>confdefs.h <<_ACEOF
+#define WX_STATFS_T $wx_cv_type_statvfs_t
 _ACEOF
 _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.  */
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGetDiskSpace() function won't work without statfs()" >&5
+$as_echo "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;}
+fi
 
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+    for ac_func in fcntl flock
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ break
+fi
+done
 
 
-#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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
+    if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxSingleInstanceChecker not available" >&5
+$as_echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;}
+        wxUSE_SNGLINST_CHECKER=no
+    fi
+fi
 
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
+for ac_func in setenv putenv
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
+ break
 fi
 fi
+done
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+if test "$ac_cv_func_setenv" = "yes"; then
+    for ac_func in unsetenv
+do :
+  ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
+if test "x$ac_cv_func_unsetenv" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_UNSETENV 1
 _ACEOF
 _ACEOF
- break
+
 fi
 done
 
 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
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_SLEEP 1
-_ACEOF
+            $as_echo "#define HAVE_SLEEP 1" >>confdefs.h
 
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
 if test "$USE_DARWIN" = 1; then
 
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
 if test "$USE_DARWIN" = 1; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_USLEEP 1
-_ACEOF
+            $as_echo "#define HAVE_USLEEP 1" >>confdefs.h
 
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
 if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
         POSIX4_LINK=
 
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
 if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
         POSIX4_LINK=
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+    for ac_func in nanosleep
+do :
+  ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
+if test "x$ac_cv_func_nanosleep" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
 #define HAVE_NANOSLEEP 1
 _ACEOF
 #define HAVE_NANOSLEEP 1
 _ACEOF
+ $as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h
 
 else
 
 
 else
 
-            { 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
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lposix4" >&5
+$as_echo_n "checking for nanosleep in -lposix4... " >&6; }
+if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -40062,43 +30605,20 @@ return nanosleep ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_posix4_nanosleep=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_posix4_nanosleep = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_nanosleep" >&5
+$as_echo "$ac_cv_lib_posix4_nanosleep" >&6; }
+if test "x$ac_cv_lib_posix4_nanosleep" = x""yes; then :
 
 
-                    cat >>confdefs.h <<\_ACEOF
-#define HAVE_NANOSLEEP 1
-_ACEOF
+                    $as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h
 
                     POSIX4_LINK=" -lposix4"
 
 
                     POSIX4_LINK=" -lposix4"
 
@@ -40107,21 +30627,17 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 /* end confdefs.h.  */
 
 
+
                 $ac_includes_default
 
 int
                 $ac_includes_default
 
 int
@@ -40138,51 +30654,30 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
     else
       :
 _ACEOF
 
 
     else
       :
-      { echo "$as_me:$LINENO: WARNING: wxSleep() function will not work" >&5
-echo "$as_me: WARNING: wxSleep() function will not work" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxSleep() function will not work" >&5
+$as_echo "$as_me: WARNING: wxSleep() function will not work" >&2;}
 
     fi
   done
 
     fi
   done
@@ -40201,20 +30696,16 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
+
                 #include <sys/utsname.h>
                 $ac_includes_default
 
                 #include <sys/utsname.h>
                 $ac_includes_default
 
@@ -40232,44 +30723,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -40283,21 +30753,17 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 /* end confdefs.h.  */
 
 
+
                 $ac_includes_default
 
 int
                 $ac_includes_default
 
 int
@@ -40314,44 +30780,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -40366,20 +30811,16 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
+
                 #define _REENTRANT
                 $ac_includes_default
 
                 #define _REENTRANT
                 $ac_includes_default
 
@@ -40397,44 +30838,23 @@ main ()
 }
 
 _ACEOF
 }
 
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -40446,114 +30866,25 @@ _ACEOF
 
 
 INET_LINK=
 
 
 INET_LINK=
-
 for ac_func in inet_addr
 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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "inet_addr" "ac_cv_func_inet_addr"
+if test "x$ac_cv_func_inet_addr" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
 #define HAVE_INET_ADDR 1
 _ACEOF
 #define HAVE_INET_ADDR 1
 _ACEOF
+ $as_echo "#define HAVE_INET_ADDR 1" >>confdefs.h
 
 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; }
-if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnsl" >&5
+$as_echo_n "checking for inet_addr in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -40571,54 +30902,29 @@ return inet_addr ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_inet_addr=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_nsl_inet_addr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_addr" >&5
+$as_echo "$ac_cv_lib_nsl_inet_addr" >&6; }
+if test "x$ac_cv_lib_nsl_inet_addr" = x""yes; then :
   INET_LINK="nsl"
 else
 
   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; }
-if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lresolv" >&5
+$as_echo_n "checking for inet_addr in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -40636,54 +30942,29 @@ return inet_addr ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_inet_addr=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_resolv_inet_addr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_addr" >&5
+$as_echo "$ac_cv_lib_resolv_inet_addr" >&6; }
+if test "x$ac_cv_lib_resolv_inet_addr" = x""yes; then :
   INET_LINK="resolv"
 else
 
   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; }
-if test "${ac_cv_lib_socket_inet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lsocket" >&5
+$as_echo_n "checking for inet_addr in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_inet_addr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -40701,39 +30982,18 @@ return inet_addr ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_inet_addr=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_socket_inet_addr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_inet_addr" >&5
+$as_echo "$ac_cv_lib_socket_inet_addr" >&6; }
+if test "x$ac_cv_lib_socket_inet_addr" = x""yes; then :
   INET_LINK="socket"
 
 fi
   INET_LINK="socket"
 
 fi
@@ -40752,37 +31012,27 @@ fi
 done
 
 
 done
 
 
-
 for ac_func in inet_aton
 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 $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+do :
+  ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
+if test "x$ac_cv_func_inet_aton" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_INET_ATON 1
 _ACEOF
 _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.  */
+ $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+else
 
 
-#undef $ac_func
+                        as_ac_Lib=`$as_echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -l$INET_LINK" >&5
+$as_echo_n "checking for inet_aton in -l$INET_LINK... " >&6; }
+if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$INET_LINK  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -40790,165 +31040,239 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-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
-#endif
-
+char inet_aton ();
 int
 main ()
 {
 int
 main ()
 {
-return $ac_func ();
+return inet_aton ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_ac_Lib=yes"
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  eval "$as_ac_Lib=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+eval ac_res=\$$as_ac_Lib
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+  $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-       eval "$as_ac_var=no"
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+
 fi
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_INET_ATON 1
-_ACEOF
+done
+
 
 
+if test "x$INET_LINK" != "x"; then
+    $as_echo "#define HAVE_INET_ADDR 1" >>confdefs.h
+
+    INET_LINK=" -l$INET_LINK"
+fi
+
+
+  for wx_func in fdopen
+  do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 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 $ECHO_N "(cached) $ECHO_C" >&6
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+
+                $ac_includes_default
+
+int
+main ()
+{
+
+                #ifndef $wx_func
+                  &$wx_func;
+                #endif
+
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval wx_cv_func_$wx_func=yes
 else
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$INET_LINK  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+  eval wx_cv_func_$wx_func=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+    if eval test \$wx_cv_func_$wx_func = yes
+    then
+      cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+    else
+      :
+
+    fi
+  done
+
+
+if test "$wxUSE_TARSTREAM" = "yes"; then
+
+  for wx_func in sysconf
+  do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char inet_aton ();
+
+
+                $ac_includes_default
+
 int
 main ()
 {
 int
 main ()
 {
-return inet_aton ();
+
+                #ifndef $wx_func
+                  &$wx_func;
+                #endif
+
+
   ;
   return 0;
 }
   ;
   return 0;
 }
+
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_Lib=yes"
+if ac_fn_c_try_link "$LINENO"; then :
+  eval wx_cv_func_$wx_func=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_Lib=no"
+  eval wx_cv_func_$wx_func=no
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_INET_ATON 1
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+    if eval test \$wx_cv_func_$wx_func = yes
+    then
+      cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 _ACEOF
 
-fi
 
 
+    else
+      :
+
+    fi
+  done
+
+
+
+  for wx_func in getpwuid_r
+  do
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+
+                    #define _REENTRANT
+                    #include <pwd.h>
 
 
+                $ac_includes_default
+
+int
+main ()
+{
+
+                #ifndef $wx_func
+                  &$wx_func;
+                #endif
+
+                    struct passwd pw, *ppw;
+                    char buf[1024];
+                    getpwuid_r(0, &pw, buf, sizeof(buf), &ppw)
+
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval wx_cv_func_$wx_func=yes
+else
+  eval wx_cv_func_$wx_func=no
 fi
 fi
-done
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
+fi
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 
-if test "x$INET_LINK" != "x"; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_INET_ADDR 1
+    if eval test \$wx_cv_func_$wx_func = yes
+    then
+      cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 _ACEOF
 
-    INET_LINK=" -l$INET_LINK"
-fi
+
+    else
+      :
+
+    fi
+  done
+
 
 
 
 
-  for wx_func in fdopen
+  for wx_func in getgrgid_r
   do
   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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5
+$as_echo_n "checking for $wx_func... " >&6; }
+if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 /* end confdefs.h.  */
 
 
+
+                    #define _REENTRANT
+                    #include <grp.h>
+
                 $ac_includes_default
 
 int
                 $ac_includes_default
 
 int
@@ -40959,50 +31283,33 @@ main ()
                   &$wx_func;
                 #endif
 
                   &$wx_func;
                 #endif
 
+                    struct group grp, *pgrp;
+                    char buf[1024];
+                    getgrgid_r(0, &grp, buf, sizeof(buf), &pgrp)
+
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   eval wx_cv_func_$wx_func=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+eval ac_res=\$wx_cv_func_$wx_func
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
 
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `$as_echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 _ACEOF
 
 
@@ -41012,6 +31319,7 @@ _ACEOF
     fi
   done
 
     fi
   done
 
+fi
 
 fi
 
 
 fi
 
@@ -41044,12 +31352,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
     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;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
       esac ;;
     esac
   done
@@ -41057,8 +31366,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `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"
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -41081,12 +31390,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
 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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     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;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
   fi
 fi
 rm -f confcache
@@ -41100,8 +31409,8 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
 
     if test "$wxUSE_THREADS" = "yes" ; then
         if test "$USE_BEOS" = 1; then
 
     if test "$wxUSE_THREADS" = "yes" ; then
         if test "$USE_BEOS" = 1; then
-            { echo "$as_me:$LINENO: WARNING: BeOS threads are not yet supported... disabled" >&5
-echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: BeOS threads are not yet supported... disabled" >&5
+$as_echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
             wxUSE_THREADS="no"
         fi
     fi
             wxUSE_THREADS="no"
         fi
     fi
@@ -41144,6 +31453,10 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
                 fi
                 ;;
 
                 fi
                 ;;
 
+          *-*-qnx*)
+                                                THREAD_OPTS=""
+                ;;
+
           *-*-*UnixWare*)
                                 if test "x$GCC" != "xyes"; then
                     THREAD_OPTS="-Ethread"
           *-*-*UnixWare*)
                                 if test "x$GCC" != "xyes"; then
                     THREAD_OPTS="-Ethread"
@@ -41151,25 +31464,33 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
                 ;;
         esac
 
                 ;;
         esac
 
-                                THREAD_OPTS="$THREAD_OPTS pthread none"
+        case "${host}" in
+            *-*-qnx*)
+                                                                THREAD_OPTS="none pthread"
+                ;;
+
+            *)
+                                                                                THREAD_OPTS="$THREAD_OPTS pthread none"
+                ;;
+        esac
 
                 THREADS_OK=no
         for flag in $THREAD_OPTS; do
             case $flag in
                 none)
 
                 THREADS_OK=no
         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; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+$as_echo_n "checking whether pthreads work without any flags... " >&6; }
                     ;;
 
                 -*)
                     ;;
 
                 -*)
-                    { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5
+$as_echo_n "checking whether pthreads work with $flag... " >&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; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5
+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
                     THREADS_LINK="-l$flag"
                     ;;
               esac
                     THREADS_LINK="-l$flag"
                     ;;
               esac
@@ -41179,11 +31500,7 @@ echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }
               LIBS="$THREADS_LINK $LIBS"
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 
               LIBS="$THREADS_LINK $LIBS"
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 
-              cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -41194,40 +31511,17 @@ pthread_create(0,0,0,0);
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   THREADS_OK=yes
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 
 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 
-              { echo "$as_me:$LINENO: result: $THREADS_OK" >&5
-echo "${ECHO_T}$THREADS_OK" >&6; }
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THREADS_OK" >&5
+$as_echo "$THREADS_OK" >&6; }
               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi
               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi
@@ -41238,18 +31532,20 @@ echo "${ECHO_T}$THREADS_OK" >&6; }
 
       if test "x$THREADS_OK" != "xyes"; then
           wxUSE_THREADS=no
 
       if test "x$THREADS_OK" != "xyes"; then
           wxUSE_THREADS=no
-          { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5
-echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No thread support on this system... disabled" >&5
+$as_echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
       else
       else
-                              LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+                                                                                          LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+          WXCONFIG_LDFLAGS="$THREADS_CFLAGS $WXCONFIG_LDFLAGS"
           LIBS="$THREADS_LINK $LIBS"
 
           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; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
           flag=no
           case "${host}" in
             *-aix*)
                                                                                                                 LDFLAGS="-L/usr/lib/threads $LDFLAGS"
           flag=no
           case "${host}" in
             *-aix*)
                                                                                                                 LDFLAGS="-L/usr/lib/threads $LDFLAGS"
+                WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS"
                 flag="-D_THREAD_SAFE"
                 ;;
             *-freebsd*)
                 flag="-D_THREAD_SAFE"
                 ;;
             *-freebsd*)
@@ -41265,8 +31561,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; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
+$as_echo "${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
@@ -41276,105 +31572,41 @@ echo "${ECHO_T}${flag}" >&6; }
     fi
 
         if test "$wxUSE_THREADS" = "yes" ; then
     fi
 
         if test "$wxUSE_THREADS" = "yes" ; then
-
-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 $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+        for ac_func in pthread_setconcurrency
+do :
+  ac_fn_c_check_func "$LINENO" "pthread_setconcurrency" "ac_cv_func_pthread_setconcurrency"
+if test "x$ac_cv_func_pthread_setconcurrency" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_SETCONCURRENCY 1
 _ACEOF
 _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
+ $as_echo "#define HAVE_PTHREAD_SET_CONCURRENCY 1" >>confdefs.h
 
 
-/* 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
+else
 
 
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
+                for ac_func in thr_setconcurrency
+do :
+  ac_fn_c_check_func "$LINENO" "thr_setconcurrency" "ac_cv_func_thr_setconcurrency"
+if test "x$ac_cv_func_thr_setconcurrency" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_THR_SETCONCURRENCY 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ $as_echo "#define HAVE_THR_SETCONCURRENCY 1" >>confdefs.h
 
 
-       eval "$as_ac_var=no"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread concurrency will not work properly" >&5
+$as_echo "$as_me: WARNING: Setting thread concurrency will not work properly" >&2;}
 fi
 fi
+done
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-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
 done
 
 
-                  { 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
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cleanup_push/pop" >&5
+$as_echo_n "checking for pthread_cleanup_push/pop... " >&6; }
+if test "${wx_cv_func_pthread_cleanup+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                                 ac_ext=cpp
 else
 
                                 ac_ext=cpp
@@ -41383,11 +31615,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
                void ThreadCleanupFunc(void *p);
 /* end confdefs.h.  */
 #include <pthread.h>
                void ThreadCleanupFunc(void *p);
@@ -41404,36 +31632,16 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
                wx_cv_func_pthread_cleanup=yes
 
 else
 
                wx_cv_func_pthread_cleanup=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
                wx_cv_func_pthread_cleanup=no
 
 
 fi
 
                wx_cv_func_pthread_cleanup=no
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -41443,162 +31651,41 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_cleanup" >&5
+$as_echo "$wx_cv_func_pthread_cleanup" >&6; }
       if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
       if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_PTHREAD_CLEANUP 1
-_ACEOF
+        $as_echo "#define wxHAVE_PTHREAD_CLEANUP 1" >>confdefs.h
 
       fi
 
 
       fi
 
-      { echo "$as_me:$LINENO: checking for sched.h" >&5
-echo $ECHO_N "checking for sched.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sched_h+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.  */
-$ac_includes_default
-
-#include <sched.h>
+      for ac_header in sched.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_sched_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SCHED_H 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_sched_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_sched_h=no
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sched_h" >&5
-echo "${ECHO_T}$ac_cv_header_sched_h" >&6; }
 
 
+done
 
       if test "$ac_cv_header_sched_h" = "yes"; then
 
       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; }
-if test "${ac_cv_func_sched_yield+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 sched_yield to an innocuous variant, in case <limits.h> declares sched_yield.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define sched_yield innocuous_sched_yield
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sched_yield (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return sched_yield ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_sched_yield=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_sched_yield=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_func_sched_yield = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SCHED_YIELD 1
-_ACEOF
+          ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield"
+if test "x$ac_cv_func_sched_yield" = x""yes; then :
+  $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
 
 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; }
-if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+$as_echo_n "checking for sched_yield in -lposix4... " >&6; }
+if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -41616,603 +31703,50 @@ return sched_yield ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_posix4_sched_yield=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_posix4_sched_yield = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SCHED_YIELD 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5
+$as_echo "$ac_cv_lib_posix4_sched_yield" >&6; }
+if test "x$ac_cv_lib_posix4_sched_yield" = x""yes; then :
+  $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
  POSIX4_LINK=" -lposix4"
 else
  POSIX4_LINK=" -lposix4"
 else
-  { echo "$as_me:$LINENO: WARNING: wxThread::Yield will not work properly" >&5
-echo "$as_me: WARNING: wxThread::Yield will not work properly" >&2;}
-
-fi
-
-
-
-fi
-
-      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; }
-if test "${ac_cv_func_pthread_attr_getschedpolicy+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 pthread_attr_getschedpolicy to an innocuous variant, in case <limits.h> declares pthread_attr_getschedpolicy.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define pthread_attr_getschedpolicy innocuous_pthread_attr_getschedpolicy
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_getschedpolicy (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return pthread_attr_getschedpolicy ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-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; }
-if test "${ac_cv_func_pthread_attr_setschedparam+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 pthread_attr_setschedparam to an innocuous variant, in case <limits.h> declares pthread_attr_setschedparam.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define pthread_attr_setschedparam innocuous_pthread_attr_setschedparam
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setschedparam (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return pthread_attr_setschedparam ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-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; }
-if test "${ac_cv_func_sched_get_priority_max+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 sched_get_priority_max to an innocuous variant, in case <limits.h> declares sched_get_priority_max.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define sched_get_priority_max innocuous_sched_get_priority_max
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sched_get_priority_max (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return sched_get_priority_max ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-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; }
-if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix4  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sched_get_priority_max ();
-int
-main ()
-{
-return sched_get_priority_max ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then
-
-                                HAVE_PRIOR_FUNCS=1
-                                POSIX4_LINK=" -lposix4"
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-      if test "$HAVE_PRIOR_FUNCS" = 1; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
-_ACEOF
-
-      else
-        { echo "$as_me:$LINENO: WARNING: Setting thread priority will not work" >&5
-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; }
-if test "${ac_cv_func_pthread_cancel+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 pthread_cancel to an innocuous variant, in case <limits.h> declares pthread_cancel.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define pthread_cancel innocuous_pthread_cancel
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_cancel (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return pthread_cancel ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_pthread_cancel=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_pthread_cancel=no
-fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Yield will not work properly" >&5
+$as_echo "$as_me: WARNING: wxThread::Yield will not work properly" >&2;}
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-{ 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
-_ACEOF
-
-else
-  { echo "$as_me:$LINENO: WARNING: wxThread::Kill() will not work properly" >&5
-echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;}
-fi
-
-
-      { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define pthread_mutex_timedlock to an innocuous variant, in case <limits.h> declares pthread_mutex_timedlock.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define pthread_mutex_timedlock innocuous_pthread_mutex_timedlock
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_mutex_timedlock (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return pthread_mutex_timedlock ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_func_pthread_mutex_timedlock = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1
-_ACEOF
 
 
-else
-  { echo "$as_me:$LINENO: WARNING: wxMutex::LockTimeout() will not work" >&5
-echo "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;}
 fi
 
 fi
 
+      fi
 
 
-      { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define pthread_attr_setstacksize to an innocuous variant, in case <limits.h> declares pthread_attr_setstacksize.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define pthread_attr_setstacksize innocuous_pthread_attr_setstacksize
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pthread_attr_setstacksize (); 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 pthread_attr_setstacksize
+                                          HAVE_PRIOR_FUNCS=0
+      ac_fn_c_check_func "$LINENO" "pthread_attr_getschedpolicy" "ac_cv_func_pthread_attr_getschedpolicy"
+if test "x$ac_cv_func_pthread_attr_getschedpolicy" = x""yes; then :
+  ac_fn_c_check_func "$LINENO" "pthread_attr_setschedparam" "ac_cv_func_pthread_attr_setschedparam"
+if test "x$ac_cv_func_pthread_attr_setschedparam" = x""yes; then :
+  ac_fn_c_check_func "$LINENO" "sched_get_priority_max" "ac_cv_func_sched_get_priority_max"
+if test "x$ac_cv_func_sched_get_priority_max" = x""yes; then :
+  HAVE_PRIOR_FUNCS=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_max in -lposix4" >&5
+$as_echo_n "checking for sched_get_priority_max in -lposix4... " >&6; }
+if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lposix4  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -42220,73 +31754,86 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
 #ifdef __cplusplus
 extern "C"
 #endif
-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
-choke me
-#endif
-
+char sched_get_priority_max ();
 int
 main ()
 {
 int
 main ()
 {
-return pthread_attr_setstacksize ();
+return sched_get_priority_max ();
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_pthread_attr_setstacksize=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_posix4_sched_get_priority_max=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_lib_posix4_sched_get_priority_max=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5
+$as_echo "$ac_cv_lib_posix4_sched_get_priority_max" >&6; }
+if test "x$ac_cv_lib_posix4_sched_get_priority_max" = x""yes; then :
+
+                                HAVE_PRIOR_FUNCS=1
+                                POSIX4_LINK=" -lposix4"
 
 
-       ac_cv_func_pthread_attr_setstacksize=no
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+
 fi
 fi
-{ 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
-_ACEOF
 
 
+
+fi
+
+
+fi
+
+
+      if test "$HAVE_PRIOR_FUNCS" = 1; then
+        $as_echo "#define HAVE_THREAD_PRIORITY_FUNCTIONS 1" >>confdefs.h
+
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Setting thread priority will not work" >&5
+$as_echo "$as_me: WARNING: Setting thread priority will not work" >&2;}
+      fi
+
+      ac_fn_c_check_func "$LINENO" "pthread_cancel" "ac_cv_func_pthread_cancel"
+if test "x$ac_cv_func_pthread_cancel" = x""yes; then :
+  $as_echo "#define HAVE_PTHREAD_CANCEL 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxThread::Kill() will not work properly" >&5
+$as_echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;}
 fi
 
 
 fi
 
 
+      ac_fn_c_check_func "$LINENO" "pthread_mutex_timedlock" "ac_cv_func_pthread_mutex_timedlock"
+if test "x$ac_cv_func_pthread_mutex_timedlock" = x""yes; then :
+  $as_echo "#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1" >>confdefs.h
 
 
-      { 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
 else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex::LockTimeout() will not work" >&5
+$as_echo "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;}
+fi
 
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+      ac_fn_c_check_func "$LINENO" "pthread_attr_setstacksize" "ac_cv_func_pthread_attr_setstacksize"
+if test "x$ac_cv_func_pthread_attr_setstacksize" = x""yes; then :
+  $as_echo "#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1" >>confdefs.h
+
+fi
+
+
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_t" >&5
+$as_echo_n "checking for pthread_mutexattr_t... " >&6; }
+if test "${wx_cv_type_pthread_mutexattr_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -42300,55 +31847,29 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   wx_cv_type_pthread_mutexattr_t=yes
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_mutexattr_t" >&5
-echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_mutexattr_t" >&5
+$as_echo "$wx_cv_type_pthread_mutexattr_t" >&6; }
 
       if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
 
       if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEXATTR_T 1
-_ACEOF
+        $as_echo "#define HAVE_PTHREAD_MUTEXATTR_T 1" >>confdefs.h
 
 
 
 
-                        { 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
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_settype declaration" >&5
+$as_echo_n "checking for pthread_mutexattr_settype declaration... " >&6; }
+if test "${wx_cv_func_pthread_mutexattr_settype_decl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -42362,55 +31883,29 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   wx_cv_func_pthread_mutexattr_settype_decl=yes
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5
+$as_echo "$wx_cv_func_pthread_mutexattr_settype_decl" >&6; }
         if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then
         if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
-_ACEOF
+            $as_echo "#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1" >>confdefs.h
 
         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; }
-if test "${wx_cv_type_pthread_rec_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+$as_echo_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... " >&6; }
+if test "${wx_cv_type_pthread_rec_mutex_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -42423,389 +31918,254 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
                     wx_cv_type_pthread_rec_mutex_init=yes
 
 else
 
                     wx_cv_type_pthread_rec_mutex_init=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
                     wx_cv_type_pthread_rec_mutex_init=no
 
 
 fi
 
                     wx_cv_type_pthread_rec_mutex_init=no
 
 
 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
-{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_rec_mutex_init" >&5
-echo "${ECHO_T}$wx_cv_type_pthread_rec_mutex_init" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_pthread_rec_mutex_init" >&5
+$as_echo "$wx_cv_type_pthread_rec_mutex_init" >&6; }
         if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
         if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
-          cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
-_ACEOF
+          $as_echo "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1" >>confdefs.h
 
         else
 
         else
-                    { echo "$as_me:$LINENO: WARNING: wxMutex won't be recursive on this platform" >&5
-echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMutex won't be recursive on this platform" >&5
+$as_echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
         fi
       fi
         fi
       fi
-    fi
 
 
-else
-    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; }
-if test "${wx_cv_cflags_mthread+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      if test "$wxUSE_COMPILER_TLS" = "auto"; then
+          if test "$USE_NETBSD" = 1; then
+              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&5
+$as_echo "$as_me: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&2;}
+              wxUSE_COMPILER_TLS=no
+          else
+              wxUSE_COMPILER_TLS=yes
+          fi
+      fi
+
+      if test "$wxUSE_COMPILER_TLS" = "yes"; then
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread keyword" >&5
+$as_echo_n "checking for __thread keyword... " >&6; }
+if test "${wx_cv_cc___thread+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                    CFLAGS_OLD="$CFLAGS"
-                    CFLAGS="-mthreads $CFLAGS"
-                    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* end confdefs.h.  */
-
+#include <pthread.h>
 int
 main ()
 {
 
 int
 main ()
 {
 
+                          static __thread int n = 0;
+                          static __thread int *p = 0;
+
   ;
   return 0;
 }
 _ACEOF
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  wx_cv_cflags_mthread=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_cc___thread=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_cflags_mthread=no
+  wx_cv_cc___thread=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
-{ echo "$as_me:$LINENO: result: $wx_cv_cflags_mthread" >&5
-echo "${ECHO_T}$wx_cv_cflags_mthread" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cc___thread" >&5
+$as_echo "$wx_cv_cc___thread" >&6; }
 
 
-            if test "$wx_cv_cflags_mthread" = "yes"; then
-                                WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads"
-                LDFLAGS="$LDFLAGS -mthreads"
-            else
-                                CFLAGS="$CFLAGS_OLD"
-            fi
-        ;;
-        *-pc-os2*emx )
-            WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__"
-            LDFLAGS="$LDFLAGS -Zmt"
-        ;;
-      esac
-    fi
-fi
+          if test "$wx_cv_cc___thread" = "yes"; then
 
 
-{ 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define localtime_r to an innocuous variant, in case <limits.h> declares localtime_r.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define localtime_r innocuous_localtime_r
+  GXX_VERSION=""
 
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char localtime_r (); 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 localtime_r
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc accepts -dumpversion option" >&5
+$as_echo_n "checking if gcc accepts -dumpversion option... " >&6; }
 
 
-/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
+  if  test "x$GCC" = "xyes" ; then :
 
 
-int
-main ()
+    if  test -z "" ; then :
+
+      ax_gcc_option_test="int main()
 {
 {
-return localtime_r ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_localtime_r=yes
+       return 0;
+}"
+
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_func_localtime_r=no
-fi
+      ax_gcc_option_test=""
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-{ 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
-_ACEOF
+
+    # Dump the test program to file
+    cat <<EOF > conftest.c
+$ax_gcc_option_test
+EOF
+
+    # Dump back the file to the log, useful for debugging purposes
+    { ac_try='cat conftest.c 1>&5'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+
+    if  { ac_try='$CC  -dumpversion -c conftest.c 1>&5'
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } ; then :
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+    ax_gcc_version_option=yes
+
+
+else
+
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    ax_gcc_version_option=no
+
 
 fi
 
 
 fi
 
-{ 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
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gmtime_r to an innocuous variant, in case <limits.h> declares gmtime_r.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gmtime_r innocuous_gmtime_r
 
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gmtime_r (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no gcc available" >&5
+$as_echo "no gcc available" >&6; }
 
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+fi
 
 
-#undef gmtime_r
+  if test "x$GXX" = "xyes"; then :
 
 
-/* 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
+    if test "x$ax_gxx_version_option" != "no"; then :
 
 
-int
-main ()
-{
-return gmtime_r ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_gmtime_r=yes
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking gxx version" >&5
+$as_echo_n "checking gxx version... " >&6; }
+if test "${ax_cv_gxx_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-       ac_cv_func_gmtime_r=no
+        ax_cv_gxx_version="`$CXX -dumpversion`"
+        if test "x$ax_cv_gxx_version" = "x"; then :
+
+          ax_cv_gxx_version=""
+
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-{ 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
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_gxx_version" >&5
+$as_echo "$ax_cv_gxx_version" >&6; }
+      GXX_VERSION=$ax_cv_gxx_version
 
 fi
 
 
 fi
 
-{ 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define readdir_r innocuous_readdir_r
+fi
 
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readdir_r (); 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
+              if test -n "$ax_cv_gxx_version"; then
+                                                                                                                                                                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __thread support in g++ is usable" >&5
+$as_echo_n "checking whether __thread support in g++ is usable... " >&6; }
+                  case "$ax_cv_gxx_version" in
+                    1.* | 2.* | 3.* )
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, it's broken" >&5
+$as_echo "no, it's broken" >&6; }
+                        wx_cv_cc___thread=no
+                        ;;
+                    *)
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, it works" >&5
+$as_echo "yes, it works" >&6; }
+                        ;;
+                  esac
+              fi
+          fi
 
 
-#undef readdir_r
+          if test "$wx_cv_cc___thread" = "yes"; then
+            $as_echo "#define HAVE___THREAD_KEYWORD 1" >>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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
+          fi
+        fi
+    fi
+
+else
+    if test "$wxUSE_THREADS" = "yes" ; then
+      case "${host}" in
+        x86_64-*-mingw32* )
+        ;;
+        *-*-mingw32* )
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5
+$as_echo_n "checking if compiler supports -mthreads... " >&6; }
+if test "${wx_cv_cflags_mthread+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                    CFLAGS_OLD="$CFLAGS"
+                    CFLAGS="-mthreads $CFLAGS"
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 int
 main ()
 {
 
 int
 main ()
 {
-return readdir_r ();
+
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_readdir_r=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_cflags_mthread=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  wx_cv_cflags_mthread=no
 
 
-       ac_cv_func_readdir_r=no
 fi
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
 fi
-{ 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
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_cflags_mthread" >&5
+$as_echo "$wx_cv_cflags_mthread" >&6; }
+
+            if test "$wx_cv_cflags_mthread" = "yes"; then
+                                WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads"
+                LDFLAGS="$LDFLAGS -mthreads"
+            else
+                                CFLAGS="$CFLAGS_OLD"
+            fi
+        ;;
+        *-pc-os2*emx )
+            WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__"
+            LDFLAGS="$LDFLAGS -Zmt"
+        ;;
+      esac
+    fi
+fi
+
+ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
+if test "x$ac_cv_func_localtime_r" = x""yes; then :
+   $as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
+if test "x$ac_cv_func_gmtime_r" = x""yes; then :
+   $as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -42818,11 +32178,11 @@ 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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5
+$as_echo_n "checking how many arguments gethostbyname_r() takes... " >&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 :
+  $as_echo_n "(cached) " >&6
 else
 
 
 else
 
 
@@ -42839,49 +32199,25 @@ ac_cv_func_which_gethostbyname_r=unknown
 # netdb.h is not declaring the function, and the compiler is thereby
 # assuming an implicit prototype. In which case, we're out of luck.
 #
 # netdb.h is not declaring the function, and the compiler is thereby
 # assuming an implicit prototype. In which case, we're out of luck.
 #
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
-           char *name = "www.gnu.org";
-           (void)gethostbyname_r(name) /* ; */
+            char *name = "www.gnu.org";
+            (void)gethostbyname_r(name) /* ; */
+
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=no
   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 core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 #
@@ -42891,53 +32227,29 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
-           char *name = "www.gnu.org";
-           struct hostent ret, *retp;
-           char buf[1024];
-           int buflen = 1024;
-           int my_h_errno;
-           (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
+            char *name = "www.gnu.org";
+            struct hostent ret, *retp;
+            char buf[1024];
+            int buflen = 1024;
+            int my_h_errno;
+            (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
+
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=six
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
@@ -42949,53 +32261,29 @@ fi
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
-           char *name = "www.gnu.org";
-           struct hostent ret;
-           char buf[1024];
-           int buflen = 1024;
-           int my_h_errno;
-           (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
+            char *name = "www.gnu.org";
+            struct hostent ret;
+            char buf[1024];
+            int buflen = 1024;
+            int my_h_errno;
+            (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
+
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=five
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
@@ -43007,51 +32295,27 @@ fi
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
 
 if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 main ()
 {
 
-           char *name = "www.gnu.org";
-           struct hostent ret;
-           struct hostent_data data;
-           (void)gethostbyname_r(name, &ret, &data) /* ; */
+            char *name = "www.gnu.org";
+            struct hostent ret;
+            struct hostent_data data;
+            (void)gethostbyname_r(name, &ret, &data) /* ; */
+
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=three
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
@@ -43063,46 +32327,38 @@ 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; }
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FUNC_GETHOSTBYNAME_R_3 1
-_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: three" >&5
+$as_echo "three" >&6; }
+    $as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h
 
     ;;
 
     five)
 
     ;;
 
     five)
-    { echo "$as_me:$LINENO: result: five" >&5
-echo "${ECHO_T}five" >&6; }
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FUNC_GETHOSTBYNAME_R_5 1
-_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5
+$as_echo "five" >&6; }
+    $as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h
 
     ;;
 
     six)
 
     ;;
 
     six)
-    { echo "$as_me:$LINENO: result: six" >&5
-echo "${ECHO_T}six" >&6; }
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_FUNC_GETHOSTBYNAME_R_6 1
-_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: six" >&5
+$as_echo "six" >&6; }
+    $as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h
 
     ;;
 
     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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5
+$as_echo "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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
+$as_echo "can't tell" >&6; }
     ;;
 
     *)
     ;;
 
     *)
-    { { echo "$as_me:$LINENO: error: internal error" >&5
-echo "$as_me: error: internal error" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "internal error" "$LINENO" 5
     ;;
 esac
 
     ;;
 esac
 
@@ -43116,100 +32372,18 @@ 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; }
-if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_gethostbyname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_func_gethostbyname = yes; then
-   cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETHOSTBYNAME 1
-_ACEOF
+          ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+   $as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
 
 fi
 
       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; }
-if test "${ac_cv_func_which_getservbyname_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments getservbyname_r() takes" >&5
+$as_echo_n "checking how many arguments getservbyname_r() takes... " >&6; }
+if test "${ac_cv_func_which_getservbyname_r+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                 ac_ext=cpp
 else
 
                 ac_ext=cpp
@@ -43219,11 +32393,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 /* end confdefs.h.  */
 #include <netdb.h>
 int
@@ -43241,34 +32411,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_func_which_getservbyname_r=six
 else
   ac_cv_func_which_getservbyname_r=six
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 /* end confdefs.h.  */
 #include <netdb.h>
 int
@@ -43286,34 +32433,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_func_which_getservbyname_r=five
 else
   ac_cv_func_which_getservbyname_r=five
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
 /* end confdefs.h.  */
 #include <netdb.h>
 int
@@ -43330,42 +32454,20 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_func_which_getservbyname_r=four
 else
   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
 
 
 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
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -43376,122 +32478,31 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_which_getservbyname_r" >&5
+$as_echo "$ac_cv_func_which_getservbyname_r" >&6; }
 
 if test $ac_cv_func_which_getservbyname_r = six; then
 
 if test $ac_cv_func_which_getservbyname_r = six; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_FUNC_GETSERVBYNAME_R_6 1
-_ACEOF
+  $as_echo "#define HAVE_FUNC_GETSERVBYNAME_R_6 1" >>confdefs.h
 
 elif test $ac_cv_func_which_getservbyname_r = five; then
 
 elif test $ac_cv_func_which_getservbyname_r = five; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_FUNC_GETSERVBYNAME_R_5 1
-_ACEOF
+  $as_echo "#define HAVE_FUNC_GETSERVBYNAME_R_5 1" >>confdefs.h
 
 elif test $ac_cv_func_which_getservbyname_r = four; then
 
 elif test $ac_cv_func_which_getservbyname_r = four; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_FUNC_GETSERVBYNAME_R_4 1
-_ACEOF
+  $as_echo "#define HAVE_FUNC_GETSERVBYNAME_R_4 1" >>confdefs.h
 
 fi
 
 
       if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \
               "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then
 
 fi
 
 
       if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \
               "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+          for ac_func in getservbyname
+do :
+  ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname"
+if test "x$ac_cv_func_getservbyname" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  cat >>confdefs.h <<\_ACEOF
 #define HAVE_GETSERVBYNAME 1
 _ACEOF
 #define HAVE_GETSERVBYNAME 1
 _ACEOF
+  $as_echo "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
 
 fi
 done
 
 fi
 done
@@ -43499,38 +32510,28 @@ done
       fi
 
 if test "$wxUSE_THREADS" = "yes"; then
       fi
 
 if test "$wxUSE_THREADS" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_THREADS 1
-_ACEOF
+  $as_echo "#define wxUSE_THREADS 1" >>confdefs.h
 
 
   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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -D_REENTRANT is needed" >&5
+$as_echo_n "checking if -D_REENTRANT is needed... " >&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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
     else
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
   fi
 fi
 
     fi
   fi
 fi
 
-if test "$WXGTK20" = 1 ; then
-  cat >>confdefs.h <<_ACEOF
-#define __WXGTK20__ $WXGTK20
-_ACEOF
-
-  WXGTK12=1
-fi
-
-if test "$WXGTK12" = 1 ; then
+if test "$WXGTK2" = 1 ; then
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define __WXGTK12__ $WXGTK12
+#define __WXGTK20__ $WXGTK2
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -43550,9 +32551,11 @@ _ACEOF
 fi
 
 DEBUG_CFLAGS=
 fi
 
 DEBUG_CFLAGS=
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5
+$as_echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;}
+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
     DEBUG_CFLAGS="-g"
     DEBUG_CFLAGS="-g"
-    wxUSE_OPTIMISE=no
 fi
 
 if test "$wxUSE_DEBUG_GDB" = "yes" ; then
 fi
 
 if test "$wxUSE_DEBUG_GDB" = "yes" ; then
@@ -43562,32 +32565,24 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
     fi
 fi
 
     fi
 fi
 
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define WXDEBUG 1
-_ACEOF
+if test "$wxUSE_DEBUG_FLAG" = "no" ; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
 
 
-    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
-else
     if test "$wxUSE_GTK" = 1 ; then
         if test "x$wxGTK_VERSION" = "x1" ; then
             CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
     if test "$wxUSE_GTK" = 1 ; then
         if test "x$wxGTK_VERSION" = "x1" ; then
             CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
+        else
+            CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
         fi
     fi
 fi
 
 if test "$wxUSE_MEM_TRACING" = "yes" ; then
         fi
     fi
 fi
 
 if test "$wxUSE_MEM_TRACING" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MEMORY_TRACING 1
-_ACEOF
+    $as_echo "#define wxUSE_MEMORY_TRACING 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
-_ACEOF
+    $as_echo "#define wxUSE_GLOBAL_MEMORY_OPERATORS 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DEBUG_NEW_ALWAYS 1
-_ACEOF
+    $as_echo "#define wxUSE_DEBUG_NEW_ALWAYS 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi
@@ -43603,7 +32598,7 @@ fi
 
 if test "$GCC" = "yes" ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
 
 if test "$GCC" = "yes" ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
-        WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-rtti"
+                                WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -DwxNO_RTTI -fno-rtti"
     fi
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
         WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions"
     fi
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
         WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions"
@@ -43623,56 +32618,53 @@ if test "$GCC" = "yes" ; then
 fi
 
 OPTIMISE_CFLAGS=
 fi
 
 OPTIMISE_CFLAGS=
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    if test "$GCC" = yes ; then
-                        OPTIMISE_CFLAGS="-O0"
-    fi
+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5
+$as_echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;}
 else
 else
-    if test "$GCC" = yes ; then
-        case "${host}" in
-            *-pc-os2_emx | *-pc-os2-emx )
-                                                OPTIMISE_CFLAGS="-O2"
-            ;;
-            *)
-                                                                OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
-            ;;
-        esac
+    if test "$wxUSE_OPTIMISE" = "no" ; then
+        if test "$GCC" = yes ; then
+                                    OPTIMISE_CFLAGS="-O0"
+        fi
     else
     else
-        OPTIMISE_CFLAGS="-O"
+        if test "$GCC" = yes ; then
+            case "${host}" in
+                *-pc-os2_emx | *-pc-os2-emx )
+                                                            OPTIMISE_CFLAGS="-O2"
+                ;;
+                *)
+                                                                                OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
+                ;;
+            esac
+        else
+            OPTIMISE_CFLAGS="-O"
+        fi
     fi
 fi
 
 
 if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
     fi
 fi
 
 
 if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define WXWIN_COMPATIBILITY_2_6 1
-_ACEOF
+    $as_echo "#define WXWIN_COMPATIBILITY_2_6 1" >>confdefs.h
 
 
     WXWIN_COMPATIBILITY_2_8="yes"
 fi
 
 if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
 
 
     WXWIN_COMPATIBILITY_2_8="yes"
 fi
 
 if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
-    cat >>confdefs.h <<\_ACEOF
-#define WXWIN_COMPATIBILITY_2_8 1
-_ACEOF
+    $as_echo "#define WXWIN_COMPATIBILITY_2_8 1" >>confdefs.h
 
 fi
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
 fi
 
 
 if test "$wxUSE_GUI" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GUI 1
-_ACEOF
+    $as_echo "#define wxUSE_GUI 1" >>confdefs.h
 
 
                                             fi
 
 
 if test "$wxUSE_UNIX" = "yes"; then
 
 
                                             fi
 
 
 if test "$wxUSE_UNIX" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_UNIX 1
-_ACEOF
+  $as_echo "#define wxUSE_UNIX 1" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -43682,122 +32674,31 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
     HAVE_DL_FUNCS=0
     HAVE_SHL_FUNCS=0
     if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
     HAVE_DL_FUNCS=0
     HAVE_SHL_FUNCS=0
     if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-        if test "$USE_DARWIN" = 1; then
-                        HAVE_DL_FUNCS=1
-        elif test "$USE_DOS" = 1; then
+        if test "$USE_DOS" = 1; then
             HAVE_DL_FUNCS=0
         else
             HAVE_DL_FUNCS=0
         else
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+                                                for ac_func in dlopen
+do :
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-                cat >>confdefs.h <<\_ACEOF
 #define HAVE_DLOPEN 1
 _ACEOF
 
 #define HAVE_DLOPEN 1
 _ACEOF
 
+                $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
+
                 HAVE_DL_FUNCS=1
 
 else
 
                 HAVE_DL_FUNCS=1
 
 else
 
-                { 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
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -43815,160 +32716,48 @@ return dlopen ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
 
 
-                                cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
+                                $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
                                 HAVE_DL_FUNCS=1
                                 DL_LINK=" -ldl$DL_LINK"
 
 else
 
 
                                 HAVE_DL_FUNCS=1
                                 DL_LINK=" -ldl$DL_LINK"
 
 else
 
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+                                for ac_func in shl_load
+do :
+  ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-                                                cat >>confdefs.h <<\_ACEOF
 #define HAVE_SHL_LOAD 1
 _ACEOF
 
 #define HAVE_SHL_LOAD 1
 _ACEOF
 
+                                                $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
+
                                                 HAVE_SHL_FUNCS=1
 
 else
 
                                                 HAVE_SHL_FUNCS=1
 
 else
 
-                                                { 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
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld in -lshl_load" >&5
+$as_echo_n "checking for dld in -lshl_load... " >&6; }
+if test "${ac_cv_lib_shl_load_dld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lshl_load  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lshl_load  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -43986,39 +32775,18 @@ return dld ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_shl_load_dld=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_shl_load_dld = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_shl_load_dld" >&5
+$as_echo "$ac_cv_lib_shl_load_dld" >&6; }
+if test "x$ac_cv_lib_shl_load_dld" = x""yes; then :
 
                                                                 HAVE_SHL_FUNCS=1
                                                                 DL_LINK=" -ldld$DL_LINK"
 
                                                                 HAVE_SHL_FUNCS=1
                                                                 DL_LINK=" -ldld$DL_LINK"
@@ -44037,115 +32805,26 @@ fi
 done
 
 
 done
 
 
-                if test "$HAVE_DL_FUNCS" = 1; then
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+                        if test "$HAVE_DL_FUNCS" = 1; then
+                for ac_func in dlerror
+do :
+  ac_fn_c_check_func "$LINENO" "dlerror" "ac_cv_func_dlerror"
+if test "x$ac_cv_func_dlerror" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
 #define HAVE_DLERROR 1
 _ACEOF
 #define HAVE_DLERROR 1
 _ACEOF
+ $as_echo "#define HAVE_DLERROR 1" >>confdefs.h
 
 else
 
 
 else
 
-                    { 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
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlerror in -ldl" >&5
+$as_echo_n "checking for dlerror in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -44163,42 +32842,19 @@ return dlerror ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlerror=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_dl_dlerror = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLERROR 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlerror" >&5
+$as_echo "$ac_cv_lib_dl_dlerror" >&6; }
+if test "x$ac_cv_lib_dl_dlerror" = x""yes; then :
+  $as_echo "#define HAVE_DLERROR 1" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -44207,19 +32863,23 @@ fi
 fi
 done
 
 fi
 done
 
+            fi
         fi
         fi
+
+                if test "$USE_DARWIN" = 1; then
+                        HAVE_DL_FUNCS=1
         fi
 
         if test "$HAVE_DL_FUNCS" = 0; then
             if test "$HAVE_SHL_FUNCS" = 0; then
               if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then
         fi
 
         if test "$HAVE_DL_FUNCS" = 0; then
             if test "$HAVE_SHL_FUNCS" = 0; then
               if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then
-                  { echo "$as_me:$LINENO: WARNING: Missing dynamic loading support, several features will be disabled" >&5
-echo "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;}
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing dynamic loading support, several features will be disabled" >&5
+$as_echo "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;}
                   wxUSE_DYNAMIC_LOADER=no
                   wxUSE_DYNLIB_CLASS=no
               else
                   wxUSE_DYNAMIC_LOADER=no
                   wxUSE_DYNLIB_CLASS=no
               else
-                  { echo "$as_me:$LINENO: WARNING: Assuming wxLibrary class works on this platform" >&5
-echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;}
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming wxLibrary class works on this platform" >&5
+$as_echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;}
               fi
             fi
         fi
               fi
             fi
         fi
@@ -44227,15 +32887,11 @@ echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;}
 fi
 
 if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
 fi
 
 if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DYNAMIC_LOADER 1
-_ACEOF
+    $as_echo "#define wxUSE_DYNAMIC_LOADER 1" >>confdefs.h
 
 fi
 if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
 
 fi
 if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DYNLIB_CLASS 1
-_ACEOF
+    $as_echo "#define wxUSE_DYNLIB_CLASS 1" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -44243,190 +32899,193 @@ fi
 
 if test "$wxUSE_PLUGINS" = "yes" ; then
     if test "$wxUSE_SHARED" = "no" ; then
 
 if test "$wxUSE_PLUGINS" = "yes" ; then
     if test "$wxUSE_SHARED" = "no" ; then
-        { echo "$as_me:$LINENO: WARNING: plugins supported only in shared build, disabling" >&5
-echo "$as_me: WARNING: plugins supported only in shared build, disabling" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: plugins supported only in shared build, disabling" >&5
+$as_echo "$as_me: WARNING: plugins supported only in shared build, disabling" >&2;}
         wxUSE_PLUGINS=no
     fi
     if test "$wxUSE_MONOLITHIC" = "yes" ; then
         wxUSE_PLUGINS=no
     fi
     if test "$wxUSE_MONOLITHIC" = "yes" ; then
-        { echo "$as_me:$LINENO: WARNING: plugins not supported monolithic build, disabling" >&5
-echo "$as_me: WARNING: plugins not supported monolithic build, disabling" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: plugins not supported monolithic build, disabling" >&5
+$as_echo "$as_me: WARNING: plugins not supported monolithic build, disabling" >&2;}
         wxUSE_PLUGINS=no
     fi
     if test "$wxUSE_DYNLIB_CLASS" = "no" ; then
         wxUSE_PLUGINS=no
     fi
     if test "$wxUSE_DYNLIB_CLASS" = "no" ; then
-        { echo "$as_me:$LINENO: WARNING: plugins require wxDynamicLibrary, disabling" >&5
-echo "$as_me: WARNING: plugins require wxDynamicLibrary, disabling" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: plugins require wxDynamicLibrary, disabling" >&5
+$as_echo "$as_me: WARNING: plugins require wxDynamicLibrary, disabling" >&2;}
         wxUSE_PLUGINS=no
     fi
     if test "$wxUSE_PLUGINS" = "yes" ; then
         wxUSE_PLUGINS=no
     fi
     if test "$wxUSE_PLUGINS" = "yes" ; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PLUGINS 1
+        $as_echo "#define wxUSE_PLUGINS 1" >>confdefs.h
+
+    fi
+fi
+
+
+if test "$wxUSE_FSWATCHER" = "yes"; then
+                if test "$wxUSE_MSW" != "1"; then
+        if test "$wxUSE_UNIX" = "yes"; then
+            for ac_header in sys/inotify.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_INOTIFY_H 1
+_ACEOF
+
+fi
+
+done
+
+            if test "$ac_cv_header_sys_inotify_h" = "yes"; then
+                $as_echo "#define wxHAS_INOTIFY 1" >>confdefs.h
+
+            else
+                for ac_header in sys/event.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_sys_event_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_EVENT_H 1
 _ACEOF
 
 _ACEOF
 
+fi
+
+done
+
+                if test "$ac_cv_header_sys_event_h" = "yes"; then
+                    $as_echo "#define wxHAS_KQUEUE 1" >>confdefs.h
+
+                else
+                    wxUSE_FSWATCHER=no
+                fi
+            fi
+        else
+            wxUSE_FSWATCHER=no
+        fi
+    else
+        if test "$wxUSE_THREADS" != "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5
+$as_echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;}
+            wxUSE_FSWATCHER=no
+        fi
+    fi
+
+    if test "$wxUSE_FSWATCHER" = "yes"; then
+        $as_echo "#define wxUSE_FSWATCHER 1" >>confdefs.h
+
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystemWatcher won't be available on this platform" >&5
+$as_echo "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;}
     fi
 fi
 
 
 if test "$wxUSE_STL" = "yes"; then
     fi
 fi
 
 
 if test "$wxUSE_STL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STL 1
-_ACEOF
+  $as_echo "#define wxUSE_STL 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_EXTENDED_RTTI" = "yes"; then
 
 fi
 
 if test "$wxUSE_EXTENDED_RTTI" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EXTENDED_RTTI 1
-_ACEOF
+  $as_echo "#define wxUSE_EXTENDED_RTTI 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_ANY" = "yes"; then
+    $as_echo "#define wxUSE_ANY 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_APPLE_IEEE" = "yes"; then
 
 fi
 
 if test "$wxUSE_APPLE_IEEE" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_APPLE_IEEE 1
-_ACEOF
+  $as_echo "#define wxUSE_APPLE_IEEE 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_TIMER" = "yes"; then
 
 fi
 
 if test "$wxUSE_TIMER" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TIMER 1
-_ACEOF
+  $as_echo "#define wxUSE_TIMER 1" >>confdefs.h
 
 fi
 
 
 fi
 
-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; }
-if test "${ac_cv_header_sys_soundcard+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "$USE_UNIX" = 1 ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
+$as_echo_n "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... " >&6; }
+if test "${ac_cv_header_sys_soundcard+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                    #include <sys/ioctl.h>
-                    #include <sys/soundcard.h>
+                #include <sys/ioctl.h>
+                #include <sys/soundcard.h>
 
 int
 main ()
 {
 
 
 int
 main ()
 {
 
-                    ioctl(0, SNDCTL_DSP_SPEED, 0);
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_header_sys_soundcard=yes
 else
   ac_cv_header_sys_soundcard=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
 
-                    saveLibs="$LIBS"
-                    LIBS="$saveLibs -lossaudio"
-                    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                saveLibs="$LIBS"
+                LIBS="$saveLibs -lossaudio"
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                            #include <sys/ioctl.h>
-                            #include <sys/soundcard.h>
+                        #include <sys/ioctl.h>
+                        #include <sys/soundcard.h>
 
 int
 main ()
 {
 
 
 int
 main ()
 {
 
-                            ioctl(0, SNDCTL_DSP_SPEED, 0);
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_header_sys_soundcard=yes
 else
   ac_cv_header_sys_soundcard=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
 
-                            LIBS="$saveLibs"
-                            ac_cv_header_sys_soundcard=no
+                        LIBS="$saveLibs"
+                        ac_cv_header_sys_soundcard=no
 
 
 fi
 
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
 fi
 
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5
-echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6; }
-    fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_soundcard" >&5
+$as_echo "$ac_cv_header_sys_soundcard" >&6; }
 
     if test "$ac_cv_header_sys_soundcard" = "yes"; then
 
     if test "$ac_cv_header_sys_soundcard" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_SOUNDCARD_H 1
-_ACEOF
+        $as_echo "#define HAVE_SYS_SOUNDCARD_H 1" >>confdefs.h
 
     fi
 fi
 
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
 
     fi
 fi
 
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
-  if test "$USE_UNIX" = "1" ; then
+  if test "$USE_UNIX" = 1 ; then
     if test "$wxUSE_LIBSDL" != "no"; then
 
 # Check whether --with-sdl-prefix was given.
     if test "$wxUSE_LIBSDL" != "no"; then
 
 # Check whether --with-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"
 else
   sdl_prefix=""
   withval=$with_sdl_prefix; sdl_prefix="$withval"
 else
   sdl_prefix=""
@@ -44434,14 +33093,14 @@ fi
 
 
 # Check whether --with-sdl-exec-prefix was given.
 
 
 # Check whether --with-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"
 else
   sdl_exec_prefix=""
 fi
 
 # Check whether --enable-sdltest was given.
   withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
 else
   sdl_exec_prefix=""
 fi
 
 # Check whether --enable-sdltest was given.
-if test "${enable_sdltest+set}" = set; then
+if test "${enable_sdltest+set}" = set; then :
   enableval=$enable_sdltest;
 else
   enable_sdltest=yes
   enableval=$enable_sdltest;
 else
   enable_sdltest=yes
@@ -44466,10 +33125,10 @@ 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; }
-if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SDL_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $SDL_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $SDL_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -44481,14 +33140,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
@@ -44497,17 +33156,17 @@ esac
 fi
 SDL_CONFIG=$ac_cv_path_SDL_CONFIG
 if test -n "$SDL_CONFIG"; then
 fi
 SDL_CONFIG=$ac_cv_path_SDL_CONFIG
 if test -n "$SDL_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
-echo "${ECHO_T}$SDL_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
+$as_echo "$SDL_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   min_sdl_version=1.2.0
 fi
 
 
   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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
+$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
   no_sdl=""
   if test "$SDL_CONFIG" = "no" ; then
     no_sdl=yes
   no_sdl=""
   if test "$SDL_CONFIG" = "no" ; then
     no_sdl=yes
@@ -44529,14 +33188,10 @@ echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
       LIBS="$LIBS $SDL_LIBS"
       rm -f conf.sdltest
       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
       LIBS="$LIBS $SDL_LIBS"
       rm -f conf.sdltest
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -44597,59 +33252,33 @@ int main (int argc, char *argv[])
 
 
 _ACEOF
 
 
 _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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
 
-( exit $ac_status )
-no_sdl=yes
+else
+  no_sdl=yes
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam 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; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
                     EXTRALIBS_SDL="$SDL_LIBS"
                     CFLAGS="$SDL_CFLAGS $CFLAGS"
                     CXXFLAGS="$SDL_CFLAGS $CXXFLAGS"
 
                     EXTRALIBS_SDL="$SDL_LIBS"
                     CFLAGS="$SDL_CFLAGS $CFLAGS"
                     CXXFLAGS="$SDL_CFLAGS $CXXFLAGS"
-                    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBSDL 1
-_ACEOF
+                    $as_echo "#define wxUSE_LIBSDL 1" >>confdefs.h
 
 
   else
 
 
   else
-     { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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"
@@ -44663,11 +33292,7 @@ echo "${ECHO_T}no" >&6; }
           CFLAGS="$CFLAGS $SDL_CFLAGS"
           CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
           LIBS="$LIBS $SDL_LIBS"
           CFLAGS="$CFLAGS $SDL_CFLAGS"
           CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
           LIBS="$LIBS $SDL_LIBS"
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -44686,24 +33311,7 @@ main ()
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; 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"
@@ -44714,17 +33322,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
-  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 "*** exact error that occured. This usually means SDL was incorrectly installed"
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occurred. 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 "*** 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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           CFLAGS="$ac_save_CFLAGS"
           CXXFLAGS="$ac_save_CXXFLAGS"
           LIBS="$ac_save_LIBS"
           CFLAGS="$ac_save_CFLAGS"
           CXXFLAGS="$ac_save_CXXFLAGS"
           LIBS="$ac_save_LIBS"
@@ -44742,34 +33346,26 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
         WITH_PLUGIN_SDL=1
       fi
     fi
         WITH_PLUGIN_SDL=1
       fi
     fi
-  else
-        if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxSound not supported in MGL under DOS... disabled" >&5
-echo "$as_me: WARNING: wxSound not supported in MGL under DOS... disabled" >&2;}
-        wxUSE_SOUND="no"
-    fi
   fi
 fi
 
 if test "$wxUSE_SOUND" = "yes"; then
   fi
 fi
 
 if test "$wxUSE_SOUND" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SOUND 1
-_ACEOF
+  $as_echo "#define wxUSE_SOUND 1" >>confdefs.h
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
 fi
 
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
 fi
 
-if test "$WXGTK20" = 1; then
+if test "$WXGTK2" = 1; then
 
 
 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 "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
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -44781,14 +33377,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
 IFS=$as_save_IFS
 
   ;;
@@ -44796,11 +33392,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -44809,10 +33405,10 @@ 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
   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; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -44824,14 +33420,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
 IFS=$as_save_IFS
 
   ;;
@@ -44839,11 +33435,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -44851,12 +33447,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -44868,37 +33460,126 @@ 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; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&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; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
        else
        else
-               { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKPRINT" >&5
+$as_echo_n "checking for GTKPRINT... " >&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" && \
+    { { $as_echo "$as_me:${as_lineno-$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=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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" && \
+    { { $as_echo "$as_me:${as_lineno-$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=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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
+
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+$as_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
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+$as_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
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                        CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
+                        CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
+                        $as_echo "#define wxUSE_GTKPRINT 1" >>confdefs.h
+
+
+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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNOMEPRINTUI" >&5
+$as_echo_n "checking for LIBGNOMEPRINTUI... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$LIBGNOMEPRINTUI_CFLAGS"; then
         pkg_cv_LIBGNOMEPRINTUI_CFLAGS="$LIBGNOMEPRINTUI_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$LIBGNOMEPRINTUI_CFLAGS"; then
         pkg_cv_LIBGNOMEPRINTUI_CFLAGS="$LIBGNOMEPRINTUI_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null`
 else
   pkg_failed=yes
@@ -44912,11 +33593,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_LIBGNOMEPRINTUI_LIBS="$LIBGNOMEPRINTUI_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_LIBGNOMEPRINTUI_LIBS="$LIBGNOMEPRINTUI_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_LIBGNOMEPRINTUI_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2 >= 2.8" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_LIBGNOMEPRINTUI_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2 >= 2.8" 2>/dev/null`
 else
   pkg_failed=yes
@@ -44944,29 +33625,37 @@ fi
        echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5
 
 
        echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5
 
 
-                        { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5
-echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}
+                        if test "$wxUSE_GTKPRINT" = yes; then
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        else
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5
+$as_echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}
+                        fi
                         wxUSE_LIBGNOMEPRINT="no"
 
 
 elif test $pkg_failed = untried; then
 
                         wxUSE_LIBGNOMEPRINT="no"
 
 
 elif test $pkg_failed = untried; then
 
-                        { echo "$as_me:$LINENO: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5
-echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}
+                        if test "$wxUSE_GTKPRINT" = yes; then
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        else
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5
+$as_echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;}
+                        fi
                         wxUSE_LIBGNOMEPRINT="no"
 
 
 else
        LIBGNOMEPRINTUI_CFLAGS=$pkg_cv_LIBGNOMEPRINTUI_CFLAGS
        LIBGNOMEPRINTUI_LIBS=$pkg_cv_LIBGNOMEPRINTUI_LIBS
                         wxUSE_LIBGNOMEPRINT="no"
 
 
 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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
                         CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
                         CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
 
                         CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
                         CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
-                        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBGNOMEPRINT 1
-_ACEOF
+                        $as_echo "#define wxUSE_LIBGNOMEPRINT 1" >>confdefs.h
 
 
 fi
 
 
 fi
@@ -44978,19 +33667,19 @@ fi
 
 
 pkg_failed=no
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GNOMEVFS" >&5
-echo $ECHO_N "checking for GNOMEVFS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5
+$as_echo_n "checking for GNOMEVFS... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GNOMEVFS_CFLAGS"; then
         pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GNOMEVFS_CFLAGS"; then
         pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -45004,11 +33693,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -45036,29 +33725,27 @@ fi
        echo "$GNOMEVFS_PKG_ERRORS" >&5
 
 
        echo "$GNOMEVFS_PKG_ERRORS" >&5
 
 
-                        { echo "$as_me:$LINENO: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5
-echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;}
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5
+$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;}
                         wxUSE_LIBGNOMEVFS="no"
 
 
 elif test $pkg_failed = untried; then
 
                         wxUSE_LIBGNOMEVFS="no"
 
 
 elif test $pkg_failed = untried; then
 
-                        { echo "$as_me:$LINENO: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5
-echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;}
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5
+$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;}
                         wxUSE_LIBGNOMEVFS="no"
 
 
 else
        GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS
        GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS
                         wxUSE_LIBGNOMEVFS="no"
 
 
 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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
                         CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
                         CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
 
                         CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
                         CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
-                        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBGNOMEVFS 1
-_ACEOF
+                        $as_echo "#define wxUSE_LIBGNOMEVFS 1" >>confdefs.h
 
 
 fi
 
 
 fi
@@ -45068,19 +33755,19 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON" >&5
+$as_echo_n "checking for HILDON... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$HILDON_CFLAGS"; then
         pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$HILDON_CFLAGS"; then
         pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-lgpl >= 0.9\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-lgpl >= 0.9\""; } >&5
   ($PKG_CONFIG --exists --print-errors "hildon-lgpl >= 0.9") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "hildon-lgpl >= 0.9") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-lgpl >= 0.9" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_HILDON_CFLAGS=`$PKG_CONFIG --cflags "hildon-lgpl >= 0.9" 2>/dev/null`
 else
   pkg_failed=yes
@@ -45094,11 +33781,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_HILDON_LIBS="$HILDON_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_HILDON_LIBS="$HILDON_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-lgpl >= 0.9\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-lgpl >= 0.9\""; } >&5
   ($PKG_CONFIG --exists --print-errors "hildon-lgpl >= 0.9") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "hildon-lgpl >= 0.9") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-lgpl >= 0.9" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_HILDON_LIBS=`$PKG_CONFIG --libs "hildon-lgpl >= 0.9" 2>/dev/null`
 else
   pkg_failed=yes
@@ -45126,177 +33813,243 @@ fi
        echo "$HILDON_PKG_ERRORS" >&5
 
 
        echo "$HILDON_PKG_ERRORS" >&5
 
 
-                { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
-echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_lgpl not found" >&5
+$as_echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                         wxUSE_LIBHILDON="no"
                         wxUSE_LIBHILDON="no"
+                        ac_hildon_lgpl=0
 
 
 elif test $pkg_failed = untried; then
 
 
 
 elif test $pkg_failed = untried; then
 
-                { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
-echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_lgpl not found" >&5
+$as_echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                         wxUSE_LIBHILDON="no"
                         wxUSE_LIBHILDON="no"
+                        ac_hildon_lgpl=0
 
 
 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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
                 EXTRALIBS_HILDON="$HILDON_LIBS"
                 CFLAGS="$CFLAGS $HILDON_CFLAGS"
                 CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
 
                 EXTRALIBS_HILDON="$HILDON_LIBS"
                 CFLAGS="$CFLAGS $HILDON_CFLAGS"
                 CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LIBHILDON 1
-_ACEOF
+                $as_echo "#define wxUSE_LIBHILDON 1" >>confdefs.h
+
+                ac_hildon_lgpl=1
+
+fi
+
+        if test "$ac_hildon_lgpl" = 0 ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON2" >&5
+$as_echo_n "checking for HILDON2... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HILDON2_CFLAGS"; then
+        pkg_cv_HILDON2_CFLAGS="$HILDON2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_HILDON2_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 1.99" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HILDON2_LIBS"; then
+        pkg_cv_HILDON2_LIBS="$HILDON2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_HILDON2_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 1.99" 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
 fi
+        if test $_pkg_short_errors_supported = yes; then
+               HILDON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+        else
+               HILDON2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$HILDON2_PKG_ERRORS" >&5
+
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_1 not found" >&5
+$as_echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+                            wxUSE_LIBHILDON2="no"
+
+
+elif test $pkg_failed = untried; then
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libhildon_1 not found" >&5
+$as_echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+                            wxUSE_LIBHILDON2="no"
+
+
+else
+       HILDON2_CFLAGS=$pkg_cv_HILDON2_CFLAGS
+       HILDON2_LIBS=$pkg_cv_HILDON2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                    EXTRALIBS_HILDON="$HILDON2_LIBS"
+                    CFLAGS="$CFLAGS $HILDON2_CFLAGS"
+                    CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
+                    $as_echo "#define wxUSE_LIBHILDON2 1" >>confdefs.h
+
+
+fi
+        fi
     fi
 fi
 
 if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
     fi
 fi
 
 if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CMDLINE_PARSER 1
-_ACEOF
+  $as_echo "#define wxUSE_CMDLINE_PARSER 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_STOPWATCH" = "yes"; then
 
 fi
 
 if test "$wxUSE_STOPWATCH" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STOPWATCH 1
-_ACEOF
+  $as_echo "#define wxUSE_STOPWATCH 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then
 
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DATETIME 1
-_ACEOF
+  $as_echo "#define wxUSE_DATETIME 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_FILE" = "yes"; then
 
 fi
 
 if test "$wxUSE_FILE" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FILE 1
-_ACEOF
+  $as_echo "#define wxUSE_FILE 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_FFILE" = "yes"; then
 
 fi
 
 if test "$wxUSE_FFILE" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FFILE 1
-_ACEOF
+  $as_echo "#define wxUSE_FFILE 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
   if test "$wxUSE_STREAMS" != yes; then
 
 fi
 
 if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
   if test "$wxUSE_STREAMS" != yes; then
-    { echo "$as_me:$LINENO: WARNING: wxArchive requires wxStreams... disabled" >&5
-echo "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxArchive requires wxStreams... disabled" >&5
+$as_echo "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;}
     wxUSE_ARCHIVE_STREAMS=no
   else
     wxUSE_ARCHIVE_STREAMS=no
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ARCHIVE_STREAMS 1
-_ACEOF
+    $as_echo "#define wxUSE_ARCHIVE_STREAMS 1" >>confdefs.h
 
   fi
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
   if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
 
   fi
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
   if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
-    { echo "$as_me:$LINENO: WARNING: wxZip requires wxArchive... disabled" >&5
-echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxArchive... disabled" >&5
+$as_echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;}
   elif test "$wxUSE_ZLIB" = "no"; then
   elif test "$wxUSE_ZLIB" = "no"; then
-    { echo "$as_me:$LINENO: WARNING: wxZip requires wxZlib... disabled" >&5
-echo "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxZip requires wxZlib... disabled" >&5
+$as_echo "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;}
   else
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ZIPSTREAM 1
-_ACEOF
+    $as_echo "#define wxUSE_ZIPSTREAM 1" >>confdefs.h
 
   fi
 fi
 
 if test "$wxUSE_TARSTREAM" = "yes"; then
   if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
 
   fi
 fi
 
 if test "$wxUSE_TARSTREAM" = "yes"; then
   if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
-    { echo "$as_me:$LINENO: WARNING: wxTar requires wxArchive... disabled" >&5
-echo "$as_me: WARNING: wxTar requires wxArchive... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTar requires wxArchive... disabled" >&5
+$as_echo "$as_me: WARNING: wxTar requires wxArchive... disabled" >&2;}
   else
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TARSTREAM 1
-_ACEOF
+    $as_echo "#define wxUSE_TARSTREAM 1" >>confdefs.h
 
   fi
 fi
 
 
   fi
 fi
 
+if test "$wxUSE_FILE_HISTORY" = "yes"; then
+  $as_echo "#define wxUSE_FILE_HISTORY 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_FILESYSTEM" = "yes"; then
   if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
 if test "$wxUSE_FILESYSTEM" = "yes"; then
   if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
-    { echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5
-echo "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5
+$as_echo "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;}
     wxUSE_FILESYSTEM=no
   else
     wxUSE_FILESYSTEM=no
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FILESYSTEM 1
-_ACEOF
+    $as_echo "#define wxUSE_FILESYSTEM 1" >>confdefs.h
 
   fi
 fi
 
 if test "$wxUSE_FS_ARCHIVE" = "yes"; then
   if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then
 
   fi
 fi
 
 if test "$wxUSE_FS_ARCHIVE" = "yes"; then
   if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then
-    { echo "$as_me:$LINENO: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5
-echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5
+$as_echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;}
   else
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FS_ARCHIVE 1
-_ACEOF
+    $as_echo "#define wxUSE_FS_ARCHIVE 1" >>confdefs.h
 
   fi
 fi
 
 if test "$wxUSE_FS_ZIP" = "yes"; then
   if test "$wxUSE_FS_ARCHIVE" != yes; then
 
   fi
 fi
 
 if test "$wxUSE_FS_ZIP" = "yes"; then
   if test "$wxUSE_FS_ARCHIVE" != yes; then
-    { echo "$as_me:$LINENO: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5
-echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5
+$as_echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;}
   else
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FS_ZIP 1
-_ACEOF
+    $as_echo "#define wxUSE_FS_ZIP 1" >>confdefs.h
 
   fi
 fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
   if test "$USE_UNIX" != 1; then
 
   fi
 fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
   if test "$USE_UNIX" != 1; then
-    { echo "$as_me:$LINENO: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5
-echo "$as_me: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5
+$as_echo "$as_me: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&2;}
     wxUSE_ON_FATAL_EXCEPTION=no
   else
     wxUSE_ON_FATAL_EXCEPTION=no
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ON_FATAL_EXCEPTION 1
-_ACEOF
+    $as_echo "#define wxUSE_ON_FATAL_EXCEPTION 1" >>confdefs.h
 
   fi
 fi
 
 if test "$wxUSE_STACKWALKER" = "yes"; then
 
   fi
 fi
 
 if test "$wxUSE_STACKWALKER" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STACKWALKER 1
-_ACEOF
+    $as_echo "#define wxUSE_STACKWALKER 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then
 
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then
-    if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
-        { echo "$as_me:$LINENO: WARNING: Creating debug reports not currently supported on this system, disabled" >&5
-echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;}
+    if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Creating debug reports not currently supported on this system, disabled" >&5
+$as_echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;}
         wxUSE_DEBUGREPORT=no
     else
         wxUSE_DEBUGREPORT=no
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DEBUGREPORT 1
-_ACEOF
+        $as_echo "#define wxUSE_DEBUGREPORT 1" >>confdefs.h
 
         if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
 
         if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
@@ -45305,71 +34058,79 @@ _ACEOF
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SNGLINST_CHECKER 1
-_ACEOF
+  $as_echo "#define wxUSE_SNGLINST_CHECKER 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_BUSYINFO" = "yes"; then
 
 fi
 
 if test "$wxUSE_BUSYINFO" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BUSYINFO 1
-_ACEOF
+  $as_echo "#define wxUSE_BUSYINFO 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_HOTKEY" = "yes"; then
+  if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1 -a "$wxUSE_OSX_CARBON" != 1; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Hot keys not supported by the current toolkit, disabled" >&5
+$as_echo "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;}
+    wxUSE_HOTKEY=no
+  fi
+elif test "$wxUSE_HOTKEY" = "auto"; then
+  if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OSX_CARBON" = 1; then
+    wxUSE_HOTKEY=yes
+  fi
+fi
+if test "$wxUSE_HOTKEY" = "yes"; then
+  $as_echo "#define wxUSE_HOTKEY 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_STD_CONTAINERS" = "yes"; then
+  $as_echo "#define wxUSE_STD_CONTAINERS 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then
 
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STD_IOSTREAM 1
-_ACEOF
+  $as_echo "#define wxUSE_STD_IOSTREAM 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_STD_STRING" = "yes"; then
 
 fi
 
 if test "$wxUSE_STD_STRING" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STD_STRING 1
-_ACEOF
+  $as_echo "#define wxUSE_STD_STRING 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then
+  $as_echo "#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_STDPATHS" = "yes"; then
 
 fi
 
 if test "$wxUSE_STDPATHS" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STDPATHS 1
-_ACEOF
+  $as_echo "#define wxUSE_STDPATHS 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_TEXTBUFFER" = "yes"; then
 
 fi
 
 if test "$wxUSE_TEXTBUFFER" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TEXTBUFFER 1
-_ACEOF
+    $as_echo "#define wxUSE_TEXTBUFFER 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_TEXTFILE" = "yes"; then
   if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
 
 fi
 
 if test "$wxUSE_TEXTFILE" = "yes"; then
   if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
-    { echo "$as_me:$LINENO: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5
-echo "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5
+$as_echo "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;}
   else
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TEXTFILE 1
-_ACEOF
+    $as_echo "#define wxUSE_TEXTFILE 1" >>confdefs.h
 
   fi
 fi
 
 if test "$wxUSE_CONFIG" = "yes" ; then
   if test "$wxUSE_TEXTFILE" != "yes"; then
 
   fi
 fi
 
 if test "$wxUSE_CONFIG" = "yes" ; then
   if test "$wxUSE_TEXTFILE" != "yes"; then
-    { echo "$as_me:$LINENO: WARNING: wxConfig requires wxTextFile... disabled" >&5
-echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxConfig requires wxTextFile... disabled" >&5
+$as_echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;}
   else
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CONFIG 1
-_ACEOF
+    $as_echo "#define wxUSE_CONFIG 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CONFIG_NATIVE 1
-_ACEOF
+    $as_echo "#define wxUSE_CONFIG_NATIVE 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
   fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
   fi
@@ -45377,42 +34138,49 @@ fi
 
 if test "$wxUSE_INTL" = "yes" ; then
   if test "$wxUSE_FILE" != "yes"; then
 
 if test "$wxUSE_INTL" = "yes" ; then
   if test "$wxUSE_FILE" != "yes"; then
-    { echo "$as_me:$LINENO: WARNING: I18n code requires wxFile... disabled" >&5
-echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I18n code requires wxFile... disabled" >&5
+$as_echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}
   else
   else
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_INTL 1
-_ACEOF
+    $as_echo "#define wxUSE_INTL 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
     GUIDIST="$GUIDIST INTL_DIST"
   fi
 fi
 
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
     GUIDIST="$GUIDIST INTL_DIST"
   fi
 fi
 
-if test "$wxUSE_LOG" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOG 1
+if test "$wxUSE_XLOCALE" = "yes" ; then
+    $as_echo "#define wxUSE_XLOCALE 1" >>confdefs.h
+
+    ac_fn_c_check_type "$LINENO" "locale_t" "ac_cv_type_locale_t" "#include <xlocale.h>
+                    #include <locale.h>
+"
+if test "x$ac_cv_type_locale_t" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALE_T 1
 _ACEOF
 
 
 _ACEOF
 
 
+fi
+
+fi
+
+if test "$wxUSE_LOG" = "yes"; then
+  $as_echo "#define wxUSE_LOG 1" >>confdefs.h
+
+
     if test "$wxUSE_LOGGUI" = "yes"; then
     if test "$wxUSE_LOGGUI" = "yes"; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOGGUI 1
-_ACEOF
+      $as_echo "#define wxUSE_LOGGUI 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_LOGWINDOW" = "yes"; then
 
     fi
 
     if test "$wxUSE_LOGWINDOW" = "yes"; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOGWINDOW 1
-_ACEOF
+      $as_echo "#define wxUSE_LOGWINDOW 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_LOGDIALOG" = "yes"; then
 
     fi
 
     if test "$wxUSE_LOGDIALOG" = "yes"; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOG_DIALOG 1
-_ACEOF
+      $as_echo "#define wxUSE_LOG_DIALOG 1" >>confdefs.h
 
     fi
 
 
     fi
 
@@ -45420,202 +34188,54 @@ _ACEOF
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LONGLONG 1
-_ACEOF
+  $as_echo "#define wxUSE_LONGLONG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_GEOMETRY" = "yes"; then
 
 fi
 
 if test "$wxUSE_GEOMETRY" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GEOMETRY 1
-_ACEOF
+  $as_echo "#define wxUSE_GEOMETRY 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_BASE64" = "yes"; then
 
 fi
 
 if test "$wxUSE_BASE64" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BASE64 1
-_ACEOF
+  $as_echo "#define wxUSE_BASE64 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
 
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STREAMS 1
-_ACEOF
+  $as_echo "#define wxUSE_STREAMS 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
 
 fi
 
 if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PRINTF_POS_PARAMS 1
-_ACEOF
+  $as_echo "#define wxUSE_PRINTF_POS_PARAMS 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
 
 fi
 
 if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_OBJC_UNIQUIFYING 1
-_ACEOF
+  $as_echo "#define wxUSE_OBJC_UNIQUIFYING 1" >>confdefs.h
 
 fi
 
 
 if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then
 
 fi
 
 
 if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CONSOLE_EVENTLOOP 1
-_ACEOF
+    $as_echo "#define wxUSE_CONSOLE_EVENTLOOP 1" >>confdefs.h
 
 
     if test "$wxUSE_UNIX" = "yes"; then
         if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then
 
 
     if test "$wxUSE_UNIX" = "yes"; then
         if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SELECT_DISPATCHER 1
-_ACEOF
+            $as_echo "#define wxUSE_SELECT_DISPATCHER 1" >>confdefs.h
 
         fi
 
         if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then
 
         fi
 
         if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then
-
-for ac_header in sys/epoll.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-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
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_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
-  ac_status=$?
-  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
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwidgets.org ##
-## ----------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ 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 $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+            for ac_header in sys/epoll.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_EPOLL_H 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -45623,257 +34243,104 @@ fi
 done
 
             if test "$ac_cv_header_sys_epoll_h" = "yes"; then
 done
 
             if test "$ac_cv_header_sys_epoll_h" = "yes"; then
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EPOLL_DISPATCHER 1
-_ACEOF
+                $as_echo "#define wxUSE_EPOLL_DISPATCHER 1" >>confdefs.h
 
             else
 
             else
-                { echo "$as_me:$LINENO: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5
-echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5
+$as_echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;}
             fi
         fi
     fi
 fi
 
 
             fi
         fi
     fi
 fi
 
 
-if test "$wxUSE_DATETIME" = "yes"; then
-        { 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
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strptime innocuous_strptime
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strptime (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return strptime ();
-  ;
-  return 0;
-}
+for ac_func in gettimeofday ftime
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_strptime=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_strptime=no
+ break
 fi
 fi
+done
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
 
 
-    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; }
-if test "${wx_cv_func_strptime_decl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "$ac_cv_func_gettimeofday" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday takes two arguments" >&5
+$as_echo_n "checking whether gettimeofday takes two arguments... " >&6; }
+if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-                ac_ext=cpp
-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
-
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* end confdefs.h.  */
 
-                        #include <time.h>
+                #include <sys/time.h>
+                #include <unistd.h>
 
 int
 main ()
 {
 
 
 int
 main ()
 {
 
-                        struct tm t;
-                        strptime("foo", "bar", &t);
+                struct timeval tv;
+                gettimeofday(&tv, NULL);
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
-  wx_cv_func_strptime_decl=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_func_gettimeofday_has_2_args=yes
 else
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_func_strptime_decl=no
-
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 
-rm -f core 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
+                    #include <sys/time.h>
+                    #include <unistd.h>
 
 
+int
+main ()
+{
 
 
+                    struct timeval tv;
+                    gettimeofday(&tv);
 
 
-fi
-{ 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
-#define HAVE_STRPTIME_DECL 1
+  ;
+  return 0;
+}
 _ACEOF
 _ACEOF
-
-    else
-        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; }
-if test "${wx_cv_func_strptime_ok+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-                  wx_cv_func_strptime_ok=no
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_func_gettimeofday_has_2_args=no
 else
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-                    #include <stdlib.h>
-                    #include <time.h>
-                    #include "confdefs.h"
 
 
-                    $wx_strptime_decl
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to determine number of gettimeofday() arguments" >&5
+$as_echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
+                    wx_cv_func_gettimeofday_has_2_args=unknown
 
 
-                    int main()
-                    {
-                        struct tm t;
-                        return !!strptime("", "%x", &t);
-                    }
-
-_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
-  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
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  wx_cv_func_strptime_ok=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-( exit $ac_status )
-wx_cv_func_strptime_ok=no
 fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext 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
 
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_gettimeofday_has_2_args" >&5
+$as_echo "$wx_cv_func_gettimeofday_has_2_args" >&6; }
 
 
-        if test "$wx_cv_func_strptime_ok" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME 1
-_ACEOF
+    if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+        $as_echo "#define WX_GETTIMEOFDAY_NO_TZ 1" >>confdefs.h
 
 
-        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; }
-if test "${wx_cv_var_timezone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "$wxUSE_DATETIME" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable in <time.h>" >&5
+$as_echo_n "checking for timezone variable in <time.h>... " >&6; }
+if test "${wx_cv_var_timezone+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                         ac_ext=cpp
 else
 
                         ac_ext=cpp
@@ -45882,11 +34349,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                                 #include <time.h>
 /* end confdefs.h.  */
 
                                 #include <time.h>
@@ -45902,36 +34365,13 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
                                 wx_cv_var_timezone=timezone
 
 else
 
                                 wx_cv_var_timezone=timezone
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-                                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                                         #include <time.h>
 /* end confdefs.h.  */
 
                                         #include <time.h>
@@ -45947,36 +34387,13 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
                                         wx_cv_var_timezone=_timezone
 
 else
 
                                         wx_cv_var_timezone=_timezone
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-                                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                                                 #include <time.h>
 /* end confdefs.h.  */
 
                                                 #include <time.h>
@@ -45992,49 +34409,27 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
                                                 wx_cv_var_timezone=__timezone
 
 else
 
                                                 wx_cv_var_timezone=__timezone
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
                                                 if test "$USE_DOS" = 0 ; then
 
                                                 if test "$USE_DOS" = 0 ; then
-                                                    { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5
-echo "$as_me: WARNING: no timezone variable" >&2;}
+                                                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no timezone variable" >&5
+$as_echo "$as_me: WARNING: no timezone variable" >&2;}
                                                 fi
 
 
 fi
                                                 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
 
 
 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_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                         ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -46045,8 +34440,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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_var_timezone" >&5
+$as_echo "$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
@@ -46055,95 +34450,12 @@ _ACEOF
 
     fi
 
 
     fi
 
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+        for ac_func in localtime
+do :
+  ac_fn_c_check_func "$LINENO" "localtime" "ac_cv_func_localtime"
+if test "x$ac_cv_func_localtime" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_LOCALTIME 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
@@ -46151,17 +34463,13 @@ 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; }
-if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
+$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
+if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                     #include <time.h>
 /* end confdefs.h.  */
 
                     #include <time.h>
@@ -46177,374 +34485,45 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
                     wx_cv_struct_tm_has_gmtoff=yes
 
 else
 
                     wx_cv_struct_tm_has_gmtoff=yes
 
 else
-  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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
-echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_struct_tm_has_gmtoff" >&5
+$as_echo "$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
-        cat >>confdefs.h <<\_ACEOF
-#define WX_GMTOFF_IN_TM 1
-_ACEOF
-
-    fi
-
-
-
-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 $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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-    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; }
-if test "${wx_cv_func_gettimeofday_has_2_args+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 <sys/time.h>
-                    #include <unistd.h>
-
-int
-main ()
-{
-
-                    struct timeval tv;
-                    gettimeofday(&tv, NULL);
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                        #include <sys/time.h>
-                        #include <unistd.h>
+        $as_echo "#define WX_GMTOFF_IN_TM 1" >>confdefs.h
 
 
-int
-main ()
-{
-
-                        struct timeval tv;
-                        gettimeofday(&tv);
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
-  wx_cv_func_gettimeofday_has_2_args=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                        { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
-echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
-                        wx_cv_func_gettimeofday_has_2_args=unknown
-
-
-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
-{ 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
-#define WX_GETTIMEOFDAY_NO_TZ 1
-_ACEOF
-
-        fi
     fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
 
     fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
 
-if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$wxUSE_MGL" = "1"; then
-        { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
-        wxUSE_SOCKETS="no"
-    fi
-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; }
-if test "${ac_cv_func_socket+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 socket to an innocuous variant, in case <limits.h> declares socket.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define socket innocuous_socket
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socket (); 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 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.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-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
-choke me
-#endif
-
-int
-main ()
-{
-return socket ();
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_func_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_socket=no
-fi
+                ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
+if test "x$ac_cv_func_socket" = x""yes; then :
 
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      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; }
-if test $ac_cv_func_socket = yes; then
-  :
 else
 
 else
 
-                { 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
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_socket+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -46562,46 +34541,25 @@ return socket ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socket=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_socket_socket = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = x""yes; then :
   if test "$INET_LINK" != " -lsocket"; then
                         INET_LINK="$INET_LINK -lsocket"
                     fi
 else
 
   if test "$INET_LINK" != " -lsocket"; then
                         INET_LINK="$INET_LINK -lsocket"
                     fi
 else
 
-                        { echo "$as_me:$LINENO: WARNING: socket library not found - sockets will be disabled" >&5
-echo "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;}
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: socket library not found - sockets will be disabled" >&5
+$as_echo "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;}
                         wxUSE_SOCKETS=no
 
 
                         wxUSE_SOCKETS=no
 
 
@@ -46616,10 +34574,10 @@ 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; }
-if test "${wx_cv_type_getsockname3+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the third argument of getsockname" >&5
+$as_echo_n "checking what is the type of the third argument of getsockname... " >&6; }
+if test "${wx_cv_type_getsockname3+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                 ac_ext=cpp
 else
 
                 ac_ext=cpp
@@ -46628,11 +34586,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                         #include <sys/types.h>
 /* end confdefs.h.  */
 
                         #include <sys/types.h>
@@ -46649,39 +34603,16 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_type_getsockname3=socklen_t
 else
   wx_cv_type_getsockname3=socklen_t
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
                                                                                                                                                                         CFLAGS_OLD="$CFLAGS"
                         if test "$GCC" = yes ; then
                             CFLAGS="-Werror $CFLAGS"
                         fi
 
 
                                                                                                                                                                         CFLAGS_OLD="$CFLAGS"
                         if test "$GCC" = yes ; then
                             CFLAGS="-Werror $CFLAGS"
                         fi
 
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                                 #include <sys/types.h>
 /* end confdefs.h.  */
 
                                 #include <sys/types.h>
@@ -46698,33 +34629,10 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_type_getsockname3=size_t
 else
   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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                                     #include <sys/types.h>
 /* end confdefs.h.  */
 
                                     #include <sys/types.h>
@@ -46741,43 +34649,21 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_type_getsockname3=int
 else
   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
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
                         CFLAGS="$CFLAGS_OLD"
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
                         CFLAGS="$CFLAGS_OLD"
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -46787,23 +34673,23 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockname3" >&5
+$as_echo "$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
-            { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5
-echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5
+$as_echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;}
         else
             cat >>confdefs.h <<_ACEOF
 #define WX_SOCKLEN_T $wx_cv_type_getsockname3
 _ACEOF
 
         fi
         else
             cat >>confdefs.h <<_ACEOF
 #define WX_SOCKLEN_T $wx_cv_type_getsockname3
 _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; }
-if test "${wx_cv_type_getsockopt5+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the fifth argument of getsockopt" >&5
+$as_echo_n "checking what is the type of the fifth argument of getsockopt... " >&6; }
+if test "${wx_cv_type_getsockopt5+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
                                                                                                 ac_ext=cpp
 else
 
                                                                                                 ac_ext=cpp
@@ -46812,11 +34698,7 @@ 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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                         #include <sys/types.h>
 /* end confdefs.h.  */
 
                         #include <sys/types.h>
@@ -46833,34 +34715,11 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_type_getsockopt5=socklen_t
 else
   wx_cv_type_getsockopt5=socklen_t
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
 
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                                 #include <sys/types.h>
 /* end confdefs.h.  */
 
                                 #include <sys/types.h>
@@ -46877,33 +34736,10 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_type_getsockopt5=size_t
 else
   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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
                                     #include <sys/types.h>
 /* end confdefs.h.  */
 
                                     #include <sys/types.h>
@@ -46920,41 +34756,19 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
   wx_cv_type_getsockopt5=int
 else
   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
 
 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
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -46964,13 +34778,13 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_getsockopt5" >&5
+$as_echo "$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
-            { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5
-echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Couldn't find socklen_t synonym for this system" >&5
+$as_echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;}
         else
             cat >>confdefs.h <<_ACEOF
 #define SOCKOPTLEN_T $wx_cv_type_getsockopt5
         else
             cat >>confdefs.h <<_ACEOF
 #define SOCKOPTLEN_T $wx_cv_type_getsockopt5
@@ -46981,78 +34795,108 @@ _ACEOF
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SOCKETS 1
+    if test "$wxUSE_IPV6" = "yes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have sockaddr_in6" >&5
+$as_echo_n "checking whether we have sockaddr_in6... " >&6; }
+if test "${wx_cv_type_sockaddr_in6+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                        #include <sys/types.h>
+                        #include <sys/socket.h>
+                        #include <netinet/in.h>
+
+int
+main ()
+{
+
+                        struct sockaddr_in6 sa6;
+
+  ;
+  return 0;
+}
 _ACEOF
 _ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  wx_cv_type_sockaddr_in6=yes
+else
+  wx_cv_type_sockaddr_in6=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_sockaddr_in6" >&5
+$as_echo "$wx_cv_type_sockaddr_in6" >&6; }
+
+        if test "$wx_cv_type_sockaddr_in6"="yes"; then
+            $as_echo "#define wxUSE_IPV6 1" >>confdefs.h
+
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IPv6 support not available... disabled" >&5
+$as_echo "$as_me: WARNING: IPv6 support not available... disabled" >&2;}
+        fi
+    fi
+
+    $as_echo "#define wxUSE_SOCKETS 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
 fi
 
 if test "$wxUSE_PROTOCOL" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
 fi
 
 if test "$wxUSE_PROTOCOL" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: Protocol classes require sockets... disabled" >&5
-echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Protocol classes require sockets... disabled" >&5
+$as_echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
         wxUSE_PROTOCOL=no
     fi
 fi
 
 if test "$wxUSE_PROTOCOL" = "yes"; then
         wxUSE_PROTOCOL=no
     fi
 fi
 
 if test "$wxUSE_PROTOCOL" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL 1
-_ACEOF
+    $as_echo "#define wxUSE_PROTOCOL 1" >>confdefs.h
 
 
     if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
 
 
     if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_HTTP 1
-_ACEOF
+        $as_echo "#define wxUSE_PROTOCOL_HTTP 1" >>confdefs.h
 
     fi
     if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
 
     fi
     if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_FTP 1
-_ACEOF
+        $as_echo "#define wxUSE_PROTOCOL_FTP 1" >>confdefs.h
 
     fi
     if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
 
     fi
     if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_FILE 1
-_ACEOF
+        $as_echo "#define wxUSE_PROTOCOL_FILE 1" >>confdefs.h
 
     fi
 else
     if test "$wxUSE_FS_INET" = "yes"; then
 
     fi
 else
     if test "$wxUSE_FS_INET" = "yes"; then
-        { echo "$as_me:$LINENO: WARNING: HTTP filesystem require protocol classes... disabled" >&5
-echo "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: HTTP filesystem require protocol classes... disabled" >&5
+$as_echo "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;}
         wxUSE_FS_INET="no"
     fi
 fi
 
 if test "$wxUSE_URL" = "yes"; then
     if test "$wxUSE_PROTOCOL" != "yes"; then
         wxUSE_FS_INET="no"
     fi
 fi
 
 if test "$wxUSE_URL" = "yes"; then
     if test "$wxUSE_PROTOCOL" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: wxURL class requires wxProtocol... disabled" >&5
-echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxURL class requires wxProtocol... disabled" >&5
+$as_echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
         wxUSE_URL=no
     fi
     if test "$wxUSE_URL" = "yes"; then
         wxUSE_URL=no
     fi
     if test "$wxUSE_URL" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_URL 1
-_ACEOF
+        $as_echo "#define wxUSE_URL 1" >>confdefs.h
 
     fi
 fi
 
 if test "$wxUSE_VARIANT" = "yes"; then
 
     fi
 fi
 
 if test "$wxUSE_VARIANT" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_VARIANT 1
-_ACEOF
+    $as_echo "#define wxUSE_VARIANT 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_FS_INET" = "yes"; then
 
 fi
 
 if test "$wxUSE_FS_INET" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FS_INET 1
-_ACEOF
+  $as_echo "#define wxUSE_FS_INET 1" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -47063,21 +34907,17 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
         if test "$TOOLKIT" = "MSW"; then
         wxUSE_JOYSTICK=yes
 
         if test "$TOOLKIT" = "MSW"; then
         wxUSE_JOYSTICK=yes
 
-        elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+        elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
         if test "$USE_DARWIN" = 1; 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; }
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking headers have declarations needed for joystick support" >&5
+$as_echo_n "checking headers have declarations needed for joystick support... " >&6; }
             ac_ext=cpp
 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_ext=cpp
 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
 
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <IOKit/hid/IOHIDLib.h>
 int
 /* end confdefs.h.  */
  #include <IOKit/hid/IOHIDLib.h>
 int
@@ -47090,32 +34930,10 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.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
+if ac_fn_cxx_try_compile "$LINENO"; then :
    wxUSE_JOYSTICK=yes
 
    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
             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -47123,89 +34941,50 @@ 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: result: $wxUSE_JOYSTICK" >&5
-echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wxUSE_JOYSTICK" >&5
+$as_echo "$wxUSE_JOYSTICK" >&6; }
         fi
 
         else
         fi
 
         else
-                if test "$wxUSE_MGL" != "1"; then
-                                                                                    { echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
-echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_joystick_h+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.  */
-$ac_includes_default
-
-#include <linux/joystick.h>
+                                                        for ac_header in linux/joystick.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "linux/joystick.h" "ac_cv_header_linux_joystick_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_linux_joystick_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LINUX_JOYSTICK_H 1
 _ACEOF
 _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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_linux_joystick_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_linux_joystick_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }
-if test $ac_cv_header_linux_joystick_h = yes; then
-  wxUSE_JOYSTICK=yes
+ wxUSE_JOYSTICK=yes
 fi
 
 fi
 
+done
 
 
-        fi
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_JOYSTICK 1
-_ACEOF
+        $as_echo "#define wxUSE_JOYSTICK 1" >>confdefs.h
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
     else
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
     else
-        { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5
-echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Joystick not supported by this system... disabled" >&5
+$as_echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
     fi
 fi
 
 
 
     fi
 fi
 
 
 
+if test "$wxUSE_FONTENUM" = "yes" ; then
+  $as_echo "#define wxUSE_FONTENUM 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_FONTMAP" = "yes" ; then
 if test "$wxUSE_FONTMAP" = "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FONTMAP 1
-_ACEOF
+  $as_echo "#define wxUSE_FONTMAP 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_UNICODE" = "yes" ; then
 
 fi
 
 if test "$wxUSE_UNICODE" = "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_UNICODE 1
-_ACEOF
+  $as_echo "#define wxUSE_UNICODE 1" >>confdefs.h
 
 
   if test "$USE_WIN32" != 1; then
 
 
   if test "$USE_WIN32" != 1; then
@@ -47213,18 +34992,14 @@ _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; }
-if test "${ac_cv_lib_unicows_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunicows" >&5
+$as_echo_n "checking for main in -lunicows... " >&6; }
+if test "${ac_cv_lib_unicows_main+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lunicows  $LIBS"
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lunicows  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 /* end confdefs.h.  */
 
 
@@ -47236,50 +35011,27 @@ return main ();
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_unicows_main=yes
 else
   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 \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 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; }
-if test $ac_cv_lib_unicows_main = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unicows_main" >&5
+$as_echo "$ac_cv_lib_unicows_main" >&6; }
+if test "x$ac_cv_lib_unicows_main" = x""yes; then :
 
 
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_UNICODE_MSLU 1
-_ACEOF
+                $as_echo "#define wxUSE_UNICODE_MSLU 1" >>confdefs.h
 
 
 else
 
 
 
 else
 
-                { echo "$as_me:$LINENO: WARNING: Compiler doesn't support MSLU (libunicows.a), disabled.
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiler doesn't support MSLU (libunicows.a), disabled.
                              Applications will only run on Windows NT/2000/XP!" >&5
                              Applications will only run on Windows NT/2000/XP!" >&5
-echo "$as_me: WARNING: Compiler doesn't support MSLU (libunicows.a), disabled.
+$as_echo "$as_me: WARNING: Compiler doesn't support MSLU (libunicows.a), disabled.
                              Applications will only run on Windows NT/2000/XP!" >&2;}
                 wxUSE_UNICODE_MSLU=no
 
                              Applications will only run on Windows NT/2000/XP!" >&2;}
                 wxUSE_UNICODE_MSLU=no
 
@@ -47289,135 +35041,102 @@ fi
 fi
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then
 fi
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_UNICODE_UTF8 1
-_ACEOF
+    $as_echo "#define wxUSE_UNICODE_UTF8 1" >>confdefs.h
 
 
     if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then
 
 
     if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_UTF8_LOCALE_ONLY 1
-_ACEOF
+        $as_echo "#define wxUSE_UTF8_LOCALE_ONLY 1" >>confdefs.h
 
     fi
 fi
 
 
     fi
 fi
 
-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
-_ACEOF
-
-fi
-
 
 if test "$wxUSE_CONSTRAINTS" = "yes"; then
 
 if test "$wxUSE_CONSTRAINTS" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CONSTRAINTS 1
-_ACEOF
+    $as_echo "#define wxUSE_CONSTRAINTS 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 fi
 
 if test "$wxUSE_MDI" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 fi
 
 if test "$wxUSE_MDI" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MDI 1
-_ACEOF
+    $as_echo "#define wxUSE_MDI 1" >>confdefs.h
 
 
     if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
 
 
     if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MDI_ARCHITECTURE 1
-_ACEOF
+        $as_echo "#define wxUSE_MDI_ARCHITECTURE 1" >>confdefs.h
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
     fi
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
     fi
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-_ACEOF
+    $as_echo "#define wxUSE_DOC_VIEW_ARCHITECTURE 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
-    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
-    fi
 fi
 
 if test "$wxUSE_HELP" = "yes"; then
 fi
 
 if test "$wxUSE_HELP" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_HELP 1
-_ACEOF
+    $as_echo "#define wxUSE_HELP 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 
     if test "$wxUSE_MSW" = 1; then
       if test "$wxUSE_MS_HTML_HELP" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 
     if test "$wxUSE_MSW" = 1; then
       if test "$wxUSE_MS_HTML_HELP" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MS_HTML_HELP 1
-_ACEOF
+        $as_echo "#define wxUSE_MS_HTML_HELP 1" >>confdefs.h
 
       fi
     fi
 
     if test "$wxUSE_WXHTML_HELP" = "yes"; then
       if test "$wxUSE_HTML" = "yes"; then
 
       fi
     fi
 
     if test "$wxUSE_WXHTML_HELP" = "yes"; then
       if test "$wxUSE_HTML" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WXHTML_HELP 1
-_ACEOF
+        $as_echo "#define wxUSE_WXHTML_HELP 1" >>confdefs.h
 
       else
 
       else
-        { echo "$as_me:$LINENO: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&5
-echo "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&5
+$as_echo "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't be compiled" >&2;}
         wxUSE_WXHTML_HELP=no
       fi
     fi
 fi
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
         wxUSE_WXHTML_HELP=no
       fi
     fi
 fi
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&5
-echo "$as_me: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&2;}
-    else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PRINTING_ARCHITECTURE 1
-_ACEOF
+    $as_echo "#define wxUSE_PRINTING_ARCHITECTURE 1" >>confdefs.h
 
 
-    fi
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
 if test "$wxUSE_POSTSCRIPT" = "yes" ; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
 if test "$wxUSE_POSTSCRIPT" = "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_POSTSCRIPT 1
-_ACEOF
+  $as_echo "#define wxUSE_POSTSCRIPT 1" >>confdefs.h
 
 fi
 
 
 fi
 
-cat >>confdefs.h <<\_ACEOF
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NORMALIZED_PS_FONTS 1
-_ACEOF
+$as_echo "#define wxUSE_AFM_FOR_POSTSCRIPT 1" >>confdefs.h
 
 
 if test "$wxUSE_SVG" = "yes"; then
 
 
 if test "$wxUSE_SVG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SVG 1
-_ACEOF
+    $as_echo "#define wxUSE_SVG 1" >>confdefs.h
 
 fi
 
 
 if test "$wxUSE_METAFILE" = "yes"; then
     if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then
 
 fi
 
 
 if test "$wxUSE_METAFILE" = "yes"; then
     if test "$wxUSE_MSW" != 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_PM" != 1; then
-        { echo "$as_me:$LINENO: WARNING: wxMetafile is not available on this system... disabled" >&5
-echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxMetafile is not available on this system... disabled" >&5
+$as_echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;}
         wxUSE_METAFILE=no
     fi
         wxUSE_METAFILE=no
     fi
+elif test "$wxUSE_METAFILE" = "auto"; then
+    if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
+        wxUSE_METAFILE=yes
+    fi
+fi
+
+if test "$wxUSE_METAFILE" = "yes"; then
+    $as_echo "#define wxUSE_METAFILE 1" >>confdefs.h
+
+    if test "$wxUSE_MSW" = 1; then
+                $as_echo "#define wxUSE_ENH_METAFILE 1" >>confdefs.h
+
+    fi
 fi
 
 
 fi
 
 
@@ -47425,62 +35144,19 @@ 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; }
-if test "${ac_cv_header_ole2_h+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 <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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_header_ole2_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_ole2_h=no
-fi
+    ac_fn_c_check_header_compile "$LINENO" "ole2.h" "ac_cv_header_ole2_h" "
+"
+if test "x$ac_cv_header_ole2_h" = x""yes; then :
 
 
-rm -f core 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; }
 
 
 
     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; }
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ requires -fvtable-thunks" >&5
+$as_echo_n "checking if g++ requires -fvtable-thunks... " >&6; }
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <windows.h>
                             #include <ole2.h>
 /* end confdefs.h.  */
 #include <windows.h>
                             #include <ole2.h>
@@ -47492,151 +35168,88 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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
             LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
             if test "$wxUSE_OLE" = "yes" ; then
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
             if test "$wxUSE_OLE" = "yes" ; then
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_OLE 1
-_ACEOF
+                $as_echo "#define wxUSE_OLE 1" >>confdefs.h
 
 
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_OLE_AUTOMATION 1
-_ACEOF
+                $as_echo "#define wxUSE_OLE_AUTOMATION 1" >>confdefs.h
 
 
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ACTIVEX 1
-_ACEOF
+                $as_echo "#define wxUSE_ACTIVEX 1" >>confdefs.h
 
                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
             fi
         fi
 
                 if test "$wxUSE_DATAOBJ" = "yes" ; then
 
                 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
             fi
         fi
 
                 if test "$wxUSE_DATAOBJ" = "yes" ; then
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DATAOBJ 1
-_ACEOF
+            $as_echo "#define wxUSE_DATAOBJ 1" >>confdefs.h
 
         fi
     else
 
         fi
     else
-        { echo "$as_me:$LINENO: WARNING: Some features disabled because OLE headers not found" >&5
-echo "$as_me: WARNING: Some features disabled because OLE headers not found" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Some features disabled because OLE headers not found" >&5
+$as_echo "$as_me: WARNING: Some features disabled because OLE headers not found" >&2;}
 
         wxUSE_CLIPBOARD=no
         wxUSE_DRAG_AND_DROP=no
         wxUSE_DATAOBJ=no
         wxUSE_OLE=no
     fi
 
         wxUSE_CLIPBOARD=no
         wxUSE_DRAG_AND_DROP=no
         wxUSE_DATAOBJ=no
         wxUSE_OLE=no
     fi
-
-    if test "$wxUSE_METAFILE" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_METAFILE 1
-_ACEOF
-
-
-                cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ENH_METAFILE 1
-_ACEOF
-
-    fi
 fi
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then
 fi
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then
-        { echo "$as_me:$LINENO: WARNING: wxWidgets IPC classes require sockets... disabled" >&5
-echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxWidgets IPC classes require sockets... disabled" >&5
+$as_echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;}
         wxUSE_IPC=no
     fi
 
     if test "$wxUSE_IPC" = "yes"; then
         wxUSE_IPC=no
     fi
 
     if test "$wxUSE_IPC" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_IPC 1
-_ACEOF
+        $as_echo "#define wxUSE_IPC 1" >>confdefs.h
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
     fi
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
     fi
 fi
 
 if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
-        wxUSE_DATAOBJ=no
-    else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DATAOBJ 1
-_ACEOF
+    $as_echo "#define wxUSE_DATAOBJ 1" >>confdefs.h
 
 
-    fi
 else
 else
-    { echo "$as_me:$LINENO: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5
-echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5
+$as_echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;}
     wxUSE_CLIPBOARD=no
     wxUSE_DRAG_AND_DROP=no
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     wxUSE_CLIPBOARD=no
     wxUSE_DRAG_AND_DROP=no
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
+    if test "$wxUSE_DFB" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
+$as_echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
         wxUSE_CLIPBOARD=no
     fi
 
     if test "$wxUSE_CLIPBOARD" = "yes"; then
         wxUSE_CLIPBOARD=no
     fi
 
     if test "$wxUSE_CLIPBOARD" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CLIPBOARD 1
-_ACEOF
+        $as_echo "#define wxUSE_CLIPBOARD 1" >>confdefs.h
 
     fi
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
 
     fi
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_GTK" = 1; then
-        if test "$WXGTK12" != 1; then
-            { echo "$as_me:$LINENO: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&5
-echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&2;}
-            wxUSE_DRAG_AND_DROP=no
-        fi
-    fi
-
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
-            "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
+$as_echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DRAG_AND_DROP 1
-_ACEOF
+        $as_echo "#define wxUSE_DRAG_AND_DROP 1" >>confdefs.h
 
     fi
 
 
     fi
 
@@ -47646,17 +35259,28 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
 fi
 
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard"
+fi
+
 if test "$wxUSE_SPLINES" = "yes" ; then
 if test "$wxUSE_SPLINES" = "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SPLINES 1
-_ACEOF
+  $as_echo "#define wxUSE_SPLINES 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
 
 fi
 
 if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MOUSEWHEEL 1
-_ACEOF
+  $as_echo "#define wxUSE_MOUSEWHEEL 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
+    $as_echo "#define wxUSE_UIACTIONSIMULATOR 1" >>confdefs.h
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
+fi
+
+if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then
+    $as_echo "#define wxUSE_DC_TRANSFORM_MATRIX 1" >>confdefs.h
 
 fi
 
 
 fi
 
@@ -47666,439 +35290,392 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   USES_CONTROLS=1
 fi
 
   USES_CONTROLS=1
 fi
 
+if test "$wxUSE_MARKUP" = "yes"; then
+  $as_echo "#define wxUSE_MARKUP 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_ACCEL" = "yes"; then
 if test "$wxUSE_ACCEL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ACCEL 1
-_ACEOF
+  $as_echo "#define wxUSE_ACCEL 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_ANIMATIONCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_ANIMATIONCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ANIMATIONCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_ANIMATIONCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
 fi
 
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
 fi
 
+if test "$wxUSE_BANNERWINDOW" = "yes"; then
+  $as_echo "#define wxUSE_BANNERWINDOW 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_BUTTON" = "yes"; then
 if test "$wxUSE_BUTTON" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BUTTON 1
-_ACEOF
+  $as_echo "#define wxUSE_BUTTON 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BMPBUTTON" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BMPBUTTON" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BMPBUTTON 1
-_ACEOF
+  $as_echo "#define wxUSE_BMPBUTTON 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CALCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CALCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CALENDARCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_CALENDARCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
 fi
 
 if test "$wxUSE_CARET" = "yes"; then
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
 fi
 
 if test "$wxUSE_CARET" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CARET 1
-_ACEOF
+  $as_echo "#define wxUSE_CARET 1" >>confdefs.h
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
 if test "$wxUSE_COLLPANE" = "yes"; then
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
 if test "$wxUSE_COLLPANE" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_COLLPANE 1
-_ACEOF
+    $as_echo "#define wxUSE_COLLPANE 1" >>confdefs.h
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS collpane"
 fi
 
 if test "$wxUSE_COMBOBOX" = "yes"; then
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS collpane"
 fi
 
 if test "$wxUSE_COMBOBOX" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_COMBOBOX 1
-_ACEOF
+  $as_echo "#define wxUSE_COMBOBOX 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_COMBOCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_COMBOCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_COMBOCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_COMBOCTRL 1" >>confdefs.h
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then
+  $as_echo "#define wxUSE_COMMANDLINKBUTTON 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHOICE" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHOICE" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CHOICE 1
-_ACEOF
+  $as_echo "#define wxUSE_CHOICE 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHOICEBOOK" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHOICEBOOK" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CHOICEBOOK 1
-_ACEOF
+    $as_echo "#define wxUSE_CHOICEBOOK 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKBOX" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKBOX" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CHECKBOX 1
-_ACEOF
+  $as_echo "#define wxUSE_CHECKBOX 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CHECKLISTBOX 1
-_ACEOF
+  $as_echo "#define wxUSE_CHECKLISTBOX 1" >>confdefs.h
 
   USES_CONTROLS=1
 
   USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
 if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_COLOURPICKERCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_COLOURPICKERCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DATEPICKCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DATEPICKCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DATEPICKCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_DATEPICKCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DIRPICKERCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DIRPICKERCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DIRPICKERCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_DIRPICKERCTRL 1" >>confdefs.h
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_FILECTRL" = "yes"; then
+  $as_echo "#define wxUSE_FILECTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_FILEPICKERCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_FILEPICKERCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FILEPICKERCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_FILEPICKERCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FONTPICKERCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_FONTPICKERCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
-echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
+    if test "$wxUSE_DFB" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
+$as_echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
         wxUSE_DISPLAY=no
     else
         wxUSE_DISPLAY=no
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DISPLAY 1
-_ACEOF
+        $as_echo "#define wxUSE_DISPLAY 1" >>confdefs.h
 
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
     fi
 fi
 
 if test "$wxUSE_DETECT_SM" = "yes"; then
     fi
 fi
 
 if test "$wxUSE_DETECT_SM" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DETECT_SM 1
-_ACEOF
+    $as_echo "#define wxUSE_DETECT_SM 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_GAUGE" = "yes"; then
 
 fi
 
 if test "$wxUSE_GAUGE" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GAUGE 1
-_ACEOF
+  $as_echo "#define wxUSE_GAUGE 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_GRID" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_GRID" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRID 1
-_ACEOF
+  $as_echo "#define wxUSE_GRID 1" >>confdefs.h
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
+if test "$wxUSE_HEADERCTRL" = "yes"; then
+  $as_echo "#define wxUSE_HEADERCTRL 1" >>confdefs.h
+
+  USES_CONTROLS=1
+fi
+
 if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
 if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_HYPERLINKCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_HYPERLINKCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BITMAPCOMBOBOX" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BITMAPCOMBOBOX" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BITMAPCOMBOBOX 1
-_ACEOF
+  $as_echo "#define wxUSE_BITMAPCOMBOBOX 1" >>confdefs.h
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DATAVIEWCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_DATAVIEWCTRL" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DATAVIEWCTRL 1
-_ACEOF
+  $as_echo "#define wxUSE_DATAVIEWCTRL 1" >>confdefs.h
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview"
 fi
 
 if test "$wxUSE_IMAGLIST" = "yes"; then
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview"
 fi
 
 if test "$wxUSE_IMAGLIST" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_IMAGLIST 1
-_ACEOF
+    $as_echo "#define wxUSE_IMAGLIST 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_INFOBAR" = "yes"; then
+    $as_echo "#define wxUSE_INFOBAR 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_LISTBOOK" = "yes"; then
 
 fi
 
 if test "$wxUSE_LISTBOOK" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LISTBOOK 1
-_ACEOF
+    $as_echo "#define wxUSE_LISTBOOK 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_LISTBOX" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_LISTBOX" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LISTBOX 1
-_ACEOF
+    $as_echo "#define wxUSE_LISTBOX 1" >>confdefs.h
 
     USES_CONTROLS=1
 
     USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LISTCTRL 1
-_ACEOF
+        $as_echo "#define wxUSE_LISTCTRL 1" >>confdefs.h
 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
     else
 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
     else
-        { echo "$as_me:$LINENO: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&5
-echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&5
+$as_echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&2;}
     fi
 fi
 
 if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
     fi
 fi
 
 if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EDITABLELISTBOX 1
-_ACEOF
+    $as_echo "#define wxUSE_EDITABLELISTBOX 1" >>confdefs.h
 
     USES_CONTROLS=1
 
     USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
 fi
 
 if test "$wxUSE_NOTEBOOK" = "yes"; then
 fi
 
 if test "$wxUSE_NOTEBOOK" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NOTEBOOK 1
-_ACEOF
+    $as_echo "#define wxUSE_NOTEBOOK 1" >>confdefs.h
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
+if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then
+    $as_echo "#define wxUSE_NOTIFICATION_MESSAGE 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_ODCOMBOBOX" = "yes"; then
 if test "$wxUSE_ODCOMBOBOX" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODCOMBOBOX 1
-_ACEOF
+  $as_echo "#define wxUSE_ODCOMBOBOX 1" >>confdefs.h
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo"
 fi
 
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo"
 fi
 
-
 if test "$wxUSE_RADIOBOX" = "yes"; then
 if test "$wxUSE_RADIOBOX" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_RADIOBOX 1
-_ACEOF
+    $as_echo "#define wxUSE_RADIOBOX 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_RADIOBTN 1
-_ACEOF
+    $as_echo "#define wxUSE_RADIOBTN 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 
     USES_CONTROLS=1
 fi
 
+if test "$wxUSE_REARRANGECTRL" = "yes"; then
+    $as_echo "#define wxUSE_REARRANGECTRL 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_RICHMSGDLG" = "yes"; then
+    $as_echo "#define wxUSE_RICHMSGDLG 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_RICHTOOLTIP" = "yes"; then
+    $as_echo "#define wxUSE_RICHTOOLTIP 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_SASH" = "yes"; then
 if test "$wxUSE_SASH" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SASH 1
-_ACEOF
+    $as_echo "#define wxUSE_SASH 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
 fi
 
 if test "$wxUSE_SCROLLBAR" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
 fi
 
 if test "$wxUSE_SCROLLBAR" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SCROLLBAR 1
-_ACEOF
+    $as_echo "#define wxUSE_SCROLLBAR 1" >>confdefs.h
 
     USES_CONTROLS=1
 
     USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
 fi
 
 if test "$wxUSE_SEARCHCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_SEARCHCTRL" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SEARCHCTRL 1
-_ACEOF
+    $as_echo "#define wxUSE_SEARCHCTRL 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SLIDER" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SLIDER" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SLIDER 1
-_ACEOF
+    $as_echo "#define wxUSE_SLIDER 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SPINBTN 1
-_ACEOF
+    $as_echo "#define wxUSE_SPINBTN 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINCTRL" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINCTRL" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SPINCTRL 1
-_ACEOF
+    $as_echo "#define wxUSE_SPINCTRL 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SPLITTER 1
-_ACEOF
+    $as_echo "#define wxUSE_SPLITTER 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
 fi
 
 if test "$wxUSE_STATBMP" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
 fi
 
 if test "$wxUSE_STATBMP" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STATBMP 1
-_ACEOF
+    $as_echo "#define wxUSE_STATBMP 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STATBOX 1
-_ACEOF
+    $as_echo "#define wxUSE_STATBOX 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATTEXT" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATTEXT" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STATTEXT 1
-_ACEOF
+    $as_echo "#define wxUSE_STATTEXT 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STATLINE 1
-_ACEOF
+    $as_echo "#define wxUSE_STATLINE 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATUSBAR" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATUSBAR" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NATIVE_STATUSBAR 1
-_ACEOF
+        $as_echo "#define wxUSE_NATIVE_STATUSBAR 1" >>confdefs.h
 
 
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STATUSBAR 1
-_ACEOF
+    $as_echo "#define wxUSE_STATUSBAR 1" >>confdefs.h
 
     USES_CONTROLS=1
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi
 
 
     USES_CONTROLS=1
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi
 
-if test "$wxUSE_TAB_DIALOG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TAB_DIALOG 1
-_ACEOF
-
-fi
-
 if test "$wxUSE_TEXTCTRL" = "yes"; then
 if test "$wxUSE_TEXTCTRL" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TEXTCTRL 1
-_ACEOF
+    $as_echo "#define wxUSE_TEXTCTRL 1" >>confdefs.h
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+
+            $as_echo "#define wxUSE_RICHEDIT 1" >>confdefs.h
+
+    $as_echo "#define wxUSE_RICHEDIT2 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_TIMEPICKCTRL" = "yes"; then
+  $as_echo "#define wxUSE_TIMEPICKCTRL 1" >>confdefs.h
+
+  USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_COCOA" = 1 ; then
-        { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
-echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
+$as_echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
         wxUSE_TOGGLEBTN=no
     fi
 
     if test "$wxUSE_TOGGLEBTN" = "yes"; then
         wxUSE_TOGGLEBTN=no
     fi
 
     if test "$wxUSE_TOGGLEBTN" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TOGGLEBTN 1
-_ACEOF
+        $as_echo "#define wxUSE_TOGGLEBTN 1" >>confdefs.h
 
         USES_CONTROLS=1
     fi
 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then
 
         USES_CONTROLS=1
     fi
 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TOOLBAR 1
-_ACEOF
+    $as_echo "#define wxUSE_TOOLBAR 1" >>confdefs.h
 
     USES_CONTROLS=1
 
 
     USES_CONTROLS=1
 
@@ -48106,9 +35683,7 @@ _ACEOF
         wxUSE_TOOLBAR_NATIVE="no"
     else
         wxUSE_TOOLBAR_NATIVE="yes"
         wxUSE_TOOLBAR_NATIVE="no"
     else
         wxUSE_TOOLBAR_NATIVE="yes"
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TOOLBAR_NATIVE 1
-_ACEOF
+        $as_echo "#define wxUSE_TOOLBAR_NATIVE 1" >>confdefs.h
 
     fi
 
 
     fi
 
@@ -48117,63 +35692,60 @@ fi
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then
     if test "$wxUSE_MOTIF" = 1; then
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then
     if test "$wxUSE_MOTIF" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxTooltip not supported yet under Motif... disabled" >&5
-echo "$as_me: WARNING: wxTooltip not supported yet under Motif... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet under Motif... disabled" >&5
+$as_echo "$as_me: WARNING: wxTooltip not supported yet under Motif... disabled" >&2;}
     else
         if test "$wxUSE_UNIVERSAL" = "yes"; then
     else
         if test "$wxUSE_UNIVERSAL" = "yes"; then
-            { echo "$as_me:$LINENO: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5
-echo "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5
+$as_echo "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;}
         else
         else
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TOOLTIPS 1
-_ACEOF
+            $as_echo "#define wxUSE_TOOLTIPS 1" >>confdefs.h
 
         fi
     fi
 fi
 
 if test "$wxUSE_TREEBOOK" = "yes"; then
 
         fi
     fi
 fi
 
 if test "$wxUSE_TREEBOOK" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TREEBOOK 1
-_ACEOF
+    $as_echo "#define wxUSE_TREEBOOK 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TOOLBOOK" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TOOLBOOK" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TOOLBOOK 1
-_ACEOF
+    $as_echo "#define wxUSE_TOOLBOOK 1" >>confdefs.h
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TREECTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TREECTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TREECTRL 1
-_ACEOF
+        $as_echo "#define wxUSE_TREECTRL 1" >>confdefs.h
 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else
 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else
-        { echo "$as_me:$LINENO: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&5
-echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&5
+$as_echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&2;}
     fi
 fi
 
     fi
 fi
 
+if test "$wxUSE_TREELISTCTRL" = "yes"; then
+    $as_echo "#define wxUSE_TREELISTCTRL 1" >>confdefs.h
+
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist"
+fi
+
 if test "$wxUSE_POPUPWIN" = "yes"; then
 if test "$wxUSE_POPUPWIN" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
-        { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
-echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
+$as_echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
     else
         if test "$wxUSE_PM" = 1; then
     else
         if test "$wxUSE_PM" = 1; then
-            { echo "$as_me:$LINENO: WARNING: wxPopupWindow not yet supported under PM... disabled" >&5
-echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxPopupWindow not yet supported under PM... disabled" >&5
+$as_echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" >&2;}
         else
         else
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_POPUPWIN 1
-_ACEOF
+            $as_echo "#define wxUSE_POPUPWIN 1" >>confdefs.h
 
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
 
 
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
 
@@ -48183,13 +35755,11 @@ _ACEOF
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
-        { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5
-echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5
+$as_echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
     else
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DIALUP_MANAGER 1
-_ACEOF
+        $as_echo "#define wxUSE_DIALUP_MANAGER 1" >>confdefs.h
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
     fi
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
     fi
@@ -48197,55 +35767,58 @@ fi
 
 if test "$wxUSE_TIPWINDOW" = "yes"; then
     if test "$wxUSE_PM" = 1; then
 
 if test "$wxUSE_TIPWINDOW" = "yes"; then
     if test "$wxUSE_PM" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxTipWindow not yet supported under PM... disabled" >&5
-echo "$as_me: WARNING: wxTipWindow not yet supported under PM... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTipWindow not yet supported under PM... disabled" >&5
+$as_echo "$as_me: WARNING: wxTipWindow not yet supported under PM... disabled" >&2;}
     else
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TIPWINDOW 1
-_ACEOF
+        $as_echo "#define wxUSE_TIPWINDOW 1" >>confdefs.h
 
     fi
 fi
 
 if test "$USES_CONTROLS" = 1; then
 
     fi
 fi
 
 if test "$USES_CONTROLS" = 1; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CONTROLS 1
-_ACEOF
+    $as_echo "#define wxUSE_CONTROLS 1" >>confdefs.h
 
 fi
 
 
 if test "$wxUSE_ACCESSIBILITY" = "yes"; then
 
 fi
 
 
 if test "$wxUSE_ACCESSIBILITY" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ACCESSIBILITY 1
-_ACEOF
+    $as_echo "#define wxUSE_ACCESSIBILITY 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
 fi
 
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
 fi
 
-if test "$wxUSE_DC_CACHEING" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DC_CACHEING 1
-_ACEOF
+if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then
+    $as_echo "#define wxUSE_ARTPROVIDER_STD 1" >>confdefs.h
+
+fi
+
+if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then
+            if test "$wxUSE_GTK" != 1; then
+                if test "$wxUSE_LIBPNG" != no -a \
+                "$wxUSE_IMAGE" = yes -a \
+                "$wxUSE_STREAMS" = yes; then
+            wxUSE_ARTPROVIDER_TANGO="yes"
+        fi
+    fi
+fi
+
+if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then
+    $as_echo "#define wxUSE_ARTPROVIDER_TANGO 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_DRAGIMAGE" = "yes"; then
 
 fi
 
 if test "$wxUSE_DRAGIMAGE" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DRAGIMAGE 1
-_ACEOF
+    $as_echo "#define wxUSE_DRAGIMAGE 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 
 if test "$wxUSE_EXCEPTIONS" = "yes"; then
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 
 if test "$wxUSE_EXCEPTIONS" = "yes"; then
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        { echo "$as_me:$LINENO: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&5
-echo "$as_me: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&5
+$as_echo "$as_me: WARNING: --enable-exceptions can't be used with --enable-no_exceptions" >&2;}
     else
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EXCEPTIONS 1
-_ACEOF
+        $as_echo "#define wxUSE_EXCEPTIONS 1" >>confdefs.h
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except"
     fi
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except"
     fi
@@ -48253,105 +35826,55 @@ fi
 
 USE_HTML=0
 if test "$wxUSE_HTML" = "yes"; then
 
 USE_HTML=0
 if test "$wxUSE_HTML" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_HTML 1
-_ACEOF
+    $as_echo "#define wxUSE_HTML 1" >>confdefs.h
 
     USE_HTML=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
 
     USE_HTML=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
-    if test "$wxUSE_MAC" = 1; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
-    fi
 fi
 if test "$wxUSE_WEBKIT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
         old_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="-x objective-c++ $CPPFLAGS"
 fi
 if test "$wxUSE_WEBKIT" = "yes"; then
     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; }
-if test "${ac_cv_header_WebKit_HIWebView_h+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.  */
-
+        ac_fn_c_check_header_compile "$LINENO" "WebKit/HIWebView.h" "ac_cv_header_WebKit_HIWebView_h" "
                            #include <Carbon/Carbon.h>
                            #include <WebKit/WebKit.h>
 
                            #include <Carbon/Carbon.h>
                            #include <WebKit/WebKit.h>
 
+"
+if test "x$ac_cv_header_WebKit_HIWebView_h" = x""yes; then :
 
 
-#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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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_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
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ 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
-#define wxUSE_WEBKIT 1
-_ACEOF
+                           $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h
 
                            WEBKIT_LINK="-framework WebKit"
 
 else
 
 
                            WEBKIT_LINK="-framework WebKit"
 
 else
 
-                           { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling wxWebKit" >&5
-echo "$as_me: WARNING: WebKit headers not found; disabling wxWebKit" >&2;}
+                           { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit headers not found; disabling wxWebKit" >&5
+$as_echo "$as_me: WARNING: WebKit headers not found; disabling wxWebKit" >&2;}
                            wxUSE_WEBKIT=no
 
 fi
 
 
         CPPFLAGS="$old_CPPFLAGS"
                            wxUSE_WEBKIT=no
 
 fi
 
 
         CPPFLAGS="$old_CPPFLAGS"
-    elif test "$wxUSE_COCOA" = 1; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEBKIT 1
-_ACEOF
+    elif test "$wxUSE_OLD_COCOA" = 1; then
+        $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h
 
     else
         wxUSE_WEBKIT=no
     fi
 
     else
         wxUSE_WEBKIT=no
     fi
+    if test "$wxUSE_WEBKIT" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
+    fi
 fi
 
 USE_XRC=0
 if test "$wxUSE_XRC" = "yes"; then
     if test "$wxUSE_XML" != "yes"; then
 fi
 
 USE_XRC=0
 if test "$wxUSE_XRC" = "yes"; then
     if test "$wxUSE_XML" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: XML library not built, XRC resources disabled" >&5
-echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XML library not built, XRC resources disabled" >&5
+$as_echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;}
         wxUSE_XRC=no
     else
         wxUSE_XRC=no
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_XRC 1
-_ACEOF
+        $as_echo "#define wxUSE_XRC 1" >>confdefs.h
 
         USE_XRC=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
 
         USE_XRC=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc"
@@ -48360,83 +35883,124 @@ fi
 
 USE_AUI=0
 if test "$wxUSE_AUI" = "yes"; then
 
 USE_AUI=0
 if test "$wxUSE_AUI" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
-#define wxUSE_AUI 1
-_ACEOF
+   $as_echo "#define wxUSE_AUI 1" >>confdefs.h
 
    USE_AUI=1
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
 fi
 
 
    USE_AUI=1
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
 fi
 
+USE_PROPGRID=0
+if test "$wxUSE_PROPGRID" = "yes"; then
+   $as_echo "#define wxUSE_PROPGRID 1" >>confdefs.h
+
+   USE_PROPGRID=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
+fi
+
+USE_RIBBON=0
+if test "$wxUSE_RIBBON" = "yes"; then
+   $as_echo "#define wxUSE_RIBBON 1" >>confdefs.h
+
+   USE_RIBBON=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon"
+fi
+
 USE_STC=0
 if test "$wxUSE_STC" = "yes"; then
 USE_STC=0
 if test "$wxUSE_STC" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STC 1
-_ACEOF
+   $as_echo "#define wxUSE_STC 1" >>confdefs.h
 
    USE_STC=1
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
 
    USE_STC=1
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
+
+      # Extract the first word of "python", so it can be a program name with args.
+set dummy python; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PYTHON+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PYTHON in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+  ;;
+  *)
+  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_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 fi
 
-if test "$wxUSE_MENUS" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MENUS 1
-_ACEOF
 
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
+   if test "x$PYTHON" = "x"; then
+     COND_PYTHON="#"
+   fi
+
 fi
 
 fi
 
-if test "$wxUSE_METAFILE" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_METAFILE 1
-_ACEOF
+if test "$wxUSE_MENUS" = "yes"; then
+    $as_echo "#define wxUSE_MENUS 1" >>confdefs.h
 
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
 fi
 
 if test "$wxUSE_MIMETYPE" = "yes"; then
 fi
 
 if test "$wxUSE_MIMETYPE" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MIMETYPE 1
-_ACEOF
+    $as_echo "#define wxUSE_MIMETYPE 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_MINIFRAME" = "yes"; then
 
 fi
 
 if test "$wxUSE_MINIFRAME" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MINIFRAME 1
-_ACEOF
+    $as_echo "#define wxUSE_MINIFRAME 1" >>confdefs.h
 
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
 fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SYSTEM_OPTIONS 1
-_ACEOF
+    $as_echo "#define wxUSE_SYSTEM_OPTIONS 1" >>confdefs.h
 
 
-    if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
-        "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-    fi
+fi
+
+if test "$wxUSE_TASKBARICON" = "yes"; then
+    $as_echo "#define wxUSE_TASKBARICON 1" >>confdefs.h
+
+                $as_echo "#define wxUSE_TASKBARICON_BALLOONS 1" >>confdefs.h
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
 fi
 
 
 if test "$wxUSE_VALIDATORS" = "yes"; then
 fi
 
 
 if test "$wxUSE_VALIDATORS" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_VALIDATORS 1
-_ACEOF
+    $as_echo "#define wxUSE_VALIDATORS 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
 if test "$wxUSE_PALETTE" = "yes" ; then
     if test "$wxUSE_DFB" = 1; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
 if test "$wxUSE_PALETTE" = "yes" ; then
     if test "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxPalette not yet supported under DFB... disabled" >&5
-echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxPalette not yet supported under DFB... disabled" >&5
+$as_echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;}
         wxUSE_PALETTE=no
     else
         wxUSE_PALETTE=no
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PALETTE 1
-_ACEOF
+        $as_echo "#define wxUSE_PALETTE 1" >>confdefs.h
 
     fi
 fi
 
     fi
 fi
@@ -48447,215 +36011,388 @@ fi
 
 USE_RICHTEXT=0
 if test "$wxUSE_RICHTEXT" = "yes"; then
 
 USE_RICHTEXT=0
 if test "$wxUSE_RICHTEXT" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_RICHTEXT 1
-_ACEOF
+    $as_echo "#define wxUSE_RICHTEXT 1" >>confdefs.h
 
     USE_RICHTEXT=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
 
     USE_RICHTEXT=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
+if test "$wxUSE_WEBVIEW" = "yes"; then
+    USE_WEBVIEW_WEBKIT=0
+    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
+        if test "$wxUSE_GTK" = 1; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5
+$as_echo_n "checking for WEBKIT... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$WEBKIT_CFLAGS"; then
+        pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.3.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.3.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit-1.0 >= 1.3.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$WEBKIT_LIBS"; then
+        pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.3.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.3.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit-1.0 >= 1.3.1" 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
+               WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit-1.0 >= 1.3.1"`
+        else
+               WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit-1.0 >= 1.3.1"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$WEBKIT_PKG_ERRORS" >&5
+
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5
+$as_echo "$as_me: WARNING: webkitgtk not found." >&2;}
+
+elif test $pkg_failed = untried; then
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: webkitgtk not found." >&5
+$as_echo "$as_me: WARNING: webkitgtk not found." >&2;}
+
+else
+       WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS
+       WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+                                USE_WEBVIEW_WEBKIT=1
+                                CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
+
+fi
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+                                    old_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="-x objective-c++ $CPPFLAGS"
+            ac_fn_c_check_header_compile "$LINENO" "WebKit/HIWebView.h" "ac_cv_header_WebKit_HIWebView_h" "
+                                #include <Carbon/Carbon.h>
+                                #include <WebKit/WebKit.h>
+
+"
+if test "x$ac_cv_header_WebKit_HIWebView_h" = x""yes; then :
+
+                                USE_WEBVIEW_WEBKIT=1
+                                WEBKIT_LINK="-framework WebKit"
+
+else
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit headers not found" >&5
+$as_echo "$as_me: WARNING: WebKit headers not found" >&2;}
+
+fi
+
+
+            CPPFLAGS="$old_CPPFLAGS"
+        fi
+    fi
+
+    wxUSE_WEBVIEW="no"
+    if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then
+        if test "$USE_WEBVIEW_WEBKIT" = 1; then
+            wxUSE_WEBVIEW="yes"
+            $as_echo "#define wxUSE_WEBVIEW_WEBKIT 1" >>confdefs.h
+
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit not available, disabling wxWebView" >&5
+$as_echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;}
+        fi
+    elif test "$wxUSE_MSW" = 1; then
+        if test "$wxUSE_WEBVIEW_IE" = "yes"; then
+                                    wxUSE_WEBVIEW="yes"
+            $as_echo "#define wxUSE_WEBVIEW_IE 1" >>confdefs.h
+
+        fi
+    fi
+fi
+
+if test "$wxUSE_WEBVIEW" = "yes"; then
+    USE_WEBVIEW=1
+    $as_echo "#define wxUSE_WEBVIEW 1" >>confdefs.h
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+else
+    USE_WEBVIEW=0
+fi
+
 
 if test "$wxUSE_IMAGE" = "yes" ; then
 
 if test "$wxUSE_IMAGE" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_IMAGE 1
-_ACEOF
+    $as_echo "#define wxUSE_IMAGE 1" >>confdefs.h
 
 
     if test "$wxUSE_GIF" = "yes" ; then
 
 
     if test "$wxUSE_GIF" = "yes" ; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GIF 1
-_ACEOF
+      $as_echo "#define wxUSE_GIF 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_PCX" = "yes" ; then
 
     fi
 
     if test "$wxUSE_PCX" = "yes" ; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PCX 1
-_ACEOF
+      $as_echo "#define wxUSE_PCX 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_TGA" = "yes" ; then
 
     fi
 
     if test "$wxUSE_TGA" = "yes" ; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TGA 1
-_ACEOF
+      $as_echo "#define wxUSE_TGA 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_IFF" = "yes" ; then
 
     fi
 
     if test "$wxUSE_IFF" = "yes" ; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_IFF 1
-_ACEOF
+      $as_echo "#define wxUSE_IFF 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_PNM" = "yes" ; then
 
     fi
 
     if test "$wxUSE_PNM" = "yes" ; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PNM 1
-_ACEOF
+      $as_echo "#define wxUSE_PNM 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_XPM" = "yes" ; then
 
     fi
 
     if test "$wxUSE_XPM" = "yes" ; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_XPM 1
-_ACEOF
+      $as_echo "#define wxUSE_XPM 1" >>confdefs.h
 
     fi
 
     if test "$wxUSE_ICO_CUR" = "yes" ; then
 
     fi
 
     if test "$wxUSE_ICO_CUR" = "yes" ; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ICO_CUR 1
-_ACEOF
+      $as_echo "#define wxUSE_ICO_CUR 1" >>confdefs.h
 
     fi
 fi
 
 
 if test "$wxUSE_ABOUTDLG" = "yes"; then
 
     fi
 fi
 
 
 if test "$wxUSE_ABOUTDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ABOUTDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_ABOUTDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_CHOICEDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_CHOICEDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CHOICEDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_CHOICEDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_COLOURDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_COLOURDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_COLOURDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_COLOURDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_FILEDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_FILEDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FILEDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_FILEDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_FINDREPLDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_FINDREPLDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FINDREPLDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_FINDREPLDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_FONTDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_FONTDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FONTDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_FONTDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_DIRDLG" = "yes"; then
     if test "$wxUSE_TREECTRL" != "yes"; then
 
 fi
 
 if test "$wxUSE_DIRDLG" = "yes"; then
     if test "$wxUSE_TREECTRL" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5
-echo "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5
+$as_echo "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;}
     else
     else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DIRDLG 1
-_ACEOF
+        $as_echo "#define wxUSE_DIRDLG 1" >>confdefs.h
 
     fi
 fi
 
 if test "$wxUSE_MSGDLG" = "yes"; then
 
     fi
 fi
 
 if test "$wxUSE_MSGDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MSGDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_MSGDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_NUMBERDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_NUMBERDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NUMBERDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_NUMBERDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_PROGRESSDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_PROGRESSDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       { echo "$as_me:$LINENO: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5
-echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;}
-    else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROGRESSDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_PROGRESSDLG 1" >>confdefs.h
 
 
-    fi
 fi
 
 if test "$wxUSE_SPLASH" = "yes"; then
 fi
 
 if test "$wxUSE_SPLASH" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SPLASH 1
-_ACEOF
+    $as_echo "#define wxUSE_SPLASH 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash"
 fi
 
 if test "$wxUSE_STARTUP_TIPS" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash"
 fi
 
 if test "$wxUSE_STARTUP_TIPS" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       { echo "$as_me:$LINENO: WARNING: Startup tips requires constraints and won't be compiled without them" >&5
-echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;}
-    else
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STARTUP_TIPS 1
-_ACEOF
+    $as_echo "#define wxUSE_STARTUP_TIPS 1" >>confdefs.h
 
 
-    fi
 fi
 
 if test "$wxUSE_TEXTDLG" = "yes"; then
 fi
 
 if test "$wxUSE_TEXTDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TEXTDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_TEXTDLG 1" >>confdefs.h
 
 fi
 
 if test "$wxUSE_WIZARDDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_WIZARDDLG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WIZARDDLG 1
-_ACEOF
+    $as_echo "#define wxUSE_WIZARDDLG 1" >>confdefs.h
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
 fi
 
 
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
 fi
 
 
+if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then
+    if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+        $as_echo "#define wxUSE_OWNER_DRAWN 1" >>confdefs.h
+
+    fi
+fi
+
+
+if test "$wxUSE_MSW" = 1 ; then
+
+    if test "$wxUSE_DC_CACHEING" = "yes"; then
+        $as_echo "#define wxUSE_DC_CACHEING 1" >>confdefs.h
+
+    fi
+
+    if test "$wxUSE_DIB" = "yes"; then
+        $as_echo "#define wxUSE_WXDIB 1" >>confdefs.h
+
+    fi
+
+    if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
+        $as_echo "#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1" >>confdefs.h
+
+    fi
+
+    if test "$wxUSE_UXTHEME" = "yes"; then
+        $as_echo "#define wxUSE_UXTHEME 1" >>confdefs.h
+
+    fi
+
+fi
+
+if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then
+    $as_echo "#define wxUSE_AUTOID_MANAGEMENT 1" >>confdefs.h
+
+fi
+
+if test "$USE_WIN32" = 1 ; then
+    if test "$wxUSE_INICONF" = "yes"; then
+        $as_echo "#define wxUSE_INICONF 1" >>confdefs.h
+
+    fi
+
+    if test "$wxUSE_REGKEY" = "yes"; then
+        $as_echo "#define wxUSE_REGKEY 1" >>confdefs.h
+
+    fi
+fi
+
+
+if test "$wxUSE_MAC" = 1; then
+    wxUSE_GRAPHICS_CONTEXT="yes"
+fi
+
 if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
 if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
-   if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
-_ACEOF
+    wx_has_graphics=0
+    if test "$wxUSE_MSW" = 1; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GDI+ is available" >&5
+$as_echo_n "checking if GDI+ is available... " >&6; }
+if test "${wx_cv_lib_gdiplus+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
 
 
-   elif test "$wxUSE_GTK" != 1; then
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
+                                                ac_ext=cpp
+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
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <windows.h>
+                     #include <gdiplus.h>
+int
+main ()
+{
+
+                        using namespace Gdiplus;
+
+  ;
+  return 0;
+}
 _ACEOF
 _ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  wx_cv_lib_gdiplus=yes
+else
+  wx_cv_lib_gdiplus=no
 
 
-   else
+fi
+rm -f core 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
+
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_gdiplus" >&5
+$as_echo "$wx_cv_lib_gdiplus" >&6; }
+        if test "$wx_cv_lib_gdiplus" = "yes"; then
+            wx_has_graphics=1
+        fi
+    elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
 
 pkg_failed=no
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for CAIRO" >&5
-echo $ECHO_N "checking for CAIRO... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
+$as_echo_n "checking for CAIRO... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$CAIRO_CFLAGS"; then
         pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$CAIRO_CFLAGS"; then
         pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
   ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo" 2>/dev/null`
 else
   pkg_failed=yes
@@ -48669,11 +36406,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo\""; } >&5
   ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "cairo") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo" 2>/dev/null`
 else
   pkg_failed=yes
@@ -48700,30 +36437,66 @@ fi
        # Put the nasty error message in config.log where it belongs
        echo "$CAIRO_PKG_ERRORS" >&5
 
        # Put the nasty error message in config.log where it belongs
        echo "$CAIRO_PKG_ERRORS" >&5
 
-       { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5
-echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;}
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cairo library not found" >&5
+$as_echo "$as_me: WARNING: Cairo library not found" >&2;}
 
 elif test $pkg_failed = untried; then
 
 elif test $pkg_failed = untried; then
-       { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5
-echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;}
+       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cairo library not found" >&5
+$as_echo "$as_me: WARNING: Cairo library not found" >&2;}
 
 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; }
-       cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       wx_has_graphics=1
+fi
+        if test "$wx_has_graphics" = 1; then
+                                                save_LIBS="$LIBS"
+            LIBS="$LIBS $CAIRO_LIBS"
+            for ac_func in cairo_push_group
+do :
+  ac_fn_c_check_func "$LINENO" "cairo_push_group" "ac_cv_func_cairo_push_group"
+if test "x$ac_cv_func_cairo_push_group" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CAIRO_PUSH_GROUP 1
 _ACEOF
 
 fi
 _ACEOF
 
 fi
-   fi
+done
+
+            LIBS="$save_LIBS"
+            if test "$ac_cv_func_cairo_push_group" = "no"; then
+                wx_has_graphics=0
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cairo library is too old and misses cairo_push_group()" >&5
+$as_echo "$as_me: WARNING: Cairo library is too old and misses cairo_push_group()" >&2;}
+            else
+                $as_echo "#define wxUSE_CAIRO 1" >>confdefs.h
+
+
+                                                if test "$wxUSE_GTK" != 1; then
+                    CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
+                fi
+            fi
+        fi
+    else
+                wx_has_graphics=1
+    fi
+
+    if test "$wx_has_graphics" = 1; then
+        $as_echo "#define wxUSE_GRAPHICS_CONTEXT 1" >>confdefs.h
+
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext won't be available" >&5
+$as_echo "$as_me: WARNING: wxGraphicsContext won't be available" >&2;}
+    fi
 fi
 
 
 USE_MEDIA=0
 
 fi
 
 
 USE_MEDIA=0
 
-if test "$wxUSE_MEDIACTRL" = "yes"; then
+if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
     USE_MEDIA=1
 
                 if test "$wxUSE_GTK" = 1; then
     USE_MEDIA=1
 
                 if test "$wxUSE_GTK" = 1; then
@@ -48736,20 +36509,20 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5
+$as_echo_n "checking for GST... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then
         pkg_cv_GST_CFLAGS="$GST_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then
         pkg_cv_GST_CFLAGS="$GST_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION gconf-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5
   ac_status=$?
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0" 2>/dev/null`
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -48762,12 +36535,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GST_LIBS="$GST_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_GST_LIBS="$GST_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION gconf-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-plugins-base-\$GST_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION") 2>&5
   ac_status=$?
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0" 2>/dev/null`
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
 else
   pkg_failed=yes
 fi
@@ -48786,31 +36559,31 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0"`
+               GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"`
         else
         else
-               GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0"`
+               GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION"`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GST_PKG_ERRORS" >&5
 
 
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GST_PKG_ERRORS" >&5
 
 
-                    { echo "$as_me:$LINENO: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&5
-echo "$as_me: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&2;}
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&5
+$as_echo "$as_me: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&2;}
                     GST_VERSION_MINOR=8
 
 
 elif test $pkg_failed = untried; then
 
                     GST_VERSION_MINOR=8
 
 
 elif test $pkg_failed = untried; then
 
-                    { echo "$as_me:$LINENO: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&5
-echo "$as_me: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&2;}
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&5
+$as_echo "$as_me: WARNING: GStreamer 0.10 not available, falling back to 0.8" >&2;}
                     GST_VERSION_MINOR=8
 
 
 else
        GST_CFLAGS=$pkg_cv_GST_CFLAGS
        GST_LIBS=$pkg_cv_GST_LIBS
                     GST_VERSION_MINOR=8
 
 
 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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
                     wxUSE_GSTREAMER="yes"
                     GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
 
                     wxUSE_GSTREAMER="yes"
                     GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
@@ -48824,19 +36597,19 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5
+$as_echo_n "checking for GST... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then
         pkg_cv_GST_CFLAGS="$GST_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$GST_CFLAGS"; then
         pkg_cv_GST_CFLAGS="$GST_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-interfaces-\$GST_VERSION gstreamer-gconf-\$GST_VERSION\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-interfaces-\$GST_VERSION gstreamer-gconf-\$GST_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -48850,11 +36623,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_GST_LIBS="$GST_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
         pkg_cv_GST_LIBS="$GST_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-interfaces-\$GST_VERSION gstreamer-gconf-\$GST_VERSION\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-\$GST_VERSION gstreamer-interfaces-\$GST_VERSION gstreamer-gconf-\$GST_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION") 2>&5
   ac_status=$?
   ($PKG_CONFIG --exists --print-errors "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
   pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
@@ -48882,19 +36655,19 @@ fi
        echo "$GST_PKG_ERRORS" >&5
 
 
        echo "$GST_PKG_ERRORS" >&5
 
 
-                    { echo "$as_me:$LINENO: WARNING: GStreamer 0.8/0.10 not available." >&5
-echo "$as_me: WARNING: GStreamer 0.8/0.10 not available." >&2;}
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.8/0.10 not available." >&5
+$as_echo "$as_me: WARNING: GStreamer 0.8/0.10 not available." >&2;}
 
 elif test $pkg_failed = untried; then
 
 
 elif test $pkg_failed = untried; then
 
-                    { echo "$as_me:$LINENO: WARNING: GStreamer 0.8/0.10 not available." >&5
-echo "$as_me: WARNING: GStreamer 0.8/0.10 not available." >&2;}
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer 0.8/0.10 not available." >&5
+$as_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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
        wxUSE_GSTREAMER="yes"
 fi
         fi
        wxUSE_GSTREAMER="yes"
 fi
         fi
@@ -48902,11 +36675,9 @@ fi
 
         if test "$wxUSE_GSTREAMER" = "yes"; then
             CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
 
         if test "$wxUSE_GSTREAMER" = "yes"; then
             CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
-            LIBS="$GST_LIBS $LIBS"
+            EXTRALIBS_MEDIA="$GST_LIBS"
 
 
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GSTREAMER 1
-_ACEOF
+            $as_echo "#define wxUSE_GSTREAMER 1" >>confdefs.h
 
         else
             USE_MEDIA=0
 
         else
             USE_MEDIA=0
@@ -48915,15 +36686,20 @@ _ACEOF
 
     if test $USE_MEDIA = 1; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
 
     if test $USE_MEDIA = 1; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_MEDIACTRL 1
-_ACEOF
+        $as_echo "#define wxUSE_MEDIACTRL 1" >>confdefs.h
 
 
+    else
+        if test "$wxUSE_MEDIACTRL" = "yes"; then
+            as_fn_error $? "GStreamer not available" "$LINENO" 5
+        else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5
+$as_echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;}
+        fi
     fi
 fi
 
 
     fi
 fi
 
 
-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then
         OSINFO="\"$host\""
 else
         OSINFO=`uname -s -r -m`
         OSINFO="\"$host\""
 else
         OSINFO=`uname -s -r -m`
@@ -48952,15 +36728,12 @@ _ACEOF
 STD_BASE_LIBS="base"
 STD_GUI_LIBS=""
 BUILT_WX_LIBS="base"
 STD_BASE_LIBS="base"
 STD_GUI_LIBS=""
 BUILT_WX_LIBS="base"
-ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
+ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base"
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     STD_BASE_LIBS="net $STD_BASE_LIBS"
     BUILT_WX_LIBS="net $BUILT_WX_LIBS"
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     STD_BASE_LIBS="net $STD_BASE_LIBS"
     BUILT_WX_LIBS="net $BUILT_WX_LIBS"
 fi
-if test "$wxUSE_ODBC" != "no" ; then
-    BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
-fi
 if test "$wxUSE_XML" = "yes" ; then
     STD_BASE_LIBS="xml $STD_BASE_LIBS"
     BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
 if test "$wxUSE_XML" = "yes" ; then
     STD_BASE_LIBS="xml $STD_BASE_LIBS"
     BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
@@ -48974,9 +36747,6 @@ if test "$wxUSE_GUI" = "yes"; then
         STD_GUI_LIBS="qa $STD_GUI_LIBS"
         BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
     fi
         STD_GUI_LIBS="qa $STD_GUI_LIBS"
         BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
     fi
-    if test "$wxUSE_ODBC" != "no" ; then
-        BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
-    fi
     if test "$wxUSE_HTML" = "yes" ; then
         STD_GUI_LIBS="html $STD_GUI_LIBS"
         BUILT_WX_LIBS="html $BUILT_WX_LIBS"
     if test "$wxUSE_HTML" = "yes" ; then
         STD_GUI_LIBS="html $STD_GUI_LIBS"
         BUILT_WX_LIBS="html $BUILT_WX_LIBS"
@@ -48990,9 +36760,22 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_AUI" = "yes" ; then
         BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
     fi
     if test "$wxUSE_AUI" = "yes" ; then
         BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
     fi
+    if test "$wxUSE_PROPGRID" = "yes" ; then
+        BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_RIBBON" = "yes" ; then
+        BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_RICHTEXT" = "yes" ; then
+        BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
+    fi
     if test "$wxUSE_STC" = "yes" ; then
         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
     fi
     if test "$wxUSE_STC" = "yes" ; then
         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
     fi
+    if test "$wxUSE_WEBVIEW" = "yes" ; then
+        STD_GUI_LIBS="webview $STD_GUI_LIBS"
+        BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
+    fi
     if test "$wxUSE_XRC" = "yes" ; then
         STD_GUI_LIBS="xrc $STD_GUI_LIBS"
         BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
     if test "$wxUSE_XRC" = "yes" ; then
         STD_GUI_LIBS="xrc $STD_GUI_LIBS"
         BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
@@ -49005,40 +36788,70 @@ fi
 
 
 
 
 
 
-
+EXTRA_FRAMEWORKS=
 if test "$wxUSE_MAC" = 1 ; then
 if test "$wxUSE_MAC" = 1 ; then
-    if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
-        if test "$USE_DARWIN" = 1; then
-            LDFLAGS="$LDFLAGS -framework QuickTime"
+    if test "$USE_DARWIN" = 1; then
+        if test "$wxUSE_OSX_IPHONE" = 1; then
+            EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore"
         else
         else
-            LDFLAGS="$LDFLAGS -lQuickTimeLib"
+            EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
+
+
+            if test "$cross_compiling" != "no"; then
+                                                                                                wx_cv_target_x86_64=no
+            else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we target only x86_64" >&5
+$as_echo_n "checking if we target only x86_64... " >&6; }
+if test "${wx_cv_target_x86_64+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main() { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if file conftest$ac_exeext|grep -q 'i386\|ppc'; then
+                            wx_cv_target_x86_64=no
+                        else
+                            wx_cv_target_x86_64=yes
+                        fi
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_target_x86_64" >&5
+$as_echo "$wx_cv_target_x86_64" >&6; }
+            fi
+
+            if test "$wx_cv_target_x86_64" != "yes"; then
+                EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
+            fi
         fi
     fi
         fi
     fi
-    if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
-    else
-        LDFLAGS="$LDFLAGS -lCarbonLib"
-    fi
 fi
 fi
-if test "$wxUSE_COCOA" = 1 ; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
+if test "$wxUSE_OLD_COCOA" = 1 ; then
+    EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"
     if test "$wxUSE_MEDIACTRL" = "yes"; then
     if test "$wxUSE_MEDIACTRL" = "yes"; then
-        LDFLAGS="$LDFLAGS -framework QuickTime"
+        EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
     fi
 fi
     fi
 fi
-if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
+    EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
 fi
 
 fi
 
+LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS"
+WXCONFIG_LDFLAGS="$WXCONFIG_LDFLAGS $EXTRA_FRAMEWORKS"
+
 LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
 LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
-                     dynamic erase event exec font image minimal mobile \
-                     mobile/wxedit mobile/styles propsize render \
-                     rotate shaped svg taborder vscroll widgets"
+                     erase event exec font image minimal render \
+                     shaped svg taborder vscroll widgets wrapsizer"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -49046,7 +36859,7 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$TOOLKIT" = "MSW"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
         if test "$wxUSE_UNIVERSAL" != "yes"; then
     if test "$TOOLKIT" = "MSW"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
         if test "$wxUSE_UNIVERSAL" != "yes"; then
-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg"
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll"
         fi
     fi
     if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
         fi
     fi
     if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
@@ -49054,19 +36867,92 @@ if test "$wxUSE_GUI" = "yes"; then
     fi
 else
     SAMPLES_SUBDIRS="console"
     fi
 else
     SAMPLES_SUBDIRS="console"
+    if test "$wxUSE_SOCKETS" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
+    fi
+    if test "$wxUSE_IPC" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
+    fi
 fi
 
 
 if test "x$INTELCC" = "xyes" ; then
 fi
 
 
 if test "x$INTELCC" = "xyes" ; then
-                                        CWARNINGS="-Wall -wd810,869,981,1418,1572,1684"
+                                        CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259"
 elif test "$GCC" = yes ; then
     CWARNINGS="-Wall -Wundef"
 fi
 
 if test "x$INTELCXX" = "xyes" ; then
 elif test "$GCC" = yes ; then
     CWARNINGS="-Wall -Wundef"
 fi
 
 if test "x$INTELCXX" = "xyes" ; then
-                                                            CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
+                                                                CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259"
 elif test "$GXX" = yes ; then
 elif test "$GXX" = yes ; then
-        CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
+    CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5
+$as_echo_n "checking CXXWARNINGS for gcc -Woverloaded-virtual... " >&6; }
+if test "${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown"
+
+ ac_ext=cpp
+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_save_CXXFLAGS="$CXXFLAGS"
+for ac_arg in "-pedantic -Werror % -Woverloaded-virtual"     "-pedantic % -Woverloaded-virtual %% no, obsolete"     #
+do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_cxxflags_gcc_option__Woverloaded_virtual=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ 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
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&5
+$as_echo "$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&6; }
+case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in
+     .ok|.ok,*)  ;;
+   .|.no|.no,*)  ;;
+   *)
+   if echo " $CXXWARNINGS " | grep " $ac_cv_cxxflags_gcc_option__Woverloaded_virtual " 2>&1 >/dev/null
+   then { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS does contain \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual"; } >&5
+  (: CXXWARNINGS does contain $ac_cv_cxxflags_gcc_option__Woverloaded_virtual) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+   else { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXWARNINGS=\"\$CXXWARNINGS \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual\""; } >&5
+  (: CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+                      CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual"
+   fi
+ ;;
+esac
+
+
+                    if test "$wxUSE_MAC" = 1 ; then
+        CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations"
+    fi
 fi
 
 
 fi
 
 
@@ -49082,6 +36968,8 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
 C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
 CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
 C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
 CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
+OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS `
+OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS `
 
 WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
 
 
 WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
 
@@ -49097,8 +36985,8 @@ LIBS=`echo $LIBS`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
-EXTRALIBS_ODBC="$ODBC_LINK"
-EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+EXTRALIBS_MEDIA="$GST_LIBS"
+EXTRALIBS_STC="-lwxscintilla${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`
 fi
 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`
 fi
@@ -49116,9 +37004,6 @@ fi
 if test "$wxUSE_EXPAT" = "builtin" ; then
     wxconfig_3rdparty="expat $wxconfig_3rdparty"
 fi
 if test "$wxUSE_EXPAT" = "builtin" ; then
     wxconfig_3rdparty="expat $wxconfig_3rdparty"
 fi
-if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="odbc $wxconfig_3rdparty"
-fi
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
     wxconfig_3rdparty="tiff $wxconfig_3rdparty"
 fi
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
     wxconfig_3rdparty="tiff $wxconfig_3rdparty"
 fi
@@ -49133,7 +37018,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
 fi
 
 for i in $wxconfig_3rdparty ; do
 fi
 
 for i in $wxconfig_3rdparty ; do
-    WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
+    WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
 done
 
 
 done
 
 
@@ -49142,14 +37027,12 @@ if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
 
     case "$wxUNIV_THEMES" in
         ''|all)
 
     case "$wxUNIV_THEMES" in
         ''|all)
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ALL_THEMES 1
-_ACEOF
+            $as_echo "#define wxUSE_ALL_THEMES 1" >>confdefs.h
 
             ;;
 
         *)
 
             ;;
 
         *)
-            for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do
+            for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do
                 cat >>confdefs.h <<_ACEOF
 #define wxUSE_THEME_$t 1
 _ACEOF
                 cat >>confdefs.h <<_ACEOF
 #define wxUSE_THEME_$t 1
 _ACEOF
@@ -49167,7 +37050,6 @@ fi
 
 
 
 
 
 
-
 if test $wxUSE_MONOLITHIC = "yes" ; then
     MONOLITHIC=1
 else
 if test $wxUSE_MONOLITHIC = "yes" ; then
     MONOLITHIC=1
 else
@@ -49180,12 +37062,6 @@ else
     USE_PLUGINS=0
 fi
 
     USE_PLUGINS=0
 fi
 
-if test $wxUSE_ODBC != "no" ; then
-    USE_ODBC=1
-else
-    USE_ODBC=0
-fi
-
 if test "$wxUSE_DEBUGREPORT" = "yes" ; then
     USE_QA=1
 else
 if test "$wxUSE_DEBUGREPORT" = "yes" ; then
     USE_QA=1
 else
@@ -49223,7 +37099,10 @@ fi
 
 
 
 
 
 
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
+
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
+
+
 
 
 
 
 
 
@@ -49235,8 +37114,11 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
 case "$TOOLKIT" in
     GTK)
         TOOLKIT_DESC="GTK+"
 case "$TOOLKIT" in
     GTK)
         TOOLKIT_DESC="GTK+"
-        if test "$WXGTK20" = 1; then
+        if test "$WXGTK2" = 1; then
             TOOLKIT_DESC="$TOOLKIT_DESC 2"
             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
@@ -49246,6 +37128,9 @@ case "$TOOLKIT" in
             if test "$wxUSE_LIBHILDON" = "yes"; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
             fi
             if test "$wxUSE_LIBHILDON" = "yes"; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
             fi
+            if test "$wxUSE_LIBHILDON2" = "yes"; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
+            fi
 
             if test "$TOOLKIT_EXTRA" != ""; then
                 TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
 
             if test "$TOOLKIT_EXTRA" != ""; then
                 TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
@@ -49266,29 +37151,12 @@ if test "$wxUSE_WINE" = "yes"; then
     BAKEFILE_FORCE_PLATFORM=win32
 fi
 
     BAKEFILE_FORCE_PLATFORM=win32
 fi
 
-if test "$wxUSE_MAC" = 1 ; then
-    if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
-                        if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
-            OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-        else
-                                    OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"}
-        fi
-        OSX_UNIV_OPTS="$OSX_UNIV_OPTS -arch ppc -arch i386"
-        CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
-        CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
-        LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
-        bk_use_pch=no
-    fi
-    # TODO: where do we add "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" for libtool (static builds only)?
-    #       The makefile currently uses AR and RANLIB, which libtool apparently supercedes.
-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; }
-if test "${wx_cv_gcc_pch_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc precompiled header bug" >&5
+$as_echo_n "checking for gcc precompiled header bug... " >&6; }
+if test "${wx_cv_gcc_pch_bug+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
             echo '#include <stdio.h>
 else
 
             echo '#include <stdio.h>
@@ -49322,22 +37190,116 @@ 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_gcc_pch_bug" >&5
+$as_echo "$wx_cv_gcc_pch_bug" >&6; }
 
     if test "$wx_cv_gcc_pch_bug" = yes; then
                         bk_use_pch=no
     fi
 fi
 
 
     if test "$wx_cv_gcc_pch_bug" = yes; then
                         bk_use_pch=no
     fi
 fi
 
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# 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.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # 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 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.
+           :
+         elif test $ac_prog = install &&
+           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+           # program-specific install script used by HP pwplus--don't use.
+           :
+         else
+           rm -rf conftest.one conftest.two conftest.dir
+           echo one > conftest.one
+           echo two > conftest.two
+           mkdir conftest.dir
+           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+             test -s conftest.one && test -s conftest.two &&
+             test -s conftest.dir/conftest.one &&
+             test -s conftest.dir/conftest.two
+           then
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+             break 3
+           fi
+         fi
+       fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+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
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+
+
 
 
 
     if test "x$BAKEFILE_HOST" = "x"; then
                if test "x${host}" = "x" ; then
 
 
 
     if test "x$BAKEFILE_HOST" = "x"; then
                if test "x${host}" = "x" ; then
-                       { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5
-echo "$as_me: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&2;}
-   { (exit 1); exit 1; }; }
+                       as_fn_error $? "You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." "$LINENO" 5
                fi
 
         BAKEFILE_HOST="${host}"
                fi
 
         BAKEFILE_HOST="${host}"
@@ -49348,10 +37310,10 @@ 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; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -49361,25 +37323,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_RANLIB="${ac_tool_prefix}ranlib"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -49388,10 +37350,10 @@ 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
   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; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -49401,25 +37363,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_RANLIB="ranlib"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -49427,12 +37389,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -49441,110 +37399,32 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-    # Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# 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; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # 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 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.
-           :
-         elif test $ac_prog = install &&
-           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :
-         else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
-         fi
-       fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-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
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ 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.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "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 $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# 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;;
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -49554,12 +37434,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -49577,10 +37457,10 @@ 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; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -49590,25 +37470,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_AR="${ac_tool_prefix}ar"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -49617,10 +37497,10 @@ 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
   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; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -49630,25 +37510,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_AR="ar"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -49656,12 +37536,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -49677,10 +37553,10 @@ 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; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -49690,25 +37566,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_STRIP="${ac_tool_prefix}strip"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -49717,10 +37593,10 @@ 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
   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; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -49730,25 +37606,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_STRIP="strip"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -49756,12 +37632,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -49773,10 +37645,10 @@ 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; }
-if test "${ac_cv_prog_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   ac_cv_prog_NM="$NM" # Let the user override the test.
 else
   if test -n "$NM"; then
   ac_cv_prog_NM="$NM" # Let the user override the test.
@@ -49786,25 +37658,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_NM="${ac_tool_prefix}nm"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
 IFS=$as_save_IFS
 
 fi
 fi
 NM=$ac_cv_prog_NM
 if test -n "$NM"; then
-  { echo "$as_me:$LINENO: result: $NM" >&5
-echo "${ECHO_T}$NM" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
+$as_echo "$NM" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -49813,10 +37685,10 @@ 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
   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; }
-if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NM"; then
   ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
 else
   if test -n "$ac_ct_NM"; then
   ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
@@ -49826,25 +37698,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_NM="nm"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_NM=$ac_cv_prog_ac_ct_NM
 if test -n "$ac_ct_NM"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5
+$as_echo "$ac_ct_NM" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NM" = x; then
 fi
 
   if test "x$ac_ct_NM" = x; then
@@ -49852,12 +37724,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NM=$ac_ct_NM
 ac_tool_warned=yes ;;
 esac
     NM=$ac_ct_NM
@@ -49867,14 +37735,7 @@ else
 fi
 
 
 fi
 
 
-    case ${BAKEFILE_HOST} in
-        *-hp-hpux* )
-                                    INSTALL_DIR="mkdir -p"
-            ;;
-        * )
-                                    INSTALL_DIR='$(INSTALL) -d'
-            ;;
-    esac
+        INSTALL_DIR="mkdir -p"
 
 
     LDFLAGS_GUI=
 
 
     LDFLAGS_GUI=
@@ -49886,10 +37747,10 @@ 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; }
-if test "${bakefile_cv_prog_makeisgnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if make is GNU make" >&5
+$as_echo_n "checking if make is GNU make... " >&6; }
+if test "${bakefile_cv_prog_makeisgnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
         if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
 else
 
         if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
@@ -49900,8 +37761,8 @@ else
         fi
 
 fi
         fi
 
 fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_prog_makeisgnu" >&5
-echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_prog_makeisgnu" >&5
+$as_echo "$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=""
@@ -49968,7 +37829,8 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
                 PLATFORM_BEOS=1
             ;;
             * )
                 PLATFORM_BEOS=1
             ;;
             * )
-                                            ;;
+                as_fn_error $? "Unknown platform: $BAKEFILE_FORCE_PLATFORM" "$LINENO" 5
+            ;;
         esac
     fi
 
         esac
     fi
 
@@ -49983,7 +37845,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
 
 
     # Check whether --enable-omf was given.
 
 
     # Check whether --enable-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
 
@@ -50030,6 +37892,8 @@ fi
     dlldir="$libdir"
 
     case "${BAKEFILE_HOST}" in
     dlldir="$libdir"
 
     case "${BAKEFILE_HOST}" in
+                        ia64-hp-hpux* )
+        ;;
         *-hp-hpux* )
             SO_SUFFIX="sl"
             SO_SUFFIX_MODULE="sl"
         *-hp-hpux* )
             SO_SUFFIX="sl"
             SO_SUFFIX_MODULE="sl"
@@ -50111,7 +37975,7 @@ fi
       ;;
 
       *-*-linux* )
       ;;
 
       *-*-linux* )
-        if test "$INTELCC" = "yes"; then
+                        if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
             PIC_FLAG="-KPIC"
         elif test "x$SUNCXX" = "xyes"; then
             SHARED_LD_CC="${CC} -G -o"
             PIC_FLAG="-KPIC"
         elif test "x$SUNCXX" = "xyes"; then
             SHARED_LD_CC="${CC} -G -o"
@@ -50147,6 +38011,10 @@ objects=""
 linking_flag="-dynamiclib"
 ldargs="-r -keep_private_externs -nostdlib"
 
 linking_flag="-dynamiclib"
 ldargs="-r -keep_private_externs -nostdlib"
 
+if test "x${D}CXX" = "x"; then
+    CXX="c++"
+fi
+
 while test ${D}# -gt 0; do
     case ${D}1 in
 
 while test ${D}# -gt 0; do
     case ${D}1 in
 
@@ -50160,6 +38028,12 @@ while test ${D}# -gt 0; do
         shift
         ;;
 
         shift
         ;;
 
+       -arch|-isysroot)
+        # collect these options and values
+        ldargs="${D}{ldargs} ${D}1 ${D}2"
+        shift
+        ;;
+
        -s|-Wl,*)
         # collect these load args
         ldargs="${D}{ldargs} ${D}1"
        -s|-Wl,*)
         # collect these load args
         ldargs="${D}{ldargs} ${D}1"
@@ -50199,9 +38073,9 @@ status=0
 # Link one module containing all the others
 #
 if test ${D}{verbose} = 1; then
 # Link one module containing all the others
 #
 if test ${D}{verbose} = 1; then
-    echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
+    echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
 fi
 fi
-c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
+${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
 status=${D}?
 
 #
 status=${D}?
 
 #
@@ -50210,9 +38084,9 @@ status=${D}?
 #
 if test ${D}{status} = 0; then
     if test ${D}{verbose} = 1; then
 #
 if test ${D}{status} = 0; then
     if test ${D}{verbose} = 1; then
-        echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
+        echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
     fi
     fi
-    c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}
+    ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
     status=${D}?
 fi
 
     status=${D}?
 fi
 
@@ -50227,20 +38101,16 @@ EOF
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="CXX=\"\$(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; }
-if test "${bakefile_cv_gcc31+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc 3.1 or later" >&5
+$as_echo_n "checking for gcc 3.1 or later... " >&6; }
+if test "${bakefile_cv_gcc31+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 else
 
-           cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -50256,41 +38126,21 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
                    bakefile_cv_gcc31=yes
 
 else
 
                    bakefile_cv_gcc31=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
                    bakefile_cv_gcc31=no
 
 
 fi
 
                    bakefile_cv_gcc31=no
 
 
 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
-{ echo "$as_me:$LINENO: result: $bakefile_cv_gcc31" >&5
-echo "${ECHO_T}$bakefile_cv_gcc31" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $bakefile_cv_gcc31" >&5
+$as_echo "$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"
@@ -50322,10 +38172,10 @@ 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; }
-if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AIX_CXX_LD"; then
   ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test.
 else
   if test -n "$AIX_CXX_LD"; then
   ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test.
@@ -50335,14 +38185,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_AIX_CXX_LD="makeC++SharedLib"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-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"
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
@@ -50350,11 +38200,11 @@ fi
 fi
 AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD
 if test -n "$AIX_CXX_LD"; then
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AIX_CXX_LD" >&5
+$as_echo "$AIX_CXX_LD" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -50877,9 +38727,7 @@ EOF
               ;;
 
       *)
               ;;
 
       *)
-        { { echo "$as_me:$LINENO: error: unknown system type $BAKEFILE_HOST." >&5
-echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error $? "unknown system type $BAKEFILE_HOST." "$LINENO" 5
     esac
 
     if test "x$PIC_FLAG" != "x" ; then
     esac
 
     if test "x$PIC_FLAG" != "x" ; then
@@ -50905,12 +38753,13 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0
     USE_SOVERCYGWIN=0
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0
     USE_SOVERCYGWIN=0
-    USE_SOSYMLINKS=0
+    USE_SOTWOSYMLINKS=0
     USE_MACVERSION=0
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
     USE_MACVERSION=0
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
+      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-k*bsd*-gnu | *-*-mirbsd* )
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
         else
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
         else
@@ -50918,20 +38767,19 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
         fi
         USE_SOVERSION=1
         USE_SOVERLINUX=1
         fi
         USE_SOVERSION=1
         USE_SOVERLINUX=1
-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1
       ;;
 
       *-*-solaris2* )
         SONAME_FLAG="-h "
         USE_SOVERSION=1
         USE_SOVERSOLARIS=1
       ;;
 
       *-*-solaris2* )
         SONAME_FLAG="-h "
         USE_SOVERSION=1
         USE_SOVERSOLARIS=1
-        USE_SOSYMLINKS=1
       ;;
 
       *-*-darwin* )
         USE_MACVERSION=1
         USE_SOVERSION=1
       ;;
 
       *-*-darwin* )
         USE_MACVERSION=1
         USE_SOVERSION=1
-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1
       ;;
 
       *-*-cygwin* )
       ;;
 
       *-*-cygwin* )
@@ -50950,63 +38798,56 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
 
 
     # Check whether --enable-dependency-tracking was given.
 
 
     # Check whether --enable-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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dependency tracking method" >&5
+$as_echo_n "checking for dependency tracking method... " >&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; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
     else
         DEPS_TRACKING=1
 
         if test "x$GCC" = "xyes"; then
             DEPSMODE=gcc
     else
         DEPS_TRACKING=1
 
         if test "x$GCC" = "xyes"; then
             DEPSMODE=gcc
-            case "${BAKEFILE_HOST}" in
-                *-*-darwin* )
-                                                            DEPSFLAG="-no-cpp-precomp -MMD"
-                ;;
-                * )
-                    DEPSFLAG="-MMD"
-                ;;
-            esac
-            { echo "$as_me:$LINENO: result: gcc" >&5
-echo "${ECHO_T}gcc" >&6; }
+            DEPSFLAG="-MMD"
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: gcc" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: mwcc" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sun cc" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: SGI cc" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: HP cc" >&5
+$as_echo "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; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: Compaq cc" >&5
+$as_echo "Compaq cc" >&6; }
         else
             DEPS_TRACKING=0
         else
             DEPS_TRACKING=0
-            { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
         fi
 
         if test $DEPS_TRACKING = 1 ; then
         fi
 
         if test $DEPS_TRACKING = 1 ; then
@@ -51015,24 +38856,20 @@ D='$'
 cat <<EOF >bk-deps
 #!/bin/sh
 
 cat <<EOF >bk-deps
 #!/bin/sh
 
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
 # script. It is used to track C/C++ files dependencies in portable way.
 #
 # Permission is given to use this file in any way.
 
 DEPSMODE=${DEPSMODE}
 # script. It is used to track C/C++ files dependencies in portable way.
 #
 # Permission is given to use this file in any way.
 
 DEPSMODE=${DEPSMODE}
-DEPSDIR=.deps
 DEPSFLAG="${DEPSFLAG}"
 DEPSFLAG="${DEPSFLAG}"
-
-mkdir -p ${D}DEPSDIR
+DEPSDIRBASE=.deps
 
 if test ${D}DEPSMODE = gcc ; then
     ${D}* ${D}{DEPSFLAG}
     status=${D}?
 
 if test ${D}DEPSMODE = gcc ; then
     ${D}* ${D}{DEPSFLAG}
     status=${D}?
-    if test ${D}{status} != 0 ; then
-        exit ${D}{status}
-    fi
-    # move created file to the location we want it in:
+
+    # determine location of created files:
     while test ${D}# -gt 0; do
         case "${D}1" in
             -o )
     while test ${D}# -gt 0; do
         case "${D}1" in
             -o )
@@ -51047,24 +38884,37 @@ if test ${D}DEPSMODE = gcc ; then
         esac
         shift
     done
         esac
         shift
     done
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
     depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
     depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
     depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
     depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    # if the compiler failed, we're done:
+    if test ${D}{status} != 0 ; then
+        rm -f ${D}depfile
+        exit ${D}{status}
+    fi
+
+    # move created file to the location we want it in:
     if test -f ${D}depfile ; then
     if test -f ${D}depfile ; then
-        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
         rm -f ${D}depfile
     else
         # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
         rm -f ${D}depfile
     else
         # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
-        depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
+        depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
         if test ! -f ${D}depfile ; then
             # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
             depfile="${D}objfile.d"
         fi
         if test -f ${D}depfile ; then
         if test ! -f ${D}depfile ; then
             # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
             depfile="${D}objfile.d"
         fi
         if test -f ${D}depfile ; then
-            sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+            sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
             rm -f ${D}depfile
         fi
     fi
     exit 0
             rm -f ${D}depfile
         fi
     fi
     exit 0
+
 elif test ${D}DEPSMODE = mwcc ; then
     ${D}* || exit ${D}?
     # Run mwcc again with -MM and redirect into the dep file we want
 elif test ${D}DEPSMODE = mwcc ; then
     ${D}* || exit ${D}?
     # Run mwcc again with -MM and redirect into the dep file we want
@@ -51084,8 +38934,15 @@ elif test ${D}DEPSMODE = mwcc ; then
         fi
         prevarg="${D}arg"
     done
         fi
         prevarg="${D}arg"
     done
-    ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
+
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
     exit 0
     exit 0
+
 elif test ${D}DEPSMODE = unixcc; then
     ${D}* || exit ${D}?
     # Run compiler again with deps flag and redirect into the dep file.
 elif test ${D}DEPSMODE = unixcc; then
     ${D}* || exit ${D}?
     # Run compiler again with deps flag and redirect into the dep file.
@@ -51106,8 +38963,15 @@ elif test ${D}DEPSMODE = unixcc; then
         esac
         shift
     done
         esac
         shift
     done
-    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
+
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
     exit 0
     exit 0
+
 else
     ${D}*
     exit ${D}?
 else
     ${D}*
     exit ${D}?
@@ -51128,10 +38992,10 @@ 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; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$WINDRES"; then
   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
 else
   if test -n "$WINDRES"; then
   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
@@ -51141,25 +39005,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_WINDRES="${ac_tool_prefix}windres"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
 IFS=$as_save_IFS
 
 fi
 fi
 WINDRES=$ac_cv_prog_WINDRES
 if test -n "$WINDRES"; then
-  { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -51168,10 +39032,10 @@ 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
   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; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_WINDRES"; then
   ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
 else
   if test -n "$ac_ct_WINDRES"; then
   ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
@@ -51181,25 +39045,25 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_ac_ct_WINDRES="windres"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
 if test -n "$ac_ct_WINDRES"; then
 IFS=$as_save_IFS
 
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_WINDRES" = x; then
 fi
 
   if test "x$ac_ct_WINDRES" = x; then
@@ -51207,12 +39071,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
   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;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     WINDRES=$ac_ct_WINDRES
 ac_tool_warned=yes ;;
 esac
     WINDRES=$ac_ct_WINDRES
@@ -51226,10 +39086,10 @@ 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; }
-if test "${ac_cv_prog_REZ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_REZ+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$REZ"; then
   ac_cv_prog_REZ="$REZ" # Let the user override the test.
 else
   if test -n "$REZ"; then
   ac_cv_prog_REZ="$REZ" # Let the user override the test.
@@ -51239,14 +39099,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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"
   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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
@@ -51254,20 +39114,20 @@ fi
 fi
 REZ=$ac_cv_prog_REZ
 if test -n "$REZ"; then
 fi
 REZ=$ac_cv_prog_REZ
 if test -n "$REZ"; then
-  { echo "$as_me:$LINENO: result: $REZ" >&5
-echo "${ECHO_T}$REZ" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REZ" >&5
+$as_echo "$REZ" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
             # Extract the first word of "SetFile", so it can be a program name with args.
 set dummy SetFile; ac_word=$2
 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_SETFILE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$SETFILE"; then
   ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
 else
   if test -n "$SETFILE"; then
   ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
@@ -51277,14 +39137,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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"
   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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
@@ -51292,11 +39152,11 @@ fi
 fi
 SETFILE=$ac_cv_prog_SETFILE
 if test -n "$SETFILE"; then
 fi
 SETFILE=$ac_cv_prog_SETFILE
 if test -n "$SETFILE"; then
-  { echo "$as_me:$LINENO: result: $SETFILE" >&5
-echo "${ECHO_T}$SETFILE" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETFILE" >&5
+$as_echo "$SETFILE" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 fi
 
 
@@ -51308,15 +39168,18 @@ fi
 
 
 
 
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
 
 
 
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2"
+
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
+
+
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
 
 
 
     # Check whether --enable-precomp-headers was given.
 
 
 
     # Check whether --enable-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
 
@@ -51334,13 +39197,9 @@ 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; }
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports precompiled headers" >&5
+$as_echo_n "checking if the compiler supports precompiled headers... " >&6; }
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 /* end confdefs.h.  */
 
 int
@@ -51364,89 +39223,31 @@ main ()
   return 0;
 }
 _ACEOF
   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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-                    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                     GCC_PCH=1
 
 else
                     GCC_PCH=1
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
 
 
-                            #if !defined(__INTEL_COMPILER) || \
-                                (__INTEL_COMPILER < 800)
-                                There is no PCH support
-                            #endif
-
-  ;
-  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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  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; }
-                            ICC_PCH=1
-
-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; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                    if test "$INTELCXX8" = "yes"; then
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                        ICC_PCH=1
+                        if test "$INTELCXX10" = "yes"; then
+                            ICC_PCH_CREATE_SWITCH="-pch-create"
+                            ICC_PCH_USE_SWITCH="-pch-use"
+                        else
+                            ICC_PCH_CREATE_SWITCH="-create-pch"
+                            ICC_PCH_USE_SWITCH="-use-pch"
+                        fi
+                    else
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                    fi
 
 fi
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
                 USE_PCH=1
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
                 USE_PCH=1
@@ -51455,7 +39256,7 @@ D='$'
 cat <<EOF >bk-make-pch
 #!/bin/sh
 
 cat <<EOF >bk-make-pch
 #!/bin/sh
 
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
 # script. It is used to generated precompiled headers.
 #
 # Permission is given to use this file in any way.
 # script. It is used to generated precompiled headers.
 #
 # Permission is given to use this file in any way.
@@ -51465,6 +39266,8 @@ header="${D}{2}"
 shift
 shift
 
 shift
 shift
 
+builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
+
 compiler=""
 headerfile=""
 
 compiler=""
 headerfile=""
 
@@ -51477,7 +39280,7 @@ while test ${D}{#} -gt 0; do
                 headerfile="${D}{incdir}/${D}{header}"
             fi
         ;;
                 headerfile="${D}{incdir}/${D}{header}"
             fi
         ;;
-        -use-pch|-use_pch )
+        -use-pch|-use_pch|-pch-use )
             shift
             add_to_cmdline=0
         ;;
             shift
             add_to_cmdline=0
         ;;
@@ -51496,8 +39299,8 @@ else
     else
         mkdir -p \`dirname ${D}{outfile}\`
     fi
     else
         mkdir -p \`dirname ${D}{outfile}\`
     fi
-    depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
-    mkdir -p .deps
+    depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+    mkdir -p ${D}{builddir}/.deps
     if test "x${GCC_PCH}" = "x1" ; then
         # can do this because gcc is >= 3.4:
         ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
     if test "x${GCC_PCH}" = "x1" ; then
         # can do this because gcc is >= 3.4:
         ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
@@ -51509,7 +39312,7 @@ else
 #include "${D}header"
 EOT
         # using -MF icc complains about differing command lines in creation/use
 #include "${D}header"
 EOT
         # using -MF icc complains about differing command lines in creation/use
-        ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
+        ${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\
           sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
           rm -f ${D}file ${D}dfile ${D}{filename}.o
     fi
           sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
           rm -f ${D}file ${D}dfile ${D}{filename}.o
     fi
@@ -51527,6 +39330,8 @@ EOF
 
 
 
 
 
 
+
+
     COND_BUILD_DEBUG="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_DEBUG=""
     COND_BUILD_DEBUG="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_DEBUG=""
@@ -51572,6 +39377,56 @@ EOF
         COND_BUILD_RELEASE_UNICODE_1=""
     fi
 
         COND_BUILD_RELEASE_UNICODE_1=""
     fi
 
+    COND_BUILD_debug="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILD_debug=""
+    fi
+
+    COND_BUILD_debug_DEBUG_FLAG_default="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+        COND_BUILD_debug_DEBUG_FLAG_default=""
+    fi
+
+    COND_BUILD_debug_DEBUG_INFO_default="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_debug_DEBUG_INFO_default=""
+    fi
+
+    COND_BUILD_debug_UNICODE_0="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_debug_UNICODE_0=""
+    fi
+
+    COND_BUILD_debug_UNICODE_1="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_debug_UNICODE_1=""
+    fi
+
+    COND_BUILD_release="#"
+    if test "x$BUILD" = "xrelease" ; then
+        COND_BUILD_release=""
+    fi
+
+    COND_BUILD_release_DEBUG_INFO_default="#"
+    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_release_DEBUG_INFO_default=""
+    fi
+
+    COND_BUILD_release_UNICODE_0="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_release_UNICODE_0=""
+    fi
+
+    COND_BUILD_release_UNICODE_1="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_release_UNICODE_1=""
+    fi
+
+    COND_DEBUG_FLAG_0="#"
+    if test "x$DEBUG_FLAG" = "x0" ; then
+        COND_DEBUG_FLAG_0=""
+    fi
+
     COND_DEBUG_FLAG_1="#"
     if test "x$DEBUG_FLAG" = "x1" ; then
         COND_DEBUG_FLAG_1=""
     COND_DEBUG_FLAG_1="#"
     if test "x$DEBUG_FLAG" = "x1" ; then
         COND_DEBUG_FLAG_1=""
@@ -51637,19 +39492,24 @@ EOF
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
     fi
 
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
     fi
 
     COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
+    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1=""
     fi
 
     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
     fi
 
     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
@@ -51692,19 +39552,24 @@ EOF
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
     fi
 
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
     fi
 
     COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
+    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1=""
     fi
 
     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
     fi
 
     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
@@ -51737,11 +39602,6 @@ EOF
         COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1=""
     fi
 
         COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_USE_HTML_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then
         COND_MONOLITHIC_0_USE_HTML_1=""
     COND_MONOLITHIC_0_USE_HTML_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then
         COND_MONOLITHIC_0_USE_HTML_1=""
@@ -51752,9 +39612,9 @@ EOF
         COND_MONOLITHIC_0_USE_MEDIA_1=""
     fi
 
         COND_MONOLITHIC_0_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_USE_ODBC_1=""
+    COND_MONOLITHIC_0_USE_PROPGRID_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+        COND_MONOLITHIC_0_USE_PROPGRID_1=""
     fi
 
     COND_MONOLITHIC_0_USE_QA_1="#"
     fi
 
     COND_MONOLITHIC_0_USE_QA_1="#"
@@ -51762,6 +39622,11 @@ EOF
         COND_MONOLITHIC_0_USE_QA_1=""
     fi
 
         COND_MONOLITHIC_0_USE_QA_1=""
     fi
 
+    COND_MONOLITHIC_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_USE_RIBBON_1=""
+    fi
+
     COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_USE_RICHTEXT_1=""
     COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_USE_RICHTEXT_1=""
@@ -51772,6 +39637,11 @@ EOF
         COND_MONOLITHIC_0_USE_STC_1=""
     fi
 
         COND_MONOLITHIC_0_USE_STC_1=""
     fi
 
+    COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
+        COND_MONOLITHIC_0_USE_WEBVIEW_1=""
+    fi
+
     COND_MONOLITHIC_0_USE_XRC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then
         COND_MONOLITHIC_0_USE_XRC_1=""
     COND_MONOLITHIC_0_USE_XRC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then
         COND_MONOLITHIC_0_USE_XRC_1=""
@@ -51817,39 +39687,44 @@ EOF
         COND_PLATFORM_MACOSX_1=""
     fi
 
         COND_PLATFORM_MACOSX_1=""
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_=""
+    COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
+    fi
+
+    COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
     fi
 
     COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
     fi
 
     COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
@@ -51857,6 +39732,11 @@ EOF
         COND_PLATFORM_MACOSX_1_USE_GUI_1=""
     fi
 
         COND_PLATFORM_MACOSX_1_USE_GUI_1=""
     fi
 
+    COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_USE_OPENGL_1=""
+    fi
+
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
@@ -51867,6 +39747,11 @@ EOF
         COND_PLATFORM_MACOS_1=""
     fi
 
         COND_PLATFORM_MACOS_1=""
     fi
 
+    COND_PLATFORM_MAC_0="#"
+    if test "x$PLATFORM_MAC" = "x0" ; then
+        COND_PLATFORM_MAC_0=""
+    fi
+
     COND_PLATFORM_MAC_1="#"
     if test "x$PLATFORM_MAC" = "x1" ; then
         COND_PLATFORM_MAC_1=""
     COND_PLATFORM_MAC_1="#"
     if test "x$PLATFORM_MAC" = "x1" ; then
         COND_PLATFORM_MAC_1=""
@@ -51897,14 +39782,14 @@ EOF
         COND_PLATFORM_UNIX_1=""
     fi
 
         COND_PLATFORM_UNIX_1=""
     fi
 
-    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
+    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
     fi
 
     fi
 
-    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
+    COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
     fi
 
     COND_PLATFORM_UNIX_1_USE_GUI_1="#"
     fi
 
     COND_PLATFORM_UNIX_1_USE_GUI_1="#"
@@ -51927,6 +39812,11 @@ EOF
         COND_PLATFORM_WIN32_1=""
     fi
 
         COND_PLATFORM_WIN32_1=""
     fi
 
+    COND_PLATFORM_WIN32_1_SHARED_0="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
+        COND_PLATFORM_WIN32_1_SHARED_0=""
+    fi
+
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
@@ -51952,19 +39842,19 @@ EOF
         COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
     fi
 
         COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
     fi
 
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
     fi
 
     fi
 
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin=""
     fi
 
     fi
 
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
     fi
 
     COND_SHARED_0_USE_STC_1="#"
     fi
 
     COND_SHARED_0_USE_STC_1="#"
@@ -51972,29 +39862,19 @@ EOF
         COND_SHARED_0_USE_STC_1=""
     fi
 
         COND_SHARED_0_USE_STC_1=""
     fi
 
-    COND_SHARED_0_USE_XRC_1="#"
-    if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
-        COND_SHARED_0_USE_XRC_1=""
-    fi
-
-    COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
+    COND_SHARED_0_wxUSE_EXPAT_builtin="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
     if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
+        COND_SHARED_0_wxUSE_EXPAT_builtin=""
     fi
 
     fi
 
-    COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
-    if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
-    fi
-
-    COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+    COND_SHARED_0_wxUSE_REGEX_builtin="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
     if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+        COND_SHARED_0_wxUSE_REGEX_builtin=""
     fi
 
     fi
 
-    COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+    COND_SHARED_0_wxUSE_ZLIB_builtin="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
     if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+        COND_SHARED_0_wxUSE_ZLIB_builtin=""
     fi
 
     COND_SHARED_1="#"
     fi
 
     COND_SHARED_1="#"
@@ -52007,11 +39887,6 @@ EOF
         COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
     fi
 
         COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
     fi
 
-    COND_SHARED_1_USE_XRC_1="#"
-    if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
-        COND_SHARED_1_USE_XRC_1=""
-    fi
-
     COND_TOOLKIT_="#"
     if test "x$TOOLKIT" = "x" ; then
         COND_TOOLKIT_=""
     COND_TOOLKIT_="#"
     if test "x$TOOLKIT" = "x" ; then
         COND_TOOLKIT_=""
@@ -52087,26 +39962,6 @@ EOF
         COND_TOOLKIT_MAC=""
     fi
 
         COND_TOOLKIT_MAC=""
     fi
 
-    COND_TOOLKIT_MAC_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MAC_USE_GUI_1=""
-    fi
-
-    COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
-    fi
-
-    COND_TOOLKIT_MGL="#"
-    if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKIT_MGL=""
-    fi
-
-    COND_TOOLKIT_MGL_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MGL_USE_GUI_1=""
-    fi
-
     COND_TOOLKIT_MOTIF="#"
     if test "x$TOOLKIT" = "xMOTIF" ; then
         COND_TOOLKIT_MOTIF=""
     COND_TOOLKIT_MOTIF="#"
     if test "x$TOOLKIT" = "xMOTIF" ; then
         COND_TOOLKIT_MOTIF=""
@@ -52142,6 +39997,41 @@ EOF
         COND_TOOLKIT_MSW_WXUNIV_0=""
     fi
 
         COND_TOOLKIT_MSW_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_OSX_CARBON="#"
+    if test "x$TOOLKIT" = "xOSX_CARBON" ; then
+        COND_TOOLKIT_OSX_CARBON=""
+    fi
+
+    COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_OSX_COCOA="#"
+    if test "x$TOOLKIT" = "xOSX_COCOA" ; then
+        COND_TOOLKIT_OSX_COCOA=""
+    fi
+
+    COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_OSX_IPHONE="#"
+    if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
+        COND_TOOLKIT_OSX_IPHONE=""
+    fi
+
+    COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
+    fi
+
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""
@@ -52192,6 +40082,11 @@ EOF
         COND_UNICODE_1=""
     fi
 
         COND_UNICODE_1=""
     fi
 
+    COND_USE_CAIRO_1="#"
+    if test "x$USE_CAIRO" = "x1" ; then
+        COND_USE_CAIRO_1=""
+    fi
+
     COND_USE_EXCEPTIONS_0="#"
     if test "x$USE_EXCEPTIONS" = "x0" ; then
         COND_USE_EXCEPTIONS_0=""
     COND_USE_EXCEPTIONS_0="#"
     if test "x$USE_EXCEPTIONS" = "x0" ; then
         COND_USE_EXCEPTIONS_0=""
@@ -52242,9 +40137,19 @@ EOF
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
-    COND_USE_ODBC_1="#"
-    if test "x$USE_ODBC" = "x1" ; then
-        COND_USE_ODBC_1=""
+    COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
+    fi
+
+    COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
+    fi
+
+    COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
     fi
 
     COND_USE_OPENGL_1="#"
     fi
 
     COND_USE_OPENGL_1="#"
@@ -52272,9 +40177,9 @@ EOF
         COND_USE_RTTI_1=""
     fi
 
         COND_USE_RTTI_1=""
     fi
 
-    COND_USE_SOSYMLINKS_1="#"
-    if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS_1=""
+    COND_USE_SOTWOSYMLINKS_1="#"
+    if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
+        COND_USE_SOTWOSYMLINKS_1=""
     fi
 
     COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
     fi
 
     COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
@@ -52292,6 +40197,11 @@ EOF
         COND_USE_SOVERSION_0=""
     fi
 
         COND_USE_SOVERSION_0=""
     fi
 
+    COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#"
+    if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1=""
+    fi
+
     COND_USE_SOVERSOLARIS_1="#"
     if test "x$USE_SOVERSOLARIS" = "x1" ; then
         COND_USE_SOVERSOLARIS_1=""
     COND_USE_SOVERSOLARIS_1="#"
     if test "x$USE_SOVERSOLARIS" = "x1" ; then
         COND_USE_SOVERSOLARIS_1=""
@@ -52357,11 +40267,6 @@ EOF
         COND_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
         COND_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
-    COND_WXUSE_ODBC_BUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBC_BUILTIN=""
-    fi
-
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_WXUSE_REGEX_BUILTIN=""
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_WXUSE_REGEX_BUILTIN=""
@@ -52372,33 +40277,155 @@ EOF
         COND_WXUSE_ZLIB_BUILTIN=""
     fi
 
         COND_WXUSE_ZLIB_BUILTIN=""
     fi
 
+    COND_wxUSE_EXPAT_builtin="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_wxUSE_EXPAT_builtin=""
+    fi
+
+    COND_wxUSE_LIBJPEG_builtin="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_wxUSE_LIBJPEG_builtin=""
+    fi
+
+    COND_wxUSE_LIBPNG_builtin="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_wxUSE_LIBPNG_builtin=""
+    fi
+
+    COND_wxUSE_LIBTIFF_builtin="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_wxUSE_LIBTIFF_builtin=""
+    fi
+
+    COND_wxUSE_REGEX_builtin="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_wxUSE_REGEX_builtin=""
+    fi
+
+    COND_wxUSE_ZLIB_builtin="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_wxUSE_ZLIB_builtin=""
+    fi
+
 
 
     if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
 
 
     if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
-        { { echo "$as_me:$LINENO: error: No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?" >&5
-echo "$as_me: error: No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error $? "No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?" "$LINENO" 5
     fi
 
     if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then
     fi
 
     if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then
-        { { echo "$as_me:$LINENO: error: Versions of Bakefile used to generate makefiles ($BAKEFILE_AUTOCONF_INC_M4_VERSION) and configure ($BAKEFILE_BAKEFILE_M4_VERSION) do not match." >&5
-echo "$as_me: error: Versions of Bakefile used to generate makefiles ($BAKEFILE_AUTOCONF_INC_M4_VERSION) and configure ($BAKEFILE_BAKEFILE_M4_VERSION) do not match." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error $? "Versions of Bakefile used to generate makefiles ($BAKEFILE_AUTOCONF_INC_M4_VERSION) and configure ($BAKEFILE_BAKEFILE_M4_VERSION) do not match." "$LINENO" 5
+    fi
+
+
+case ${INSTALL} in
+  /* ) # Absolute
+     ;;
+  ?:* ) # Drive letter, considered as absolute.
+     ;;
+  *)
+     INSTALL=`pwd`/${INSTALL} ;;
+esac
+
+if test "$wxUSE_GUI" = "yes"; then
+
+if test "$wxUSE_MSW" = 1 ; then
+    if test "x$WINDRES" = "x"; then
+        as_fn_error $? "Required windres program not found" "$LINENO" 5
+    fi
+
+    RESCOMP="$WINDRES"
+fi
+
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DEREZ+set}" = set; then :
+  $as_echo_n "(cached) " >&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"
+    $as_echo "$as_me:${as_lineno-$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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEREZ" >&5
+$as_echo "$DEREZ" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+    MACSETFILE="\$(SETFILE)"
+
+            if test "$wxUSE_OSX_CARBON" = 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
+
+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
-        { echo "$as_me:$LINENO: WARNING: *** Precompiled header support is broken on this compiler" >&5
-echo "$as_me: WARNING: *** Precompiled header support is broken on this compiler" >&2;}
-        { echo "$as_me:$LINENO: WARNING: *** --enable-precomp-headers is not recommended" >&5
-echo "$as_me: WARNING: *** --enable-precomp-headers is not recommended" >&2;}
-        { echo "$as_me:$LINENO: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&5
-echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Precompiled header support is broken on this compiler" >&5
+$as_echo "$as_me: WARNING: *** Precompiled header support is broken on this compiler" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** --enable-precomp-headers is not recommended" >&5
+$as_echo "$as_me: WARNING: *** --enable-precomp-headers is not recommended" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&5
+$as_echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;}
     fi
 
     fi
 
-    CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
+    # Our WX_PRECOMP flag does not make sense for any language except C++ because
+    # the headers that benefit from precompilation are mostly C++ headers.
+    CXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
+    # When Bakefile can do multi-language PCH (e.g. C++ and Objective-C++) enable this:
+    #OBJCXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
 fi
 
 
 fi
 
 
@@ -52411,10 +40438,6 @@ if test "$wxUSE_MAC" = 1 ; then
 fi
 
 if test "$wxUSE_SHARED" = "yes"; then
 fi
 
 if test "$wxUSE_SHARED" = "yes"; then
-
-                            sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
-    EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
-
                 case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx )
         SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
                 case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx )
         SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
@@ -52423,10 +40446,6 @@ if test "$wxUSE_SHARED" = "yes"; then
         cp -p ${srcdir}/src/os2/dllar.sh .
       ;;
     esac
         cp -p ${srcdir}/src/os2/dllar.sh .
       ;;
     esac
-else
-
-        EXE_LINKER="$CXX -o"
-
 fi
 if test "$wxUSE_OMF" = "yes"; then
     case "${host}" in
 fi
 if test "$wxUSE_OMF" = "yes"; then
     case "${host}" in
@@ -52443,24 +40462,26 @@ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
 
 case "${host}" in
     *-*-solaris2* )
 
 case "${host}" in
     *-*-solaris2* )
-                        if "$GCC" = yes; then
-            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'`
-            LIBS=`echo $LIBS | sed 's/-mt//'`
-            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'`
+                        if test "$GCC" = yes; then
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'`
+            LIBS=`echo $LIBS | sed 's/-mt//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'`
         fi
         ;;
 
     *-*-linux* )
                         if test "x$SUNCXX" = xyes; then
         fi
         ;;
 
     *-*-linux* )
                         if test "x$SUNCXX" = xyes; then
-            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'`
-            LIBS=`echo $LIBS | sed 's/-pthread//'`
-            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'`
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'`
+            LIBS=`echo $LIBS | sed 's/-pthread//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'`
         fi
         ;;
 esac
 
 CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
 CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
         fi
         ;;
 esac
 
 CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
 CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY"
+OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY"
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
 
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
 
@@ -52523,19 +40544,19 @@ 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 $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
        @echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# 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;;
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -52545,12 +40566,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -52560,9 +40581,7 @@ ac_config_headers="$ac_config_headers lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/se
 
 
 if test "$USE_WIN32" = 1; then
 
 
 if test "$USE_WIN32" = 1; then
-    ac_config_commands="$ac_config_commands
-            rcdefs.h
-        "
+    ac_config_commands="$ac_config_commands rcdefs.h"
 
 fi
 
 
 fi
 
@@ -52572,6 +40591,9 @@ ac_config_files="$ac_config_files lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.
 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"
 
 
+ac_config_files="$ac_config_files utils/ifacecheck/rungccxml.sh"
+
+
 if test "$wx_cv_version_script" = "yes"; then
     ac_config_files="$ac_config_files version-script"
 
 if test "$wx_cv_version_script" = "yes"; then
     ac_config_files="$ac_config_files version-script"
 
@@ -52586,13 +40608,14 @@ ac_config_commands="$ac_config_commands wx-config"
 if test "$wxWITH_SUBDIRS" != "no"; then
 if test "$wxUSE_GUI" = "yes"; then
     SUBDIRS="samples demos utils"
 if test "$wxWITH_SUBDIRS" != "no"; then
 if test "$wxUSE_GUI" = "yes"; then
     SUBDIRS="samples demos utils"
-else         SUBDIRS="samples utils"
+else
+            SUBDIRS="samples utils"
 fi
 
 
 
 # Check whether --with-cppunit-prefix was given.
 fi
 
 
 
 # Check whether --with-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"
 else
   cppunit_config_prefix=""
   withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
 else
   cppunit_config_prefix=""
@@ -52600,7 +40623,7 @@ fi
 
 
 # Check whether --with-cppunit-exec-prefix was given.
 
 
 # Check whether --with-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"
 else
   cppunit_config_exec_prefix=""
   withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
 else
   cppunit_config_exec_prefix=""
@@ -52622,10 +40645,10 @@ 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; }
-if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $CPPUNIT_CONFIG in
   [\\/]* | ?:[\\/]*)
 else
   case $CPPUNIT_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -52637,14 +40660,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    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_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
@@ -52653,22 +40676,22 @@ esac
 fi
 CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
 if test -n "$CPPUNIT_CONFIG"; then
 fi
 CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
 if test -n "$CPPUNIT_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5
-echo "${ECHO_T}$CPPUNIT_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
+$as_echo "$CPPUNIT_CONFIG" >&6; }
 else
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   cppunit_version_min=1.8.0
 
 fi
 
 
   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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5
+$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&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; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     no_cppunit=yes
   else
     CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
     no_cppunit=yes
   else
     CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
@@ -52698,11 +40721,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; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
+$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
     else
     else
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       no_cppunit=yes
     fi
   fi
       no_cppunit=yes
     fi
   fi
@@ -52719,34 +40742,40 @@ echo "${ECHO_T}no" >&6; }
 
 
 
 
 
 
-for subdir in `echo $SUBDIRS`; do
+for subdir in $SUBDIRS; do
     if test -d ${srcdir}/${subdir} ; then
         if test "$wxUSE_GUI" = "yes"; then
             if test ${subdir} = "samples"; then
                                                 makefiles="samples/Makefile.in $makefiles"
     if test -d ${srcdir}/${subdir} ; then
         if test "$wxUSE_GUI" = "yes"; then
             if test ${subdir} = "samples"; then
                                                 makefiles="samples/Makefile.in $makefiles"
-                for sample in `echo $SAMPLES_SUBDIRS`; do
+                for sample in $SAMPLES_SUBDIRS; do
                     if test -d $srcdir/samples/$sample; then
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done
             else
                     if test -d $srcdir/samples/$sample; then
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done
             else
-                                                                disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`;
+                                                                disabled_var=DISABLED_`echo $subdir | tr '[a-z]' '[A-Z]'`
                 eval "disabled=\$$disabled_var"
                 disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
             fi
                 eval "disabled=\$$disabled_var"
                 disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
             fi
-        else                                     if test ${subdir} = "samples"; then
-                makefiles="samples/Makefile.in samples/console/Makefile.in"
+        else
+                                    if test ${subdir} = "samples"; then
+                                                makefiles="samples/Makefile.in $makefiles"
+                for sample in `echo $SAMPLES_SUBDIRS`; do
+                    if test -d $srcdir/samples/$sample; then
+                        makefiles="samples/$sample/Makefile.in $makefiles"
+                    fi
+                done
             elif test ${subdir} = "utils"; then
                 makefiles=""
             elif test ${subdir} = "utils"; then
                 makefiles=""
-                for util in HelpGen tex2rtf ; do
+                for util in ifacecheck ; do
                     if test -d $srcdir/utils/$util ; then
                     if test -d $srcdir/utils/$util ; then
-                        makefiles="utils/$util/Makefile.in \
-                                   utils/$util/src/Makefile.in \
+                        makefiles="utils/$util/src/Makefile.in \
                                    $makefiles"
                     fi
                 done
                                    $makefiles"
                     fi
                 done
-            else                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+            else
+                                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
             fi
         fi
 
             fi
         fi
 
@@ -52785,12 +40814,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
     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;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
       esac ;;
     esac
   done
@@ -52798,8 +40828,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `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"
       sed -n \
        "s/'/'\\\\''/g;
          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -52822,12 +40852,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
 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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     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;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
   fi
 fi
 rm -f confcache
@@ -52840,14 +40870,15 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
 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"`
+  ac_i=`$as_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.
   # 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'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 done
 LIBOBJS=$ac_libobjs
 
@@ -52856,11 +40887,13 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -52870,59 +40903,79 @@ cat >$CONFIG_STATUS <<_ACEOF
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
   # 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 ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
 esac
-
 fi
 
 
 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=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+       expr "X$arg" : "X\\(.*\\)$as_nl";
+       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
 fi
 
 
@@ -52931,20 +40984,18 @@ fi
 # 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.)
 # 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.
 IFS=" ""       $as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+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=.
   *[\\/]* ) 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
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
 IFS=$as_save_IFS
 
      ;;
@@ -52955,32 +41006,111 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; 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; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
 fi
 
-# 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
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  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
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
   fi
-done
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
 
 
-# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -52994,13 +41124,17 @@ else
   as_basename=false
 fi
 
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
         X"$0" : 'X\(//\)$' \| \
         X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
         X"$0" : 'X\(//\)$' \| \
         X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
            s//\1/
            q
     sed '/^.*\/\([^/][^/]*\)\/*$/{
            s//\1/
            q
@@ -53015,104 +41149,103 @@ echo X/"$0" |
          }
          s/.*/./; q'`
 
          }
          s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  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" || {
-
-  # 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.
-  # (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 |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$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
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # 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
+# 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
 
 ECHO_C= ECHO_N= ECHO_T=
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
   *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='        ';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  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
 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
-  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 ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  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 ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 else
   as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_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
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -53129,12 +41262,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+       test -d "$1/.";
       else
       else
-       case $1 in
-        -*)set "./$1";;
+       case $1 in #(
+       -*)set "./$1";;
        esac;
        esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
        ???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
        ???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -53149,13 +41282,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by wxWidgets $as_me 2.9.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+This file was extended by wxWidgets $as_me 2.9.4, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -53168,7 +41307,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -53176,22 +41324,25 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-                  instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-                  instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
 
 Configuration files:
 $config_files
@@ -53202,36 +41353,42 @@ $config_headers
 Configuration commands:
 $config_commands
 
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <wx-dev@lists.wxwidgets.org>."
 
 _ACEOF
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 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'`\\"
+wxWidgets config.status 2.9.4
+configured by $0, generated by GNU Autoconf 2.67,
+  with options \\"\$ac_cs_config\\"
 
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 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'
 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'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
   *)
     ac_option=$1
     ac_optarg=$2
@@ -53244,34 +41401,41 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
     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; }; };;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_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
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
      ac_need_defaults=false ;;
 
   esac
@@ -53286,27 +41450,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
 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
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
 #
 # INIT-COMMANDS
 #
@@ -53324,7 +41490,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 
 _ACEOF
 
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -53334,14 +41500,13 @@ do
     "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" ;;
     "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" ;;
+    "utils/ifacecheck/rungccxml.sh") CONFIG_FILES="$CONFIG_FILES utils/ifacecheck/rungccxml.sh" ;;
     "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" ;;
 
     "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" ;;
 
-  *) { { 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; }; };;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
   esac
 done
 
@@ -53368,7 +41533,7 @@ $debug ||
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -53379,665 +41544,285 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 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
-RANLIB!$RANLIB$ac_delim
-AR!$AR$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-STRIP!$STRIP$ac_delim
-WINDRES!$WINDRES$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
-LN_S!$LN_S$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
-_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`
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
 fi
 fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.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
-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
-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
-SET_MAKE!$SET_MAKE$ac_delim
-MAKE_SET!$MAKE_SET$ac_delim
-AROPTIONS!$AROPTIONS$ac_delim
-NM!$NM$ac_delim
-INSTALL_DIR!$INSTALL_DIR$ac_delim
-LDFLAGS_GUI!$LDFLAGS_GUI$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
-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
-_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`
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
 fi
 
-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
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
-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
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
     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; }; }
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = "\a"
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
 
-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
+  print line
+}
 
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACAWK
 _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
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 _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!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
-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
-_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`
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[         ]*VPATH[        ]*=[    ]*/{
+h
+s///
+s/^/:/
+s/[     ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[  ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[      ]*$//
+}'
 fi
 
 fi
 
-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
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
 _ACEOF
 
 _ACEOF
 
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
 
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
 ac_delim='%!_!# '
 ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
-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
-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
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; 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; }; }
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
 
   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
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
 
 
-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
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[    ]*#[    ]*define[       ][      ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = "\a"
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #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.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
 _ACEOF
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
 
 
 
 
-# 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
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
 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; }; };;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -54065,26 +41850,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
           [\\/$]*) false;;
           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
           esac ||
           [\\/$]*) 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; }; };;
+          as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append 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.  */
     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."
+    configure_input='Generated from '`
+         $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+       `' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
     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
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
     esac
     ;;
   esac
@@ -54094,7 +41887,7 @@ $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\(//\)[^/]' \| \
         X"$ac_file" : 'X\(//\)$' \| \
         X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
            s//\1/
            q
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
            s//\1/
            q
@@ -54112,55 +41905,15 @@ echo X"$ac_file" |
            q
          }
          s/.*/./; q'`
            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"; } || {
-    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" ||
-$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'`
-      test -d "$as_dir" && break
-    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;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_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/ ;;
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -54200,12 +41953,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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=
 # 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/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
   p
   q
 }
@@ -54213,36 +41966,37 @@ case `sed -n '/datarootdir/ {
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
 *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;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
   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' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
 esac
 _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
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;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&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -54252,123 +42006,52 @@ 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
 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
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_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;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
  ;;
   :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'
-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
-# 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 :
-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
-  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
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   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
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
   fi
-  rm -f "$tmp/out12"
  ;;
 
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
  ;;
   esac
 
@@ -54380,6 +42063,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
          ;;
     "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}  ;;
          ;;
     "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}  ;;
+    "utils/ifacecheck/rungccxml.sh":F)  chmod +x utils/ifacecheck/rungccxml.sh  ;;
     "wx-config":C)  rm -f wx-config
                      ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
                     ;;
     "wx-config":C)  rm -f wx-config
                      ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
                     ;;
@@ -54388,11 +42072,13 @@ echo "$as_me: executing $ac_file commands" >&6;}
 done # for ac_tag
 
 
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -54412,7 +42098,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
 fi
 
 #
 fi
 
 #
@@ -54420,7 +42106,8 @@ fi
 #
 if test "$no_recursion" != yes; then
 
 #
 if test "$no_recursion" != yes; then
 
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
+  # so they do not pile up.
   ac_sub_configure_args=
   ac_prev=
   eval "set x $ac_configure_args"
   ac_sub_configure_args=
   ac_prev=
   eval "set x $ac_configure_args"
@@ -54449,11 +42136,13 @@ 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=*)
       ;;
+    --disable-option-checking)
+      ;;
     *)
       case $ac_arg in
     *)
       case $ac_arg in
-      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
       esac
       esac
-      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
+      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
     esac
   done
 
     esac
   done
 
@@ -54461,7 +42150,7 @@ if test "$no_recursion" != yes; then
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
   # in subdir configurations.
   ac_arg="--prefix=$prefix"
   case $ac_arg in
-  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
   esac
   ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 
@@ -54470,6 +42159,10 @@ if test "$no_recursion" != yes; then
     ac_sub_configure_args="--silent $ac_sub_configure_args"
   fi
 
     ac_sub_configure_args="--silent $ac_sub_configure_args"
   fi
 
+  # Always prepend --disable-option-checking to silence warnings, since
+  # different subdirs can have different --enable and --with options.
+  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
+
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
   ac_popdir=`pwd`
   for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
 
@@ -54478,57 +42171,17 @@ if test "$no_recursion" != yes; then
     test -d "$srcdir/$ac_dir" || continue
 
     ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
     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"; } || {
-    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" ||
-$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'`
-      test -d "$as_dir" && break
-    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;}
-   { (exit 1); exit 1; }; }; }
+    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
+    $as_echo "$ac_msg" >&6
+    as_dir="$ac_dir"; as_fn_mkdir_p
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_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/ ;;
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -54567,8 +42220,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       # This should be Cygnus configure.
       ac_sub_configure=$ac_aux_dir/configure
     else
       # This should be Cygnus configure.
       ac_sub_configure=$ac_aux_dir/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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
+$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
       ac_sub_configure=
     fi
 
       ac_sub_configure=
     fi
 
@@ -54581,19 +42234,21 @@ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
        ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       esac
 
        ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
       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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
           --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
       # The eval makes quoting arguments work.
       eval "\$SHELL \"\$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; }; }
+       as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
     fi
 
     cd "$ac_popdir"
   done
 fi
     fi
 
     cd "$ac_popdir"
   done
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 echo
 
 
 echo
@@ -54601,10 +42256,8 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
 echo ""
 echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
 echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
 echo ""
 echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
 echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
-
-echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo -n "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}"
+echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
 if test "$wxUSE_UNICODE" = "yes"; then
     if test "$wxUSE_UNICODE_UTF8" = "yes"; then
         echo " (using UTF-8)"
 if test "$wxUSE_UNICODE" = "yes"; then
     if test "$wxUSE_UNICODE_UTF8" = "yes"; then
         echo " (using UTF-8)"
@@ -54620,6 +42273,7 @@ echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIB
 echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
 echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
+echo "                                       STL                ${wxUSE_STL}"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"
 echo "                                       regex              ${wxUSE_REGEX}"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"
 echo "                                       regex              ${wxUSE_REGEX}"
@@ -54628,7 +42282,6 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
 echo "                                       xpm                ${wxUSE_LIBXPM-none}"
 fi
 echo "                                       zlib               ${wxUSE_ZLIB}"
 echo "                                       xpm                ${wxUSE_LIBXPM-none}"
 fi
 echo "                                       zlib               ${wxUSE_ZLIB}"
-echo "                                       odbc               ${wxUSE_ODBC}"
 echo "                                       expat              ${wxUSE_EXPAT}"
 echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
 echo "                                       sdl                ${wxUSE_LIBSDL}"
 echo "                                       expat              ${wxUSE_EXPAT}"
 echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
 echo "                                       sdl                ${wxUSE_LIBSDL}"
wxWidgets (Impactor)