Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode

[wxWidgets.git] / configure

diff --git a/configure b/configure
index f58cea2c075ba7ac6d47a063b526d8827ad1b1f9..aa797a763a76cde67a96914a1e6a5783ec6512fa 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,522 +1,328 @@
 #! /bin/sh
 #! /bin/sh

-
-# From configure.in Id: configure.in
-
-
-# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# From configure.in Id: configure.in.
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.57 for wxWindows 2.5.0.
+#
+# Report bugs to <wx-dev@lists.wxwindows.org>.
+#
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002

 # Free Software Foundation, Inc.
 # Free Software Foundation, Inc.

-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-
-
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##

 
 

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

 
 

+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi

 
 
 
 

+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+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 -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done

 
 

+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; 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'`

 
 
 
 

+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits

 
 

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

 
 
 
 

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

 
 

+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+        case $as_dir in
+        /*)
+          if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+            $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+            $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+            CONFIG_SHELL=$as_dir/$as_base
+            export CONFIG_SHELL
+            exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+          fi;;
+        esac
+       done
+done
+;;
+  esac

 
 

+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\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 sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}

 
 
 
 

+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='     ' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac

 
 

+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi

 
 

+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file

 
 

+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  as_mkdir_p=false
+fi

 
 

+as_executable_p="test -f"

 
 

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

 
 

+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"

 
 
 
 

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

 
 

+# CDPATH.
+$as_unset CDPATH

 
 
 
 

+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`

 
 

+exec 6>&1

 
 

-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.

 #
 #

-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
+# Initializations.
+#

 ac_default_prefix=/usr/local
 ac_default_prefix=/usr/local

-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-gui            use GUI classes"
-ac_help="$ac_help
-  --enable-universal      use wxWindows GUI controls instead of native ones"
-ac_help="$ac_help
-  --with-gtk              use GTK+"
-ac_help="$ac_help
-  --with-motif            use Motif/Lesstif"
-ac_help="$ac_help
-  --with-mac              use Mac OS X"
-ac_help="$ac_help
-  --with-cocoa            use Cocoa"
-ac_help="$ac_help
-  --with-wine             use Wine"
-ac_help="$ac_help
-  --with-msw              use MS-Windows"
-ac_help="$ac_help
-  --with-pm               use OS/2 Presentation Manager"
-ac_help="$ac_help
-  --with-mgl              use SciTech MGL"
-ac_help="$ac_help
-  --with-microwin         use MicroWindows"
-ac_help="$ac_help
-  --with-x11              use X11"
-ac_help="$ac_help
-  --enable-nanox          use NanoX"
-ac_help="$ac_help
-  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)"
-ac_help="$ac_help
-  --with-libpng           use libpng (PNG image format)"
-ac_help="$ac_help
-  --with-libjpeg          use libjpeg (JPEG file format)"
-ac_help="$ac_help
-  --with-libtiff          use libtiff (TIFF file format)"
-ac_help="$ac_help
-  --with-opengl           use OpenGL (or Mesa)"
-ac_help="$ac_help
-  --with-dmalloc          use dmalloc library (http://dmalloc.com/)"
-ac_help="$ac_help
-  --with-regex            enable support for wxRegEx class"
-ac_help="$ac_help
-  --with-zlib             use zlib for LZW compression"
-ac_help="$ac_help
-  --with-odbc             use the IODBC and wxODBC classes"
-ac_help="$ac_help
-  --enable-shared         create shared library code"
-ac_help="$ac_help
-  --enable-soname         set the DT_SONAME field in ELF shared libraries"
-ac_help="$ac_help
-  --enable-optimise       create optimised code"
-ac_help="$ac_help
-  --enable-debug          same as debug_flag and debug_info"
-ac_help="$ac_help
-  --enable-precomp        enable use of precompiled headers (Mac OS X/Darwin)"
-ac_help="$ac_help
-  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
-ac_help="$ac_help
-  --enable-debug_info     create code with debugging information"
-ac_help="$ac_help
-  --enable-debug_gdb      create code with extra GDB debugging information"
-ac_help="$ac_help
-  --enable-debug_cntxt    use wxDebugContext"
-ac_help="$ac_help
-  --enable-mem_tracing    create code with memory tracing"
-ac_help="$ac_help
-  --enable-profile        create code with profiling information"
-ac_help="$ac_help
-  --enable-no_rtti        create code without RTTI information"
-ac_help="$ac_help
-  --enable-no_exceptions  create code without C++ exceptions handling"
-ac_help="$ac_help
-  --enable-permissive     compile code disregarding strict ANSI"
-ac_help="$ac_help
-  --enable-no_deps        create code without dependency information"
-ac_help="$ac_help
-  --enable-compat20       enable wxWindows 2.0 compatibility"
-ac_help="$ac_help
-  --enable-compat22       enable wxWindows 2.2 compatibility"
-ac_help="$ac_help
-  --disable-compat24      disable wxWindows 2.4 compatibility"
-ac_help="$ac_help
-  --enable-rpath=DIR      output the rpath flag from wx-config"
-ac_help="$ac_help
-  --enable-intl           use internationalization system"
-ac_help="$ac_help
-  --enable-config         use wxConfig (and derived) classes"
-ac_help="$ac_help
-  --enable-protocols      use wxProtocol and derived classes"
-ac_help="$ac_help
-  --enable-ftp            use wxFTP (requires wxProtocol"
-ac_help="$ac_help
-  --enable-http           use wxHTTP (requires wxProtocol"
-ac_help="$ac_help
-  --enable-fileproto      use wxFileProto class (requires wxProtocol"
-ac_help="$ac_help
-  --enable-sockets        use socket/network classes"
-ac_help="$ac_help
-  --enable-ole            use OLE classes"
-ac_help="$ac_help
-  --enable-dataobj        use data object classes"
-ac_help="$ac_help
-  --enable-ipc            use interprocess communication (wxSocket etc.)"
-ac_help="$ac_help
-  --enable-cmdline        use wxCmdLineParser class"
-ac_help="$ac_help
-  --enable-datetime       use wxDateTime class"
-ac_help="$ac_help
-  --enable-stopwatch      use wxStopWatch class"
-ac_help="$ac_help
-  --enable-dialupman      use dialup network classes"
-ac_help="$ac_help
-  --enable-apple_ieee     use the Apple IEEE codec"
-ac_help="$ac_help
-  --enable-timer          use wxTimer class"
-ac_help="$ac_help
-  --enable-wave           use wxWave class"
-ac_help="$ac_help
-  --enable-fraction       use wxFraction class"
-ac_help="$ac_help
-  --enable-dynlib         use wxLibrary class for DLL loading"
-ac_help="$ac_help
-  --enable-dynamicloader  use (new) wxDynamicLibrary class"
-ac_help="$ac_help
-  --enable-longlong       use wxLongLong class"
-ac_help="$ac_help
-  --enable-geometry       use geometry class"
-ac_help="$ac_help
-  --enable-log            use logging system"
-ac_help="$ac_help
-  --enable-streams        use wxStream etc classes"
-ac_help="$ac_help
-  --enable-file           use wxFile classes"
-ac_help="$ac_help
-  --enable-ffile          use wxFFile classes"
-ac_help="$ac_help
-  --enable-textbuf        use wxTextBuffer class"
-ac_help="$ac_help
-  --enable-textfile       use wxTextFile class"
-ac_help="$ac_help
-  --enable-fontmap        use font encodings conversion classes"
-ac_help="$ac_help
-  --enable-unicode        compile wxString with Unicode support"
-ac_help="$ac_help
-  --enable-mslu           use MS Layer for Unicode on Windows 9x (win32 only)"
-ac_help="$ac_help
-  --enable-wxprintfv      use wxWindows implementation of vprintf()"
-ac_help="$ac_help
-  --enable-std_iostreams  use standard C++ stream classes"
-ac_help="$ac_help
-  --enable-filesystem     use virtual file systems classes"
-ac_help="$ac_help
-  --enable-fs_inet        use virtual HTTP/FTP filesystems"
-ac_help="$ac_help
-  --enable-fs_zip         use virtual ZIP filesystems"
-ac_help="$ac_help
-  --enable-zipstream      use wxZipInputStream"
-ac_help="$ac_help
-  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"
-ac_help="$ac_help
-  --enable-snglinst       use wxSingleInstanceChecker class"
-ac_help="$ac_help
-  --enable-mimetype       use wxMimeTypesManager"
-ac_help="$ac_help
-  --enable-sysoptions     use wxSystemOptions"
-ac_help="$ac_help
-  --enable-url            use wxURL class"
-ac_help="$ac_help
-  --enable-protocol       use wxProtocol class"
-ac_help="$ac_help
-  --enable-protocol-http  HTTP support in wxProtocol"
-ac_help="$ac_help
-  --enable-protocol-ftp   FTP support in wxProtocol"
-ac_help="$ac_help
-  --enable-protocol-file  FILE support in wxProtocol"
-ac_help="$ac_help
-  --enable-threads        use threads"
-ac_help="$ac_help
-  --enable-docview        use document view architecture"
-ac_help="$ac_help
-  --enable-help           use help subsystem"
-ac_help="$ac_help
-  --enable-mshtmlhelp     use MS HTML Help (win32)"
-ac_help="$ac_help
-  --enable-html           use wxHTML sub-library"
-ac_help="$ac_help
-  --enable-htmlhelp       use wxHTML-based help"
-ac_help="$ac_help
-  --enable-constraints    use layout-constraints system"
-ac_help="$ac_help
-  --enable-printarch      use printing architecture"
-ac_help="$ac_help
-  --enable-mdi            use multiple document interface architecture"
-ac_help="$ac_help
-  --enable-loggui         use standard GUI logger"
-ac_help="$ac_help
-  --enable-logwin         use wxLogWindow"
-ac_help="$ac_help
-  --enable-logdialog      use wxLogDialog"
-ac_help="$ac_help
-  --enable-postscript     use wxPostscriptDC device context (default for gtk+)"
-ac_help="$ac_help
-  --enable-prologio       not available; see contrib"
-ac_help="$ac_help
-  --enable-resources      not available; see contrib"
-ac_help="$ac_help
-  --enable-clipboard      use wxClipboard class"
-ac_help="$ac_help
-  --enable-dnd            use Drag'n'Drop classes"
-ac_help="$ac_help
-  --enable-metafile       use win32 metafiles"
-ac_help="$ac_help
-  --enable-controls       use all usual controls"
-ac_help="$ac_help
-  --enable-accel          use accelerators"
-ac_help="$ac_help
-  --enable-button         use wxButton class"
-ac_help="$ac_help
-  --enable-bmpbutton      use wxBitmapButton class"
-ac_help="$ac_help
-  --enable-calendar       use wxCalendarCtrl class"
-ac_help="$ac_help
-  --enable-caret          use wxCaret class"
-ac_help="$ac_help
-  --enable-checkbox       use wxCheckBox class"
-ac_help="$ac_help
-  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
-ac_help="$ac_help
-  --enable-choice         use wxChoice class"
-ac_help="$ac_help
-  --enable-combobox       use wxComboBox class"
-ac_help="$ac_help
-  --enable-display        use wxDisplay class"
-ac_help="$ac_help
-  --enable-gauge          use wxGauge class"
-ac_help="$ac_help
-  --enable-grid           use wxGrid class"
-ac_help="$ac_help
-  --enable-imaglist       use wxImageList class"
-ac_help="$ac_help
-  --enable-listbox        use wxListBox class"
-ac_help="$ac_help
-  --enable-listctrl       use wxListCtrl class"
-ac_help="$ac_help
-  --enable-notebook       use wxNotebook class"
-ac_help="$ac_help
-  --enable-radiobox       use wxRadioBox class"
-ac_help="$ac_help
-  --enable-radiobtn       use wxRadioButton class"
-ac_help="$ac_help
-  --enable-sash           use wxSashWindow class"
-ac_help="$ac_help
-  --enable-scrollbar      use wxScrollBar class and scrollable windows"
-ac_help="$ac_help
-  --enable-slider         use wxSlider class"
-ac_help="$ac_help
-  --enable-spinbtn        use wxSpinButton class"
-ac_help="$ac_help
-  --enable-spinctrl       use wxSpinCtrl class"
-ac_help="$ac_help
-  --enable-splitter       use wxSplitterWindow class"
-ac_help="$ac_help
-  --enable-statbmp        use wxStaticBitmap class"
-ac_help="$ac_help
-  --enable-statbox        use wxStaticBox class"
-ac_help="$ac_help
-  --enable-statline       use wxStaticLine class"
-ac_help="$ac_help
-  --enable-stattext       use wxStaticText class"
-ac_help="$ac_help
-  --enable-statusbar      use wxStatusBar class"
-ac_help="$ac_help
-  --enable-tabdialog      use wxTabControl class"
-ac_help="$ac_help
-  --enable-textctrl       use wxTextCtrl class"
-ac_help="$ac_help
-  --enable-togglebtn      use wxToggleButton class"
-ac_help="$ac_help
-  --enable-toolbar        use wxToolBar class"
-ac_help="$ac_help
-  --enable-tbarnative     use native wxToolBar class"
-ac_help="$ac_help
-  --enable-tbarsmpl       use wxToolBarSimple class"
-ac_help="$ac_help
-  --enable-treectrl       use wxTreeCtrl class"
-ac_help="$ac_help
-  --enable-tipwindow      use wxTipWindow class"
-ac_help="$ac_help
-  --enable-popupwin       use wxPopUpWindow class"
-ac_help="$ac_help
-  --enable-commondlg      use all common dialogs"
-ac_help="$ac_help
-  --enable-choicedlg      use wxChoiceDialog"
-ac_help="$ac_help
-  --enable-coldlg         use wxColourDialog"
-ac_help="$ac_help
-  --enable-filedlg        use wxFileDialog"
-ac_help="$ac_help
-  --enable-finddlg        use wxFindReplaceDialog"
-ac_help="$ac_help
-  --enable-fontdlg        use wxFontDialog"
-ac_help="$ac_help
-  --enable-dirdlg         use wxDirDialog"
-ac_help="$ac_help
-  --enable-msgdlg         use wxMessageDialog"
-ac_help="$ac_help
-  --enable-numberdlg      use wxNumberEntryDialog"
-ac_help="$ac_help
-  --enable-splash         use wxSplashScreen"
-ac_help="$ac_help
-  --enable-textdlg        use wxTextDialog"
-ac_help="$ac_help
-  --enable-tipdlg         use startup tips"
-ac_help="$ac_help
-  --enable-progressdlg    use wxProgressDialog"
-ac_help="$ac_help
-  --enable-wizarddlg      use wxWizard"
-ac_help="$ac_help
-  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes"
-ac_help="$ac_help
-  --enable-miniframe      use wxMiniFrame class"
-ac_help="$ac_help
-  --enable-tooltips       use wxToolTip class"
-ac_help="$ac_help
-  --enable-splines        use spline drawing code"
-ac_help="$ac_help
-  --enable-validators     use wxValidator and derived classes"
-ac_help="$ac_help
-  --enable-busyinfo       use wxBusyInfo"
-ac_help="$ac_help
-  --enable-joystick       use wxJoystick (Linux only)"
-ac_help="$ac_help
-  --enable-metafiles      use wxMetaFile (Windows only)"
-ac_help="$ac_help
-  --enable-dragimage      use wxDragImage"
-ac_help="$ac_help
-  --enable-accessibility  enable accessibility support"
-ac_help="$ac_help
-  --enable-palette        use wxPalette class"
-ac_help="$ac_help
-  --enable-image          use wxImage class"
-ac_help="$ac_help
-  --enable-gif            use gif images (GIF file format)"
-ac_help="$ac_help
-  --enable-pcx            use pcx images (PCX file format)"
-ac_help="$ac_help
-  --enable-iff            use iff images (IFF file format)"
-ac_help="$ac_help
-  --enable-pnm            use pnm images (PNM file format)"
-ac_help="$ac_help
-  --enable-xpm            use xpm images (XPM file format)"
-ac_help="$ac_help
-  --enable-icocur         use Windows ICO and CUR formats"
-ac_help="$ac_help
-  --disable-largefile     omit support for large files"
-ac_help="$ac_help
-  --disable-gtktest       do not try to compile and run a test GTK+ program"
-ac_help="$ac_help
-  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
-ac_help="$ac_help
-  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
-ac_help="$ac_help
-  --disable-gtktest       Do not try to compile and run a test GTK program"
-ac_help="$ac_help
-  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
-ac_help="$ac_help
-  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
-ac_help="$ac_help
-  --disable-gtktest       Do not try to compile and run a test GTK program"
-ac_help="$ac_help
-  --with-x                use the X Window System"
-ac_help="$ac_help
-  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib"
+ac_config_libobj_dir=.
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME='wxWindows'
+PACKAGE_TARNAME='wxwindows'
+PACKAGE_VERSION='2.5.0'
+PACKAGE_STRING='wxWindows 2.5.0'
+PACKAGE_BUGREPORT='wx-dev@lists.wxwindows.org'
+
+ac_unique_file="wx-config.in"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subdirs_all="$ac_subdirs_all src/expat"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_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_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_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_MGL_USE_GUI_1_WXUNIV_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_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_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_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 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_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS'
+ac_subst_files=''

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

+ac_init_help=
+ac_init_version=false

 # The variables have the same names as the options, with
 # dashes changed to underlines.
 # The variables have the same names as the options, with
 # dashes changed to underlines.

-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null

 exec_prefix=NONE
 exec_prefix=NONE

-host=NONE

 no_create=
 no_create=

-nonopt=NONE

 no_recursion=
 prefix=NONE
 program_prefix=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE


@@ -525,10 +331,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
 silent=
 site=
 srcdir=

-target=NONE

 verbose=
 x_includes=NONE
 x_libraries=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE

+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.

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


@@ -542,17 +353,9 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 

-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-

 ac_prev=
 for ac_option
 do
 ac_prev=
 for ac_option
 do

-

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


@@ -560,59 +363,59 @@ do
     continue
   fi
 
     continue
   fi
 

-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`

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

-  case "$ac_option" in
+  case $ac_option in

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

-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;

 
   -build | --build | --buil | --bui | --bu)
 
   -build | --build | --buil | --bui | --bu)

-    ac_prev=build ;;
+    ac_prev=build_alias ;;

   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)

-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;

 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)

-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;

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

-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;

 
   -disable-* | --disable-*)
 
   -disable-* | --disable-*)

-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`

     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.

-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    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" ;;

 
   -enable-* | --enable-*)
 
   -enable-* | --enable-*)

-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`

     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.

-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
+    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'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;

       *) ac_optarg=yes ;;
     esac
       *) ac_optarg=yes ;;
     esac

-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;

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


@@ -621,95 +424,47 @@ do
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)

-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;

 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 

-  -help | --help | --hel | --he)
-    # 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 << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;

 
   -host | --host | --hos | --ho)
 
   -host | --host | --hos | --ho)

-    ac_prev=host ;;
+    ac_prev=host_alias ;;

   -host=* | --host=* | --hos=* | --ho=*)
   -host=* | --host=* | --hos=* | --ho=*)

-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;

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

-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;

 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)

-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;

 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)

-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;

 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)

-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;

 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst \


@@ -718,19 +473,19 @@ EOF
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)

-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;

 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)

-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;

 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=no ;;
 
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=no ;;
 
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \

-  | --no-cr | --no-c)
+  | --no-cr | --no-c | -n)

     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \


@@ -744,26 +499,26 @@ EOF
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)

-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;

 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)

-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;

 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)

-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;

 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)

-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;

 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \


@@ -780,7 +535,7 @@ EOF
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)

-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;

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


@@ -790,7 +545,7 @@ EOF
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)

-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;

 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \


@@ -801,58 +556,57 @@ EOF
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)

-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;

 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)

-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;

 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)

-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;

 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)

-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;

 
   -target | --target | --targe | --targ | --tar | --ta | --t)
 
   -target | --target | --targe | --targ | --tar | --ta | --t)

-    ac_prev=target ;;
+    ac_prev=target_alias ;;

   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)

-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;

 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 

-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;

 
   -with-* | --with-*)
 
   -with-* | --with-*)

-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`

     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.

-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
+    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'`
     ac_package=`echo $ac_package| sed 's/-/_/g'`

-    case "$ac_option" in
-      *=*) ;;
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;

       *) ac_optarg=yes ;;
     esac
       *) ac_optarg=yes ;;
     esac

-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;

 
   -without-* | --without-*)
 
   -without-* | --without-*)

-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`

     # Reject names that are not valid shell variable names.
     # Reject names that are not valid shell variable names.

-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    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" ;;

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


@@ -863,99 +617,110 @@ EOF
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)

-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;

 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)

-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;

 
 

-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }

     ;;
 
     ;;
 

+  *=*)
+    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; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
+

   *)
   *)

-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
+    # FIXME: should be removed in autoconf 3.0.
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then

-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }

 fi
 fi

-exec 5>./config.log

 
 

-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done

 
 

-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir

 do
 do

-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"     "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;

   esac
 done
 
   esac
 done
 

-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+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
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi

 
 

-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null

 
 

-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=wx-config.in

 
 # 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 its parent.
 
 # 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 its parent.

-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`

   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..


@@ -965,163 +730,869 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then

-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }

   else
   else

-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }

   fi
 fi
   fi
 fi

-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP

 
 

-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
+#
+# Report the --help message.
+#
+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
+\`configure' configures wxWindows 2.5.0 to adapt to many kinds of systems.

 
 

-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
+Usage: $0 [OPTION]... [VAR=VALUE]...

 
 

-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='       '
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.

 
 

+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help 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
+      --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
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+_ACEOF
+
+  cat <<_ACEOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+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]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+_ACEOF
+
+  cat <<\_ACEOF
+
+X features:
+  --x-includes=DIR    X include files are in DIR
+  --x-libraries=DIR   X library files are in DIR
+
+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
+     short | recursive ) echo "Configuration of wxWindows 2.5.0:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-gui            use GUI classes
+  --disable-monolithic    don't build wxWindows as single library
+  --enable-universal      use wxWindows GUI controls instead of native ones
+  --enable-nanox          use NanoX
+  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)
+  --enable-shared         create shared library code
+  --enable-optimise       create optimised code
+  --enable-debug          same as debug_flag and debug_info
+  --enable-stl            use STL for containers
+  --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
+  --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
+  --enable-compat20       enable wxWindows 2.0 compatibility
+  --enable-compat22       enable wxWindows 2.2 compatibility
+  --disable-compat24      disable wxWindows 2.4 compatibility
+  --enable-rpath=DIR      output the rpath flag from wx-config
+  --enable-intl           use internationalization system
+  --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-ole            use OLE classes
+  --enable-dataobj        use data object classes
+  --enable-ipc            use interprocess communication (wxSocket etc.)
+  --enable-cmdline        use wxCmdLineParser class
+  --enable-datetime       use wxDateTime class
+  --enable-stopwatch      use wxStopWatch class
+  --enable-dialupman      use dialup network classes
+  --enable-apple_ieee     use the Apple IEEE codec
+  --enable-timer          use wxTimer class
+  --enable-wave           use wxWave class
+  --enable-fraction       use wxFraction class
+  --enable-dynlib         use wxLibrary class for DLL loading
+  --enable-dynamicloader  use (new) wxDynamicLibrary class
+  --enable-longlong       use wxLongLong class
+  --enable-geometry       use geometry class
+  --enable-log            use logging system
+  --enable-streams        use wxStream etc classes
+  --enable-file           use wxFile classes
+  --enable-ffile          use wxFFile classes
+  --enable-textbuf        use wxTextBuffer class
+  --enable-textfile       use wxTextFile class
+  --enable-fontmap        use font encodings conversion classes
+  --enable-unicode        compile wxString with Unicode support
+  --enable-mslu           use MS Layer for Unicode on Windows 9x (win32 only)
+  --enable-wxprintfv      use wxWindows implementation of vprintf()
+  --enable-std_iostreams  use standard C++ stream classes
+  --enable-filesystem     use virtual file systems classes
+  --enable-fs_inet        use virtual HTTP/FTP filesystems
+  --enable-fs_zip         use virtual ZIP filesystems
+  --enable-zipstream      use wxZipInputStream
+  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException
+  --enable-snglinst       use wxSingleInstanceChecker class
+  --enable-mimetype       use wxMimeTypesManager
+  --enable-sysoptions     use wxSystemOptions
+  --enable-url            use wxURL 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-docview        use document view architecture
+  --enable-help           use help subsystem
+  --enable-mshtmlhelp     use MS HTML Help (win32)
+  --enable-html           use wxHTML sub-library
+  --enable-htmlhelp       use wxHTML-based help
+  --enable-constraints    use layout-constraints system
+  --enable-printarch      use printing architecture
+  --enable-mdi            use multiple document interface architecture
+  --enable-loggui         use standard GUI logger
+  --enable-logwin         use wxLogWindow
+  --enable-logdialog      use wxLogDialog
+  --enable-postscript     use wxPostscriptDC device context (default for gtk+)
+  --enable-prologio       not available; see contrib
+  --enable-resources      not available; see contrib
+  --enable-clipboard      use wxClipboard class
+  --enable-dnd            use Drag'n'Drop classes
+  --enable-metafile       use win32 metafiles
+  --enable-controls       use all usual controls
+  --enable-accel          use accelerators
+  --enable-button         use wxButton class
+  --enable-bmpbutton      use wxBitmapButton class
+  --enable-calendar       use wxCalendarCtrl class
+  --enable-caret          use wxCaret class
+  --enable-checkbox       use wxCheckBox class
+  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class
+  --enable-choice         use wxChoice class
+  --enable-combobox       use wxComboBox class
+  --enable-display        use wxDisplay class
+  --enable-gauge          use wxGauge class
+  --enable-grid           use wxGrid class
+  --enable-imaglist       use wxImageList class
+  --enable-listbox        use wxListBox class
+  --enable-listctrl       use wxListCtrl class
+  --enable-notebook       use wxNotebook class
+  --enable-radiobox       use wxRadioBox class
+  --enable-radiobtn       use wxRadioButton class
+  --enable-sash           use wxSashWindow class
+  --enable-scrollbar      use wxScrollBar class and scrollable windows
+  --enable-slider         use wxSlider class
+  --enable-spinbtn        use wxSpinButton class
+  --enable-spinctrl       use wxSpinCtrl class
+  --enable-splitter       use wxSplitterWindow class
+  --enable-statbmp        use wxStaticBitmap class
+  --enable-statbox        use wxStaticBox class
+  --enable-statline       use wxStaticLine class
+  --enable-stattext       use wxStaticText class
+  --enable-statusbar      use wxStatusBar class
+  --enable-tabdialog      use wxTabControl class
+  --enable-textctrl       use wxTextCtrl class
+  --enable-togglebtn      use wxToggleButton class
+  --enable-toolbar        use wxToolBar class
+  --enable-tbarnative     use native wxToolBar class
+  --enable-tbarsmpl       use wxToolBarSimple class
+  --enable-treectrl       use wxTreeCtrl class
+  --enable-tipwindow      use wxTipWindow class
+  --enable-popupwin       use wxPopUpWindow class
+  --enable-commondlg      use all common dialogs
+  --enable-choicedlg      use wxChoiceDialog
+  --enable-coldlg         use wxColourDialog
+  --enable-filedlg        use wxFileDialog
+  --enable-finddlg        use wxFindReplaceDialog
+  --enable-fontdlg        use wxFontDialog
+  --enable-dirdlg         use wxDirDialog
+  --enable-msgdlg         use wxMessageDialog
+  --enable-numberdlg      use wxNumberEntryDialog
+  --enable-splash         use wxSplashScreen
+  --enable-textdlg        use wxTextDialog
+  --enable-tipdlg         use startup tips
+  --enable-progressdlg    use wxProgressDialog
+  --enable-wizarddlg      use wxWizard
+  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes
+  --enable-miniframe      use wxMiniFrame class
+  --enable-tooltips       use wxToolTip class
+  --enable-splines        use spline drawing code
+  --enable-validators     use wxValidator and derived classes
+  --enable-busyinfo       use wxBusyInfo
+  --enable-joystick       use wxJoystick (Linux only)
+  --enable-metafiles      use wxMetaFile (Windows only)
+  --enable-dragimage      use wxDragImage
+  --enable-accessibility  enable accessibility support
+  --enable-palette        use wxPalette class
+  --enable-image          use wxImage class
+  --enable-gif            use gif images (GIF file format)
+  --enable-pcx            use pcx images (PCX 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-official_build official build of wxWindows (win32 DLL only)
+  --enable-vendor=VENDOR  vendor name (win32 DLL only)
+  --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
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gtk              use GTK+
+  --with-motif            use Motif/Lesstif
+  --with-mac              use Mac OS X
+  --with-cocoa            use Cocoa
+  --with-wine             use Wine
+  --with-msw              use MS-Windows
+  --with-pm               use OS/2 Presentation Manager
+  --with-mgl              use SciTech MGL
+  --with-microwin         use MicroWindows
+  --with-x11              use X11
+  --with-libpng           use libpng (PNG image format)
+  --with-libjpeg          use libjpeg (JPEG file format)
+  --with-libtiff          use libtiff (TIFF file format)
+  --with-opengl           use OpenGL (or Mesa)
+  --with-dmalloc          use dmalloc library (http://dmalloc.com/)
+  --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-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-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <wx-dev@lists.wxwindows.org>.
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d $ac_dir || continue
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+           test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi

 
 

+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\_ACEOF
+wxWindows configure 2.5.0
+generated by GNU Autoconf 2.57

 
 

-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+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 0

 fi
 fi

-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by wxWindows $as_me 2.5.0, which was
+generated by GNU Autoconf 2.57.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_sep=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+        ac_must_keep_next=false # Got value, back to normal.
+      else
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
+      fi
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
+      ;;
+    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; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+}
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+       eval ac_val=$`echo $ac_var`
+        echo "$ac_var='"'"'$ac_val'"'"'"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      sed "/^$/d" confdefs.h | sort
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core core.* *.core &&
+  rm -rf 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
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Predefined preprocessor variables.
+
+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_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  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;}
+    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;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      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;}
+      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=:
+      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=$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'" ;;
+    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; }; }
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 
 
 

-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.

 
 

-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac

 
 
 
 

-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi

 
 

-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1069: checking host system type" >&5

 
 

-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac

 
 

-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1090: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac

 
 

-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1108: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac

 
 

-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6

 
 

-test "$host_alias" != "$target_alias" &&
+
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+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; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6
+if test "${ac_cv_target+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_target_alias=$target_alias
+test "x$ac_cv_target_alias" = "x" &&
+  ac_cv_target_alias=$ac_cv_host_alias
+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6
+target=$ac_cv_target
+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&

   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-


@@ -1196,39 +1667,39 @@ case "${host}" in
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
     SO_SUFFIX=sl
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
     SO_SUFFIX=sl

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __HPUX__ 1
 #define __HPUX__ 1

-EOF
+_ACEOF

 
   ;;
   *-*-linux* )
     USE_LINUX=1
 
   ;;
   *-*-linux* )
     USE_LINUX=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __LINUX__ 1
 #define __LINUX__ 1

-EOF
+_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 <<\EOF
+      cat >>confdefs.h <<\_ACEOF

 #define __ALPHA__ 1
 #define __ALPHA__ 1

-EOF
+_ACEOF

 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-gnu* )
     USE_GNU=1
 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-gnu* )
     USE_GNU=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __GNU__ 1
 #define __GNU__ 1

-EOF
+_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 <<\EOF
+      cat >>confdefs.h <<\_ACEOF

 #define __ALPHA__ 1
 #define __ALPHA__ 1

-EOF
+_ACEOF

 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
 
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1


@@ -1236,13 +1707,13 @@ EOF
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
     USE_SVR4=1
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
     USE_SVR4=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SGI__ 1
 #define __SGI__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SVR4__ 1
 #define __SVR4__ 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;


@@ -1250,17 +1721,17 @@ EOF
     USE_SUN=1
     USE_SOLARIS=1
     USE_SVR4=1
     USE_SUN=1
     USE_SOLARIS=1
     USE_SVR4=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SUN__ 1
 #define __SUN__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SOLARIS__ 1
 #define __SOLARIS__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SVR4__ 1
 #define __SVR4__ 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1


@@ -1269,69 +1740,69 @@ EOF
     USE_SUN=1
     USE_SUNOS=1
     USE_BSD=1
     USE_SUN=1
     USE_SUNOS=1
     USE_BSD=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SUN__ 1
 #define __SUN__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SUNOS__ 1
 #define __SUNOS__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __BSD__ 1
 #define __BSD__ 1

-EOF
+_ACEOF

 
     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 <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __FREEBSD__ 1
 #define __FREEBSD__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __BSD__ 1
 #define __BSD__ 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-openbsd*)
     USE_BSD=1
     USE_OPENBSD=1
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-openbsd*)
     USE_BSD=1
     USE_OPENBSD=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __OPENBSD__ 1
 #define __OPENBSD__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __BSD__ 1
 #define __BSD__ 1

-EOF
+_ACEOF

 
     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 <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __NETBSD__ 1
 #define __NETBSD__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __BSD__ 1
 #define __BSD__ 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-osf* )
     USE_ALPHA=1
     USE_OSF=1
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-osf* )
     USE_ALPHA=1
     USE_OSF=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __ALPHA__ 1
 #define __ALPHA__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __OSF__ 1
 #define __OSF__ 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1


@@ -1339,26 +1810,26 @@ EOF
   *-*-dgux5* )
     USE_ALPHA=1
     USE_SVR4=1
   *-*-dgux5* )
     USE_ALPHA=1
     USE_SVR4=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __ALPHA__ 1
 #define __ALPHA__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SVR4__ 1
 #define __SVR4__ 1

-EOF
+_ACEOF

 
     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 <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SYSV__ 1
 #define __SYSV__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SVR4__ 1
 #define __SVR4__ 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;


@@ -1367,17 +1838,17 @@ EOF
     USE_SYSV=1
     USE_SVR4=1
                         SO_SUFFIX=a
     USE_SYSV=1
     USE_SVR4=1
                         SO_SUFFIX=a

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __AIX__ 1
 #define __AIX__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SYSV__ 1
 #define __SYSV__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __SVR4__ 1
 #define __SVR4__ 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;


@@ -1386,9 +1857,9 @@ EOF
     USE_SYSV=1
     USE_SVR4=1
     USE_UNIXWARE=1
     USE_SYSV=1
     USE_SVR4=1
     USE_UNIXWARE=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __UNIXWARE__ 1
 #define __UNIXWARE__ 1

-EOF
+_ACEOF

 
   ;;
 
 
   ;;
 


@@ -1402,9 +1873,9 @@ EOF
   *-pc-msdosdjgpp )
     USE_UNIX=0
     USE_DOS=1
   *-pc-msdosdjgpp )
     USE_UNIX=0
     USE_DOS=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __DOS__ 1
 #define __DOS__ 1

-EOF
+_ACEOF

 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MGL=1
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MGL=1


@@ -1412,9 +1883,9 @@ EOF
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __EMX__ 1
 #define __EMX__ 1

-EOF
+_ACEOF

 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1


@@ -1424,35 +1895,37 @@ EOF
         USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib
         USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __BSD__ 1
 #define __BSD__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __DARWIN__ 1
 #define __DARWIN__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __POWERPC__ 1
 #define __POWERPC__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define TARGET_CARBON 1
 #define TARGET_CARBON 1

-EOF
+_ACEOF

 
     DEFAULT_DEFAULT_wxUSE_MAC=1
   ;;
 
   *-*-beos* )
         USE_BEOS=1
 
     DEFAULT_DEFAULT_wxUSE_MAC=1
   ;;
 
   *-*-beos* )
         USE_BEOS=1

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __BEOS__ 1
 #define __BEOS__ 1

-EOF
+_ACEOF

 
   ;;
 
   *)
 
   ;;
 
   *)

-    { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; }
+    { { echo "$as_me:$LINENO: error: unknown system type ${host}." >&5
+echo "$as_me: error: unknown system type ${host}." >&2;}
+   { (exit 1); exit 1; }; }

 esac
 
 
 esac
 
 


@@ -1463,18 +1936,18 @@ esac
           rm -f ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}
           rm -f ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}

-        
+

 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNIVERSAL=no
 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNIVERSAL=no

+  DEFAULT_wxUSE_STL=no

 
   DEFAULT_wxUSE_NANOX=no
 
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
 
   DEFAULT_wxUSE_NANOX=no
 
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes

-  DEFAULT_wxUSE_SONAME=no

   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no


@@ -1487,7 +1960,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no

-  DEFAULT_wxUSE_PRECOMP=no

   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes


@@ -1499,6 +1971,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONTROLS=no
 
   DEFAULT_wxUSE_REGEX=no
   DEFAULT_wxUSE_CONTROLS=no
 
   DEFAULT_wxUSE_REGEX=no

+  DEFAULT_wxUSE_XML=no
+  DEFAULT_wxUSE_EXPAT=no

   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no


@@ -1639,15 +2113,18 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no
   DEFAULT_wxUSE_ACCESSIBILITY=no
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no
   DEFAULT_wxUSE_ACCESSIBILITY=no

+
+  DEFAULT_wxUSE_MONOLITHIC=no
+  DEFAULT_wxUSE_OFFICIAL_BUILD=no

 else
   DEFAULT_wxUSE_UNIVERSAL=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no

+  DEFAULT_wxUSE_STL=no

 
   DEFAULT_wxUSE_NANOX=no
 
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
 
   DEFAULT_wxUSE_NANOX=no
 
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes

-  DEFAULT_wxUSE_SONAME=no

   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no


@@ -1660,7 +2137,6 @@ else
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no

-  DEFAULT_wxUSE_PRECOMP=no

   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes


@@ -1671,6 +2147,8 @@ else
   DEFAULT_wxUSE_GUI=yes
 
   DEFAULT_wxUSE_REGEX=yes
   DEFAULT_wxUSE_GUI=yes
 
   DEFAULT_wxUSE_REGEX=yes

+  DEFAULT_wxUSE_XML=yes
+  DEFAULT_wxUSE_EXPAT=yes

   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes


@@ -1811,6 +2289,9 @@ else
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes
   DEFAULT_wxUSE_ACCESSIBILITY=no
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes
   DEFAULT_wxUSE_ACCESSIBILITY=no

+
+  DEFAULT_wxUSE_MONOLITHIC=no
+  DEFAULT_wxUSE_OFFICIAL_BUILD=no

 fi
 
 
 fi
 
 


@@ -1827,21 +2308,21 @@ done
 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-gui""... $ac_c" 1>&6
-echo "configure:1832: checking for --${enablestring:-enable}-gui" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
   enableval="$enable_gui"
           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
   enableval="$enable_gui"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_gui='wxUSE_GUI=yes'
                           else
                             ac_cv_use_gui='wxUSE_GUI=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_gui='wxUSE_GUI=yes'
                           else
                             ac_cv_use_gui='wxUSE_GUI=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -1850,9 +2331,8 @@ else
                           fi
 
                           ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI
                           fi
 
                           ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_gui"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_gui"
           if test "$no_cache" != 1; then


@@ -1860,31 +2340,74 @@ fi
           fi
 
           if test "$wxUSE_GUI" = yes; then
           fi
 
           if test "$wxUSE_GUI" = yes; then

-            echo "$ac_t""yes" 1>&6
+            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
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-monolithic or --disable-monolithic was given.
+if test "${enable_monolithic+set}" = set; then
+  enableval="$enable_monolithic"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
+                          else
+                            ac_cv_use_monolithic='wxUSE_MONOLITHIC=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_MONOLITHIC" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_monolithic='wxUSE_MONOLITHIC='$DEFAULT_wxUSE_MONOLITHIC
+
+fi;
+
+          eval "$ac_cv_use_monolithic"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_monolithic >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MONOLITHIC" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           else
           else

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

           fi
           fi

-        
+

 
 if test "$wxUSE_GUI" = "yes"; then
 
 
          enablestring=
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-universal""... $ac_c" 1>&6
-echo "configure:1875: checking for --${enablestring:-enable}-universal" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-universal or --disable-universal was given.
 if test "${enable_universal+set}" = set; then
   enableval="$enable_universal"
           no_cache=0
           # Check whether --enable-universal or --disable-universal was given.
 if test "${enable_universal+set}" = set; then
   enableval="$enable_universal"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_universal='wxUSE_UNIVERSAL=yes'
                           else
                             ac_cv_use_universal='wxUSE_UNIVERSAL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_universal='wxUSE_UNIVERSAL=yes'
                           else
                             ac_cv_use_universal='wxUSE_UNIVERSAL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -1893,9 +2416,8 @@ else
                           fi
 
                           ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL
                           fi
 
                           ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_universal"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_universal"
           if test "$no_cache" != 1; then


@@ -1903,88 +2425,90 @@ fi
           fi
 
           if test "$wxUSE_UNIVERSAL" = yes; then
           fi
 
           if test "$wxUSE_UNIVERSAL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+
+

 # Check whether --with-gtk or --without-gtk was given.
 if test "${with_gtk+set}" = set; then
   withval="$with_gtk"
   wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
 # Check whether --with-gtk or --without-gtk was given.
 if test "${with_gtk+set}" = set; then
   withval="$with_gtk"
   wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1

-fi
+fi;

 
 # Check whether --with-motif or --without-motif was given.
 if test "${with_motif+set}" = set; then
   withval="$with_motif"
   wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1
 
 # Check whether --with-motif or --without-motif was given.
 if test "${with_motif+set}" = set; then
   withval="$with_motif"
   wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1

-fi
+fi;

 
 # Check whether --with-mac or --without-mac was given.
 if test "${with_mac+set}" = set; then
   withval="$with_mac"
   wxUSE_MAC="$withval" TOOLKIT_GIVEN=1
 
 # Check whether --with-mac or --without-mac was given.
 if test "${with_mac+set}" = set; then
   withval="$with_mac"
   wxUSE_MAC="$withval" TOOLKIT_GIVEN=1

-fi
+fi;

 
 # Check whether --with-cocoa or --without-cocoa was given.
 if test "${with_cocoa+set}" = set; then
   withval="$with_cocoa"
   wxUSE_COCOA="$withval" TOOLKIT_GIVEN=1
 
 # Check whether --with-cocoa or --without-cocoa was given.
 if test "${with_cocoa+set}" = set; then
   withval="$with_cocoa"
   wxUSE_COCOA="$withval" TOOLKIT_GIVEN=1

-fi
+fi;

 
 # Check whether --with-wine or --without-wine was given.
 if test "${with_wine+set}" = set; then
   withval="$with_wine"
   wxUSE_WINE="$withval" CACHE_WINE=1
 
 # Check whether --with-wine or --without-wine was given.
 if test "${with_wine+set}" = set; then
   withval="$with_wine"
   wxUSE_WINE="$withval" CACHE_WINE=1

-fi
+fi;

 
 # Check whether --with-msw or --without-msw was given.
 if test "${with_msw+set}" = set; then
   withval="$with_msw"
   wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1
 
 # Check whether --with-msw or --without-msw was given.
 if test "${with_msw+set}" = set; then
   withval="$with_msw"
   wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1

-fi
+fi;

 
 # Check whether --with-pm or --without-pm was given.
 if test "${with_pm+set}" = set; then
   withval="$with_pm"
   wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
 
 # Check whether --with-pm or --without-pm was given.
 if test "${with_pm+set}" = set; then
   withval="$with_pm"
   wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1

-fi
+fi;

 
 # Check whether --with-mgl or --without-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
 
 # Check whether --with-mgl or --without-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
+fi;

 
 # Check whether --with-microwin or --without-microwin was given.
 if test "${with_microwin+set}" = set; then
   withval="$with_microwin"
   wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1
 
 # Check whether --with-microwin or --without-microwin was given.
 if test "${with_microwin+set}" = set; then
   withval="$with_microwin"
   wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1

-fi
+fi;

 
 # Check whether --with-x11 or --without-x11 was given.
 if test "${with_x11+set}" = set; then
   withval="$with_x11"
   wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1
 
 # Check whether --with-x11 or --without-x11 was given.
 if test "${with_x11+set}" = set; then
   withval="$with_x11"
   wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1

-fi
-
+fi;

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-nanox""... $ac_c" 1>&6
-echo "configure:1975: checking for --${enablestring:-enable}-nanox" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-nanox or --disable-nanox was given.
 if test "${enable_nanox+set}" = set; then
   enableval="$enable_nanox"
           no_cache=0
           # Check whether --enable-nanox or --disable-nanox was given.
 if test "${enable_nanox+set}" = set; then
   enableval="$enable_nanox"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_nanox='wxUSE_NANOX=yes'
                           else
                             ac_cv_use_nanox='wxUSE_NANOX=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_nanox='wxUSE_NANOX=yes'
                           else
                             ac_cv_use_nanox='wxUSE_NANOX=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -1993,9 +2517,8 @@ else
                           fi
 
                           ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX
                           fi
 
                           ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_nanox"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_nanox"
           if test "$no_cache" != 1; then


@@ -2003,29 +2526,31 @@ fi
           fi
 
           if test "$wxUSE_NANOX" = yes; then
           fi
 
           if test "$wxUSE_NANOX" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-gtk2""... $ac_c" 1>&6
-echo "configure:2016: checking for --${enablestring:-enable}-gtk2" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gtk2" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gtk2... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-gtk2 or --disable-gtk2 was given.
 if test "${enable_gtk2+set}" = set; then
   enableval="$enable_gtk2"
           no_cache=0
           # Check whether --enable-gtk2 or --disable-gtk2 was given.
 if test "${enable_gtk2+set}" = set; then
   enableval="$enable_gtk2"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_gtk2='wxUSE_GTK2=yes'
                           else
                             ac_cv_use_gtk2='wxUSE_GTK2=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_gtk2='wxUSE_GTK2=yes'
                           else
                             ac_cv_use_gtk2='wxUSE_GTK2=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2034,9 +2559,8 @@ else
                           fi
 
                           ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
                           fi
 
                           ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_gtk2"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_gtk2"
           if test "$no_cache" != 1; then


@@ -2044,20 +2568,23 @@ fi
           fi
 
           if test "$wxUSE_GTK2" = yes; then
           fi
 
           if test "$wxUSE_GTK2" = yes; then

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

           else
           else

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

           fi
           fi

-        

 
 
 
 

-          echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:2056: checking for --with-libpng" >&5
+
+          echo "$as_me:$LINENO: checking for --with-libpng" >&5
+echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

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


@@ -2067,11 +2594,13 @@ if test "${with_libpng+set}" = set; then
                         elif test "$withval" = builtin; then
                           ac_cv_use_libpng='wxUSE_LIBPNG=builtin'
                         else
                         elif test "$withval" = builtin; then
                           ac_cv_use_libpng='wxUSE_LIBPNG=builtin'
                         else

-                          { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+                          { { 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; }; }

                         fi
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2080,9 +2609,8 @@ else
                         fi
 
                         ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG
                         fi
 
                         ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_libpng"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_libpng"
           if test "$no_cache" != 1; then


@@ -2090,25 +2618,32 @@ fi
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then

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

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

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

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

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

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

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

           else
           else

-            { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+            { { 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; }; }

           fi
           fi

-        

 
 

-          echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
-echo "configure:2107: checking for --with-libjpeg" >&5
+
+          echo "$as_me:$LINENO: checking for --with-libjpeg" >&5
+echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

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


@@ -2118,11 +2653,13 @@ if test "${with_libjpeg+set}" = set; then
                         elif test "$withval" = builtin; then
                           ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
                         else
                         elif test "$withval" = builtin; then
                           ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
                         else

-                          { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+                          { { 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; }; }

                         fi
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2131,9 +2668,8 @@ else
                         fi
 
                         ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG
                         fi
 
                         ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_libjpeg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_libjpeg"
           if test "$no_cache" != 1; then


@@ -2141,25 +2677,32 @@ fi
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then

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

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

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

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

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

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

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

           else
           else

-            { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+            { { 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; }; }

           fi
           fi

-        

 
 

-          echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
-echo "configure:2158: checking for --with-libtiff" >&5
+
+          echo "$as_me:$LINENO: checking for --with-libtiff" >&5
+echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

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


@@ -2169,11 +2712,13 @@ if test "${with_libtiff+set}" = set; then
                         elif test "$withval" = builtin; then
                           ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
                         else
                         elif test "$withval" = builtin; then
                           ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
                         else

-                          { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+                          { { 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; }; }

                         fi
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2182,9 +2727,8 @@ else
                         fi
 
                         ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF
                         fi
 
                         ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_libtiff"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_libtiff"
           if test "$no_cache" != 1; then


@@ -2192,33 +2736,40 @@ fi
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then

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

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

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

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

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

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

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

           else
           else

-            { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+            { { 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; }; }

           fi
           fi

-        

 
 

-          echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2209: checking for --with-opengl" >&5
+
+          echo "$as_me:$LINENO: checking for --with-opengl" >&5
+echo $ECHO_N "checking for --with-opengl... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

                         if test "$withval" = yes; then
                           ac_cv_use_opengl='wxUSE_OPENGL=yes'
                         else
                           ac_cv_use_opengl='wxUSE_OPENGL=no'
                         fi
                         if test "$withval" = yes; then
                           ac_cv_use_opengl='wxUSE_OPENGL=yes'
                         else
                           ac_cv_use_opengl='wxUSE_OPENGL=no'
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2227,9 +2778,8 @@ else
                         fi
 
                         ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL
                         fi
 
                         ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_opengl"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_opengl"
           if test "$no_cache" != 1; then


@@ -2237,30 +2787,33 @@ fi
           fi
 
           if test "$wxUSE_OPENGL" = yes; then
           fi
 
           if test "$wxUSE_OPENGL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 fi
 
 
 
 fi
 
 

-          echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
-echo "configure:2251: checking for --with-dmalloc" >&5
+          echo "$as_me:$LINENO: checking for --with-dmalloc" >&5
+echo $ECHO_N "checking for --with-dmalloc... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

                         if test "$withval" = yes; then
                           ac_cv_use_dmalloc='wxUSE_DMALLOC=yes'
                         else
                           ac_cv_use_dmalloc='wxUSE_DMALLOC=no'
                         fi
                         if test "$withval" = yes; then
                           ac_cv_use_dmalloc='wxUSE_DMALLOC=yes'
                         else
                           ac_cv_use_dmalloc='wxUSE_DMALLOC=no'
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2269,9 +2822,8 @@ else
                         fi
 
                         ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC
                         fi
 
                         ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dmalloc"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dmalloc"
           if test "$no_cache" != 1; then


@@ -2279,19 +2831,22 @@ fi
           fi
 
           if test "$wxUSE_DMALLOC" = yes; then
           fi
 
           if test "$wxUSE_DMALLOC" = yes; then

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

           else
           else

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

           fi
           fi

-        

 
 

-          echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
-echo "configure:2290: checking for --with-regex" >&5
+
+          echo "$as_me:$LINENO: checking for --with-regex" >&5
+echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

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


@@ -2301,11 +2856,13 @@ if test "${with_regex+set}" = set; then
                         elif test "$withval" = builtin; then
                           ac_cv_use_regex='wxUSE_REGEX=builtin'
                         else
                         elif test "$withval" = builtin; then
                           ac_cv_use_regex='wxUSE_REGEX=builtin'
                         else

-                          { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+                          { { 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; }; }

                         fi
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2314,9 +2871,8 @@ else
                         fi
 
                         ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX
                         fi
 
                         ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_regex"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_regex"
           if test "$no_cache" != 1; then


@@ -2324,25 +2880,32 @@ fi
           fi
 
           if test "$wxUSE_REGEX" = yes; then
           fi
 
           if test "$wxUSE_REGEX" = yes; then

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

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

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

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

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

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

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

           else
           else

-            { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+            { { 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; }; }

           fi
           fi

-        

 
 

-          echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
-echo "configure:2341: checking for --with-zlib" >&5
+
+          echo "$as_me:$LINENO: checking for --with-zlib" >&5
+echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

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


@@ -2352,11 +2915,13 @@ if test "${with_zlib+set}" = set; then
                         elif test "$withval" = builtin; then
                           ac_cv_use_zlib='wxUSE_ZLIB=builtin'
                         else
                         elif test "$withval" = builtin; then
                           ac_cv_use_zlib='wxUSE_ZLIB=builtin'
                         else

-                          { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+                          { { 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
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2365,9 +2930,8 @@ else
                         fi
 
                         ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
                         fi
 
                         ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_zlib"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_zlib"
           if test "$no_cache" != 1; then


@@ -2375,25 +2939,32 @@ fi
           fi
 
           if test "$wxUSE_ZLIB" = yes; then
           fi
 
           if test "$wxUSE_ZLIB" = yes; then

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

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

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

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

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

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

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

           else
           else

-            { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+            { { 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
           fi

-        

 
 

-          echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
-echo "configure:2392: checking for --with-odbc" >&5
+
+          echo "$as_me:$LINENO: checking for --with-odbc" >&5
+echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-  
+

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


@@ -2403,11 +2974,13 @@ if test "${with_odbc+set}" = set; then
                         elif test "$withval" = builtin; then
                           ac_cv_use_odbc='wxUSE_ODBC=builtin'
                         else
                         elif test "$withval" = builtin; then
                           ac_cv_use_odbc='wxUSE_ODBC=builtin'
                         else

-                          { echo "configure: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+                          { { 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
                         fi

-                      
+

 else
 else

-  
+

                         LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"


@@ -2416,9 +2989,8 @@ else
                         fi
 
                         ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
                         fi
 
                         ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC

-                      
-fi

 
 

+fi;

 
           eval "$ac_cv_use_odbc"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_odbc"
           if test "$no_cache" != 1; then


@@ -2426,36 +2998,101 @@ fi
           fi
 
           if test "$wxUSE_ODBC" = yes; then
           fi
 
           if test "$wxUSE_ODBC" = yes; then

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

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

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

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

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

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

-            echo "$ac_t""builtin version" 1>&6
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6
+          else
+            { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
+echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
+   { (exit 1); exit 1; }; }
+          fi
+
+
+          echo "$as_me:$LINENO: checking for --with-expat" >&5
+echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6
+          no_cache=0
+
+# Check whether --with-expat or --without-expat was given.
+if test "${with_expat+set}" = set; then
+  withval="$with_expat"
+
+                        if test "$withval" = yes; then
+                          ac_cv_use_expat='wxUSE_EXPAT=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_expat='wxUSE_EXPAT=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_expat='wxUSE_EXPAT=sys'
+                        elif test "$withval" = builtin; then
+                          ac_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; }; }
+                        fi
+
+else
+
+                        LINE=`grep "wxUSE_EXPAT" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_expat='wxUSE_EXPAT='$DEFAULT_wxUSE_EXPAT
+
+fi;
+
+          eval "$ac_cv_use_expat"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_expat >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_EXPAT" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          elif test "$wxUSE_EXPAT" = no; then
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          elif test "$wxUSE_EXPAT" = sys; then
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6
+          elif test "$wxUSE_EXPAT" = builtin; then
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6

           else
           else

-            { echo "configure: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" 1>&2; exit 1; }
+            { { 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; }; }

           fi
           fi

-        
+

 
 
 
          enablestring=
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-shared""... $ac_c" 1>&6
-echo "configure:2446: checking for --${enablestring:-enable}-shared" >&5
+          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 or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_shared='wxUSE_SHARED=yes'
                           else
                             ac_cv_use_shared='wxUSE_SHARED=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_shared='wxUSE_SHARED=yes'
                           else
                             ac_cv_use_shared='wxUSE_SHARED=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2464,9 +3101,8 @@ else
                           fi
 
                           ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED
                           fi
 
                           ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_shared"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_shared"
           if test "$no_cache" != 1; then


@@ -2474,68 +3110,30 @@ fi
           fi
 
           if test "$wxUSE_SHARED" = yes; then
           fi
 
           if test "$wxUSE_SHARED" = yes; then

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

           else
           else

-            echo "$ac_t""no" 1>&6
-          fi
-        
-
-         enablestring=
-          echo $ac_n "checking for --${enablestring:-enable}-soname""... $ac_c" 1>&6
-echo "configure:2486: checking for --${enablestring:-enable}-soname" >&5
-          no_cache=0
-          # Check whether --enable-soname or --disable-soname was given.
-if test "${enable_soname+set}" = set; then
-  enableval="$enable_soname"
-  
-                          if test "$enableval" = yes; then
-                            ac_cv_use_soname='wxUSE_SONAME=yes'
-                          else
-                            ac_cv_use_soname='wxUSE_SONAME=no'
-                          fi
-                        
-else
-  
-                          LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME
-                        
-fi
-
-
-          eval "$ac_cv_use_soname"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

           fi
 
           fi
 

-          if test "$wxUSE_SONAME" = yes; then
-            echo "$ac_t""yes" 1>&6
-          else
-            echo "$ac_t""no" 1>&6
-          fi
-        

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-optimise""... $ac_c" 1>&6
-echo "configure:2526: checking for --${enablestring:-enable}-optimise" >&5
+          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 or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
   enableval="$enable_optimise"
           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
   enableval="$enable_optimise"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_optimise='wxUSE_OPTIMISE=yes'
                           else
                             ac_cv_use_optimise='wxUSE_OPTIMISE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_optimise='wxUSE_OPTIMISE=yes'
                           else
                             ac_cv_use_optimise='wxUSE_OPTIMISE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2544,9 +3142,8 @@ else
                           fi
 
                           ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE
                           fi
 
                           ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_optimise"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_optimise"
           if test "$no_cache" != 1; then


@@ -2554,28 +3151,30 @@ fi
           fi
 
           if test "$wxUSE_OPTIMISE" = yes; then
           fi
 
           if test "$wxUSE_OPTIMISE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-debug""... $ac_c" 1>&6
-echo "configure:2566: checking for --${enablestring:-enable}-debug" >&5
+          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 or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_debug='wxUSE_DEBUG=yes'
                           else
                             ac_cv_use_debug='wxUSE_DEBUG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_debug='wxUSE_DEBUG=yes'
                           else
                             ac_cv_use_debug='wxUSE_DEBUG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2584,9 +3183,8 @@ else
                           fi
 
                           ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG
                           fi
 
                           ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_debug"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_debug"
           if test "$no_cache" != 1; then


@@ -2594,78 +3192,82 @@ fi
           fi
 
           if test "$wxUSE_DEBUG" = yes; then
           fi
 
           if test "$wxUSE_DEBUG" = yes; then

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

           else
           else

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

           fi
           fi

-        

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-precomp""... $ac_c" 1>&6
-echo "configure:2607: checking for --${enablestring:-enable}-precomp" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6

           no_cache=0
           no_cache=0

-          # Check whether --enable-precomp or --disable-precomp was given.
-if test "${enable_precomp+set}" = set; then
-  enableval="$enable_precomp"
-  
+          # Check whether --enable-stl or --disable-stl was given.
+if test "${enable_stl+set}" = set; then
+  enableval="$enable_stl"
+

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

-                            ac_cv_use_precomp='wxUSE_PRECOMP=yes'
+                            ac_cv_use_stl='wxUSE_STL=yes'

                           else
                           else

-                            ac_cv_use_precomp='wxUSE_PRECOMP=no'
+                            ac_cv_use_stl='wxUSE_STL=no'

                           fi
                           fi

-                        
+

 else
 else

-  
-                          LINE=`grep "wxUSE_PRECOMP" ${wx_arg_cache_file}`
+
+                          LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP
-                        
-fi
+                          ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL

 
 

+fi;

 
 

-          eval "$ac_cv_use_precomp"
+          eval "$ac_cv_use_stl"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_precomp >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_PRECOMP" = yes; then
-            echo "$ac_t""yes" 1>&6
+          if test "$wxUSE_STL" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           else
           else

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

           fi
           fi

-        
+

 
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
 
 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
 elif test "$wxUSE_DEBUG" = "no"; then
   DEFAULT_wxUSE_DEBUG_FLAG=no
   DEFAULT_wxUSE_DEBUG_INFO=no

+  BUILD=release

 fi
 
 
          enablestring=
 fi
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-debug_flag""... $ac_c" 1>&6
-echo "configure:2656: checking for --${enablestring:-enable}-debug_flag" >&5
+          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 or --disable-debug_flag was given.
 if test "${enable_debug_flag+set}" = set; then
   enableval="$enable_debug_flag"
           no_cache=0
           # Check whether --enable-debug_flag or --disable-debug_flag was given.
 if test "${enable_debug_flag+set}" = set; then
   enableval="$enable_debug_flag"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                           else
                             ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                           else
                             ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2674,9 +3276,8 @@ else
                           fi
 
                           ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG
                           fi
 
                           ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_debug_flag"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_debug_flag"
           if test "$no_cache" != 1; then


@@ -2684,28 +3285,30 @@ fi
           fi
 
           if test "$wxUSE_DEBUG_FLAG" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_FLAG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-debug_info""... $ac_c" 1>&6
-echo "configure:2696: checking for --${enablestring:-enable}-debug_info" >&5
+          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 or --disable-debug_info was given.
 if test "${enable_debug_info+set}" = set; then
   enableval="$enable_debug_info"
           no_cache=0
           # Check whether --enable-debug_info or --disable-debug_info was given.
 if test "${enable_debug_info+set}" = set; then
   enableval="$enable_debug_info"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                           else
                             ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                           else
                             ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2714,9 +3317,8 @@ else
                           fi
 
                           ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO
                           fi
 
                           ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_debug_info"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_debug_info"
           if test "$no_cache" != 1; then


@@ -2724,28 +3326,30 @@ fi
           fi
 
           if test "$wxUSE_DEBUG_INFO" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_INFO" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-debug_gdb""... $ac_c" 1>&6
-echo "configure:2736: checking for --${enablestring:-enable}-debug_gdb" >&5
+          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 or --disable-debug_gdb was given.
 if test "${enable_debug_gdb+set}" = set; then
   enableval="$enable_debug_gdb"
           no_cache=0
           # Check whether --enable-debug_gdb or --disable-debug_gdb was given.
 if test "${enable_debug_gdb+set}" = set; then
   enableval="$enable_debug_gdb"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
                           else
                             ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
                           else
                             ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2754,9 +3358,8 @@ else
                           fi
 
                           ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB
                           fi
 
                           ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_debug_gdb"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_debug_gdb"
           if test "$no_cache" != 1; then


@@ -2764,28 +3367,30 @@ fi
           fi
 
           if test "$wxUSE_DEBUG_GDB" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_GDB" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2776: checking for --${enablestring:-enable}-debug_cntxt" >&5
+          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 or --disable-debug_cntxt was given.
 if test "${enable_debug_cntxt+set}" = set; then
   enableval="$enable_debug_cntxt"
           no_cache=0
           # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
 if test "${enable_debug_cntxt+set}" = set; then
   enableval="$enable_debug_cntxt"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                           else
                             ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                           else
                             ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2794,9 +3399,8 @@ else
                           fi
 
                           ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT
                           fi
 
                           ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_debug_cntxt"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_debug_cntxt"
           if test "$no_cache" != 1; then


@@ -2804,28 +3408,30 @@ fi
           fi
 
           if test "$wxUSE_DEBUG_CONTEXT" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_CONTEXT" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-mem_tracing""... $ac_c" 1>&6
-echo "configure:2816: checking for --${enablestring:-enable}-mem_tracing" >&5
+          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 or --disable-mem_tracing was given.
 if test "${enable_mem_tracing+set}" = set; then
   enableval="$enable_mem_tracing"
           no_cache=0
           # Check whether --enable-mem_tracing or --disable-mem_tracing was given.
 if test "${enable_mem_tracing+set}" = set; then
   enableval="$enable_mem_tracing"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
                           else
                             ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
                           else
                             ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2834,9 +3440,8 @@ else
                           fi
 
                           ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING
                           fi
 
                           ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_mem_tracing"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_mem_tracing"
           if test "$no_cache" != 1; then


@@ -2844,28 +3449,30 @@ fi
           fi
 
           if test "$wxUSE_MEM_TRACING" = yes; then
           fi
 
           if test "$wxUSE_MEM_TRACING" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-profile""... $ac_c" 1>&6
-echo "configure:2856: checking for --${enablestring:-enable}-profile" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
   enableval="$enable_profile"
           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
   enableval="$enable_profile"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_profile='wxUSE_PROFILE=yes'
                           else
                             ac_cv_use_profile='wxUSE_PROFILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_profile='wxUSE_PROFILE=yes'
                           else
                             ac_cv_use_profile='wxUSE_PROFILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2874,9 +3481,8 @@ else
                           fi
 
                           ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE
                           fi
 
                           ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_profile"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_profile"
           if test "$no_cache" != 1; then


@@ -2884,28 +3490,30 @@ fi
           fi
 
           if test "$wxUSE_PROFILE" = yes; then
           fi
 
           if test "$wxUSE_PROFILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-no_rtti""... $ac_c" 1>&6
-echo "configure:2896: checking for --${enablestring:-enable}-no_rtti" >&5
+          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
           # Check whether --enable-no_rtti or --disable-no_rtti was given.
 if test "${enable_no_rtti+set}" = set; then
   enableval="$enable_no_rtti"
           no_cache=0
           # Check whether --enable-no_rtti or --disable-no_rtti was given.
 if test "${enable_no_rtti+set}" = set; then
   enableval="$enable_no_rtti"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
                           else
                             ac_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
                           else
                             ac_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2914,9 +3522,8 @@ else
                           fi
 
                           ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI
                           fi
 
                           ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_no_rtti"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_no_rtti"
           if test "$no_cache" != 1; then


@@ -2924,28 +3531,30 @@ fi
           fi
 
           if test "$wxUSE_NO_RTTI" = yes; then
           fi
 
           if test "$wxUSE_NO_RTTI" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-no_exceptions""... $ac_c" 1>&6
-echo "configure:2936: checking for --${enablestring:-enable}-no_exceptions" >&5
+          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
           # Check whether --enable-no_exceptions or --disable-no_exceptions was given.
 if test "${enable_no_exceptions+set}" = set; then
   enableval="$enable_no_exceptions"
           no_cache=0
           # Check whether --enable-no_exceptions or --disable-no_exceptions was given.
 if test "${enable_no_exceptions+set}" = set; then
   enableval="$enable_no_exceptions"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
                           else
                             ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
                           else
                             ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2954,9 +3563,8 @@ else
                           fi
 
                           ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS
                           fi
 
                           ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_no_exceptions"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_no_exceptions"
           if test "$no_cache" != 1; then


@@ -2964,28 +3572,30 @@ fi
           fi
 
           if test "$wxUSE_NO_EXCEPTIONS" = yes; then
           fi
 
           if test "$wxUSE_NO_EXCEPTIONS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-permissive""... $ac_c" 1>&6
-echo "configure:2976: checking for --${enablestring:-enable}-permissive" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
   enableval="$enable_permissive"
           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
   enableval="$enable_permissive"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_permissive='wxUSE_PERMISSIVE=yes'
                           else
                             ac_cv_use_permissive='wxUSE_PERMISSIVE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_permissive='wxUSE_PERMISSIVE=yes'
                           else
                             ac_cv_use_permissive='wxUSE_PERMISSIVE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -2994,9 +3604,8 @@ else
                           fi
 
                           ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE
                           fi
 
                           ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_permissive"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_permissive"
           if test "$no_cache" != 1; then


@@ -3004,28 +3613,30 @@ fi
           fi
 
           if test "$wxUSE_PERMISSIVE" = yes; then
           fi
 
           if test "$wxUSE_PERMISSIVE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-no_deps""... $ac_c" 1>&6
-echo "configure:3016: checking for --${enablestring:-enable}-no_deps" >&5
+          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
           # Check whether --enable-no_deps or --disable-no_deps was given.
 if test "${enable_no_deps+set}" = set; then
   enableval="$enable_no_deps"
           no_cache=0
           # Check whether --enable-no_deps or --disable-no_deps was given.
 if test "${enable_no_deps+set}" = set; then
   enableval="$enable_no_deps"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_no_deps='wxUSE_NO_DEPS=yes'
                           else
                             ac_cv_use_no_deps='wxUSE_NO_DEPS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_no_deps='wxUSE_NO_DEPS=yes'
                           else
                             ac_cv_use_no_deps='wxUSE_NO_DEPS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3034,9 +3645,8 @@ else
                           fi
 
                           ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS
                           fi
 
                           ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_no_deps"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_no_deps"
           if test "$no_cache" != 1; then


@@ -3044,29 +3654,31 @@ fi
           fi
 
           if test "$wxUSE_NO_DEPS" = yes; then
           fi
 
           if test "$wxUSE_NO_DEPS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-compat20""... $ac_c" 1>&6
-echo "configure:3057: checking for --${enablestring:-enable}-compat20" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat20" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-compat20... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-compat20 or --disable-compat20 was given.
 if test "${enable_compat20+set}" = set; then
   enableval="$enable_compat20"
           no_cache=0
           # Check whether --enable-compat20 or --disable-compat20 was given.
 if test "${enable_compat20+set}" = set; then
   enableval="$enable_compat20"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=yes'
                           else
                             ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=yes'
                           else
                             ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "WXWIN_COMPATIBILITY_2" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "WXWIN_COMPATIBILITY_2" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3075,9 +3687,8 @@ else
                           fi
 
                           ac_cv_use_compat20='WXWIN_COMPATIBILITY_2='$DEFAULT_WXWIN_COMPATIBILITY_2
                           fi
 
                           ac_cv_use_compat20='WXWIN_COMPATIBILITY_2='$DEFAULT_WXWIN_COMPATIBILITY_2

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_compat20"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_compat20"
           if test "$no_cache" != 1; then


@@ -3085,28 +3696,30 @@ fi
           fi
 
           if test "$WXWIN_COMPATIBILITY_2" = yes; then
           fi
 
           if test "$WXWIN_COMPATIBILITY_2" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-compat22""... $ac_c" 1>&6
-echo "configure:3097: checking for --${enablestring:-enable}-compat22" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat22" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-compat22... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-compat22 or --disable-compat22 was given.
 if test "${enable_compat22+set}" = set; then
   enableval="$enable_compat22"
           no_cache=0
           # Check whether --enable-compat22 or --disable-compat22 was given.
 if test "${enable_compat22+set}" = set; then
   enableval="$enable_compat22"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=yes'
                           else
                             ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=yes'
                           else
                             ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "WXWIN_COMPATIBILITY_2_2" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "WXWIN_COMPATIBILITY_2_2" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3115,9 +3728,8 @@ else
                           fi
 
                           ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2='$DEFAULT_WXWIN_COMPATIBILITY_2_2
                           fi
 
                           ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2='$DEFAULT_WXWIN_COMPATIBILITY_2_2

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_compat22"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_compat22"
           if test "$no_cache" != 1; then


@@ -3125,28 +3737,30 @@ fi
           fi
 
           if test "$WXWIN_COMPATIBILITY_2_2" = yes; then
           fi
 
           if test "$WXWIN_COMPATIBILITY_2_2" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=disable
 
          enablestring=disable

-          echo $ac_n "checking for --${enablestring:-enable}-compat24""... $ac_c" 1>&6
-echo "configure:3137: checking for --${enablestring:-enable}-compat24" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat24" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-compat24... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-compat24 or --disable-compat24 was given.
 if test "${enable_compat24+set}" = set; then
   enableval="$enable_compat24"
           no_cache=0
           # Check whether --enable-compat24 or --disable-compat24 was given.
 if test "${enable_compat24+set}" = set; then
   enableval="$enable_compat24"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes'
                           else
                             ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes'
                           else
                             ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3155,9 +3769,8 @@ else
                           fi
 
                           ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4
                           fi
 
                           ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_compat24"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_compat24"
           if test "$no_cache" != 1; then


@@ -3165,18 +3778,19 @@ fi
           fi
 
           if test "$WXWIN_COMPATIBILITY_2_4" = yes; then
           fi
 
           if test "$WXWIN_COMPATIBILITY_2_4" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 # Check whether --enable-rpath or --disable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval="$enable_rpath"
   wxRPATH_DIR="$enableval"
 
 # Check whether --enable-rpath or --disable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval="$enable_rpath"
   wxRPATH_DIR="$enableval"

-fi
-
+fi;

 
 if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
    WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
 
 if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
    WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"


@@ -3186,21 +3800,21 @@ fi
 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6
-echo "configure:3191: checking for --${enablestring:-enable}-intl" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
   enableval="$enable_intl"
           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
   enableval="$enable_intl"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_intl='wxUSE_INTL=yes'
                           else
                             ac_cv_use_intl='wxUSE_INTL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_intl='wxUSE_INTL=yes'
                           else
                             ac_cv_use_intl='wxUSE_INTL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3209,9 +3823,8 @@ else
                           fi
 
                           ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL
                           fi
 
                           ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_intl"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_intl"
           if test "$no_cache" != 1; then


@@ -3219,28 +3832,30 @@ fi
           fi
 
           if test "$wxUSE_INTL" = yes; then
           fi
 
           if test "$wxUSE_INTL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6
-echo "configure:3231: checking for --${enablestring:-enable}-config" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
   enableval="$enable_config"
           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
   enableval="$enable_config"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_config='wxUSE_CONFIG=yes'
                           else
                             ac_cv_use_config='wxUSE_CONFIG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_config='wxUSE_CONFIG=yes'
                           else
                             ac_cv_use_config='wxUSE_CONFIG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3249,9 +3864,8 @@ else
                           fi
 
                           ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG
                           fi
 
                           ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_config"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_config"
           if test "$no_cache" != 1; then


@@ -3259,29 +3873,31 @@ fi
           fi
 
           if test "$wxUSE_CONFIG" = yes; then
           fi
 
           if test "$wxUSE_CONFIG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-protocols""... $ac_c" 1>&6
-echo "configure:3272: checking for --${enablestring:-enable}-protocols" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-protocols or --disable-protocols was given.
 if test "${enable_protocols+set}" = set; then
   enableval="$enable_protocols"
           no_cache=0
           # Check whether --enable-protocols or --disable-protocols was given.
 if test "${enable_protocols+set}" = set; then
   enableval="$enable_protocols"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_protocols='wxUSE_PROTOCOL=yes'
                           else
                             ac_cv_use_protocols='wxUSE_PROTOCOL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_protocols='wxUSE_PROTOCOL=yes'
                           else
                             ac_cv_use_protocols='wxUSE_PROTOCOL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3290,9 +3906,8 @@ else
                           fi
 
                           ac_cv_use_protocols='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL
                           fi
 
                           ac_cv_use_protocols='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_protocols"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_protocols"
           if test "$no_cache" != 1; then


@@ -3300,28 +3915,30 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-ftp""... $ac_c" 1>&6
-echo "configure:3312: checking for --${enablestring:-enable}-ftp" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
   enableval="$enable_ftp"
           no_cache=0
           # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
   enableval="$enable_ftp"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
                             ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
                             ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3330,9 +3947,8 @@ else
                           fi
 
                           ac_cv_use_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP
                           fi
 
                           ac_cv_use_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_ftp"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_ftp"
           if test "$no_cache" != 1; then


@@ -3340,28 +3956,30 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-http""... $ac_c" 1>&6
-echo "configure:3352: checking for --${enablestring:-enable}-http" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-http or --disable-http was given.
 if test "${enable_http+set}" = set; then
   enableval="$enable_http"
           no_cache=0
           # Check whether --enable-http or --disable-http was given.
 if test "${enable_http+set}" = set; then
   enableval="$enable_http"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
                             ac_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
                             ac_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3370,9 +3988,8 @@ else
                           fi
 
                           ac_cv_use_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP
                           fi
 
                           ac_cv_use_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_http"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_http"
           if test "$no_cache" != 1; then


@@ -3380,28 +3997,30 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-fileproto""... $ac_c" 1>&6
-echo "configure:3392: checking for --${enablestring:-enable}-fileproto" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-fileproto or --disable-fileproto was given.
 if test "${enable_fileproto+set}" = set; then
   enableval="$enable_fileproto"
           no_cache=0
           # Check whether --enable-fileproto or --disable-fileproto was given.
 if test "${enable_fileproto+set}" = set; then
   enableval="$enable_fileproto"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
                           else
                             ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
                           else
                             ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3410,9 +4029,8 @@ else
                           fi
 
                           ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE
                           fi
 
                           ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_fileproto"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_fileproto"
           if test "$no_cache" != 1; then


@@ -3420,28 +4038,30 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-sockets""... $ac_c" 1>&6
-echo "configure:3432: checking for --${enablestring:-enable}-sockets" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
   enableval="$enable_sockets"
           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
   enableval="$enable_sockets"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_sockets='wxUSE_SOCKETS=yes'
                           else
                             ac_cv_use_sockets='wxUSE_SOCKETS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_sockets='wxUSE_SOCKETS=yes'
                           else
                             ac_cv_use_sockets='wxUSE_SOCKETS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3450,9 +4070,8 @@ else
                           fi
 
                           ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS
                           fi
 
                           ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_sockets"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_sockets"
           if test "$no_cache" != 1; then


@@ -3460,28 +4079,30 @@ fi
           fi
 
           if test "$wxUSE_SOCKETS" = yes; then
           fi
 
           if test "$wxUSE_SOCKETS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6
-echo "configure:3472: checking for --${enablestring:-enable}-ole" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-ole or --disable-ole was given.
 if test "${enable_ole+set}" = set; then
   enableval="$enable_ole"
           no_cache=0
           # Check whether --enable-ole or --disable-ole was given.
 if test "${enable_ole+set}" = set; then
   enableval="$enable_ole"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_ole='wxUSE_OLE=yes'
                           else
                             ac_cv_use_ole='wxUSE_OLE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_ole='wxUSE_OLE=yes'
                           else
                             ac_cv_use_ole='wxUSE_OLE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3490,9 +4111,8 @@ else
                           fi
 
                           ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE
                           fi
 
                           ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_ole"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_ole"
           if test "$no_cache" != 1; then


@@ -3500,28 +4120,30 @@ fi
           fi
 
           if test "$wxUSE_OLE" = yes; then
           fi
 
           if test "$wxUSE_OLE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6
-echo "configure:3512: checking for --${enablestring:-enable}-dataobj" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-dataobj or --disable-dataobj was given.
 if test "${enable_dataobj+set}" = set; then
   enableval="$enable_dataobj"
           no_cache=0
           # Check whether --enable-dataobj or --disable-dataobj was given.
 if test "${enable_dataobj+set}" = set; then
   enableval="$enable_dataobj"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_dataobj='wxUSE_DATAOBJ=yes'
                           else
                             ac_cv_use_dataobj='wxUSE_DATAOBJ=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_dataobj='wxUSE_DATAOBJ=yes'
                           else
                             ac_cv_use_dataobj='wxUSE_DATAOBJ=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3530,9 +4152,8 @@ else
                           fi
 
                           ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ
                           fi
 
                           ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dataobj"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dataobj"
           if test "$no_cache" != 1; then


@@ -3540,29 +4161,31 @@ fi
           fi
 
           if test "$wxUSE_DATAOBJ" = yes; then
           fi
 
           if test "$wxUSE_DATAOBJ" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-ipc""... $ac_c" 1>&6
-echo "configure:3553: checking for --${enablestring:-enable}-ipc" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then
   enableval="$enable_ipc"
           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then
   enableval="$enable_ipc"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_ipc='wxUSE_IPC=yes'
                           else
                             ac_cv_use_ipc='wxUSE_IPC=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_ipc='wxUSE_IPC=yes'
                           else
                             ac_cv_use_ipc='wxUSE_IPC=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3571,9 +4194,8 @@ else
                           fi
 
                           ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC
                           fi
 
                           ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_ipc"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_ipc"
           if test "$no_cache" != 1; then


@@ -3581,29 +4203,31 @@ fi
           fi
 
           if test "$wxUSE_IPC" = yes; then
           fi
 
           if test "$wxUSE_IPC" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-cmdline""... $ac_c" 1>&6
-echo "configure:3594: checking for --${enablestring:-enable}-cmdline" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-cmdline or --disable-cmdline was given.
 if test "${enable_cmdline+set}" = set; then
   enableval="$enable_cmdline"
           no_cache=0
           # Check whether --enable-cmdline or --disable-cmdline was given.
 if test "${enable_cmdline+set}" = set; then
   enableval="$enable_cmdline"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                           else
                             ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                           else
                             ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3612,9 +4236,8 @@ else
                           fi
 
                           ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
                           fi
 
                           ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_cmdline"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_cmdline"
           if test "$no_cache" != 1; then


@@ -3622,28 +4245,30 @@ fi
           fi
 
           if test "$wxUSE_CMDLINE_PARSER" = yes; then
           fi
 
           if test "$wxUSE_CMDLINE_PARSER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-datetime""... $ac_c" 1>&6
-echo "configure:3634: checking for --${enablestring:-enable}-datetime" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-datetime or --disable-datetime was given.
 if test "${enable_datetime+set}" = set; then
   enableval="$enable_datetime"
           no_cache=0
           # Check whether --enable-datetime or --disable-datetime was given.
 if test "${enable_datetime+set}" = set; then
   enableval="$enable_datetime"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_datetime='wxUSE_DATETIME=yes'
                           else
                             ac_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_datetime='wxUSE_DATETIME=yes'
                           else
                             ac_cv_use_datetime='wxUSE_DATETIME=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3652,9 +4277,8 @@ else
                           fi
 
                           ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
                           fi
 
                           ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_datetime"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_datetime"
           if test "$no_cache" != 1; then


@@ -3662,28 +4286,30 @@ fi
           fi
 
           if test "$wxUSE_DATETIME" = yes; then
           fi
 
           if test "$wxUSE_DATETIME" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-stopwatch""... $ac_c" 1>&6
-echo "configure:3674: checking for --${enablestring:-enable}-stopwatch" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-stopwatch or --disable-stopwatch was given.
 if test "${enable_stopwatch+set}" = set; then
   enableval="$enable_stopwatch"
           no_cache=0
           # Check whether --enable-stopwatch or --disable-stopwatch was given.
 if test "${enable_stopwatch+set}" = set; then
   enableval="$enable_stopwatch"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                           else
                             ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                           else
                             ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3692,9 +4318,8 @@ else
                           fi
 
                           ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
                           fi
 
                           ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_stopwatch"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_stopwatch"
           if test "$no_cache" != 1; then


@@ -3702,28 +4327,30 @@ fi
           fi
 
           if test "$wxUSE_STOPWATCH" = yes; then
           fi
 
           if test "$wxUSE_STOPWATCH" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-dialupman""... $ac_c" 1>&6
-echo "configure:3714: checking for --${enablestring:-enable}-dialupman" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-dialupman or --disable-dialupman was given.
 if test "${enable_dialupman+set}" = set; then
   enableval="$enable_dialupman"
           no_cache=0
           # Check whether --enable-dialupman or --disable-dialupman was given.
 if test "${enable_dialupman+set}" = set; then
   enableval="$enable_dialupman"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                           else
                             ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                           else
                             ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3732,9 +4359,8 @@ else
                           fi
 
                           ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
                           fi
 
                           ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dialupman"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dialupman"
           if test "$no_cache" != 1; then


@@ -3742,28 +4368,30 @@ fi
           fi
 
           if test "$wxUSE_DIALUP_MANAGER" = yes; then
           fi
 
           if test "$wxUSE_DIALUP_MANAGER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6
-echo "configure:3754: checking for --${enablestring:-enable}-apple_ieee" >&5
+          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
           # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
 if test "${enable_apple_ieee+set}" = set; then
   enableval="$enable_apple_ieee"
           no_cache=0
           # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
 if test "${enable_apple_ieee+set}" = set; then
   enableval="$enable_apple_ieee"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
                           else
                             ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
                           else
                             ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3772,9 +4400,8 @@ else
                           fi
 
                           ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
                           fi
 
                           ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_apple_ieee"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_apple_ieee"
           if test "$no_cache" != 1; then


@@ -3782,28 +4409,30 @@ fi
           fi
 
           if test "$wxUSE_APPLE_IEEE" = yes; then
           fi
 
           if test "$wxUSE_APPLE_IEEE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-timer""... $ac_c" 1>&6
-echo "configure:3794: checking for --${enablestring:-enable}-timer" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-timer or --disable-timer was given.
 if test "${enable_timer+set}" = set; then
   enableval="$enable_timer"
           no_cache=0
           # Check whether --enable-timer or --disable-timer was given.
 if test "${enable_timer+set}" = set; then
   enableval="$enable_timer"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_timer='wxUSE_TIMER=yes'
                           else
                             ac_cv_use_timer='wxUSE_TIMER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_timer='wxUSE_TIMER=yes'
                           else
                             ac_cv_use_timer='wxUSE_TIMER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3812,9 +4441,8 @@ else
                           fi
 
                           ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
                           fi
 
                           ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_timer"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_timer"
           if test "$no_cache" != 1; then


@@ -3822,28 +4450,30 @@ fi
           fi
 
           if test "$wxUSE_TIMER" = yes; then
           fi
 
           if test "$wxUSE_TIMER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-wave""... $ac_c" 1>&6
-echo "configure:3834: checking for --${enablestring:-enable}-wave" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wave" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wave... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-wave or --disable-wave was given.
 if test "${enable_wave+set}" = set; then
   enableval="$enable_wave"
           no_cache=0
           # Check whether --enable-wave or --disable-wave was given.
 if test "${enable_wave+set}" = set; then
   enableval="$enable_wave"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_wave='wxUSE_WAVE=yes'
                           else
                             ac_cv_use_wave='wxUSE_WAVE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_wave='wxUSE_WAVE=yes'
                           else
                             ac_cv_use_wave='wxUSE_WAVE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3852,9 +4482,8 @@ else
                           fi
 
                           ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
                           fi
 
                           ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_wave"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_wave"
           if test "$no_cache" != 1; then


@@ -3862,28 +4491,30 @@ fi
           fi
 
           if test "$wxUSE_WAVE" = yes; then
           fi
 
           if test "$wxUSE_WAVE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-fraction""... $ac_c" 1>&6
-echo "configure:3874: checking for --${enablestring:-enable}-fraction" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fraction" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fraction... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-fraction or --disable-fraction was given.
 if test "${enable_fraction+set}" = set; then
   enableval="$enable_fraction"
           no_cache=0
           # Check whether --enable-fraction or --disable-fraction was given.
 if test "${enable_fraction+set}" = set; then
   enableval="$enable_fraction"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_fraction='wxUSE_FRACTION=yes'
                           else
                             ac_cv_use_fraction='wxUSE_FRACTION=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_fraction='wxUSE_FRACTION=yes'
                           else
                             ac_cv_use_fraction='wxUSE_FRACTION=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3892,9 +4523,8 @@ else
                           fi
 
                           ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
                           fi
 
                           ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_fraction"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_fraction"
           if test "$no_cache" != 1; then


@@ -3902,28 +4532,30 @@ fi
           fi
 
           if test "$wxUSE_FRACTION" = yes; then
           fi
 
           if test "$wxUSE_FRACTION" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-dynlib""... $ac_c" 1>&6
-echo "configure:3914: checking for --${enablestring:-enable}-dynlib" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-dynlib or --disable-dynlib was given.
 if test "${enable_dynlib+set}" = set; then
   enableval="$enable_dynlib"
           no_cache=0
           # Check whether --enable-dynlib or --disable-dynlib was given.
 if test "${enable_dynlib+set}" = set; then
   enableval="$enable_dynlib"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                           else
                             ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                           else
                             ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3932,9 +4564,8 @@ else
                           fi
 
                           ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
                           fi
 
                           ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dynlib"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dynlib"
           if test "$no_cache" != 1; then


@@ -3942,28 +4573,30 @@ fi
           fi
 
           if test "$wxUSE_DYNLIB_CLASS" = yes; then
           fi
 
           if test "$wxUSE_DYNLIB_CLASS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-dynamicloader""... $ac_c" 1>&6
-echo "configure:3954: checking for --${enablestring:-enable}-dynamicloader" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-dynamicloader or --disable-dynamicloader was given.
 if test "${enable_dynamicloader+set}" = set; then
   enableval="$enable_dynamicloader"
           no_cache=0
           # Check whether --enable-dynamicloader or --disable-dynamicloader was given.
 if test "${enable_dynamicloader+set}" = set; then
   enableval="$enable_dynamicloader"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
                           else
                             ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
                           else
                             ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -3972,9 +4605,8 @@ else
                           fi
 
                           ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER
                           fi
 
                           ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dynamicloader"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dynamicloader"
           if test "$no_cache" != 1; then


@@ -3982,28 +4614,30 @@ fi
           fi
 
           if test "$wxUSE_DYNAMIC_LOADER" = yes; then
           fi
 
           if test "$wxUSE_DYNAMIC_LOADER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-longlong""... $ac_c" 1>&6
-echo "configure:3994: checking for --${enablestring:-enable}-longlong" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-longlong or --disable-longlong was given.
 if test "${enable_longlong+set}" = set; then
   enableval="$enable_longlong"
           no_cache=0
           # Check whether --enable-longlong or --disable-longlong was given.
 if test "${enable_longlong+set}" = set; then
   enableval="$enable_longlong"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_longlong='wxUSE_LONGLONG=yes'
                           else
                             ac_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_longlong='wxUSE_LONGLONG=yes'
                           else
                             ac_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4012,9 +4646,8 @@ else
                           fi
 
                           ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
                           fi
 
                           ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_longlong"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_longlong"
           if test "$no_cache" != 1; then


@@ -4022,28 +4655,30 @@ fi
           fi
 
           if test "$wxUSE_LONGLONG" = yes; then
           fi
 
           if test "$wxUSE_LONGLONG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-geometry""... $ac_c" 1>&6
-echo "configure:4034: checking for --${enablestring:-enable}-geometry" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then
   enableval="$enable_geometry"
           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then
   enableval="$enable_geometry"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
                           else
                             ac_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
                           else
                             ac_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4052,9 +4687,8 @@ else
                           fi
 
                           ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
                           fi
 
                           ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_geometry"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_geometry"
           if test "$no_cache" != 1; then


@@ -4062,28 +4696,30 @@ fi
           fi
 
           if test "$wxUSE_GEOMETRY" = yes; then
           fi
 
           if test "$wxUSE_GEOMETRY" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-log""... $ac_c" 1>&6
-echo "configure:4074: checking for --${enablestring:-enable}-log" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then
   enableval="$enable_log"
           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then
   enableval="$enable_log"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_log='wxUSE_LOG=yes'
                           else
                             ac_cv_use_log='wxUSE_LOG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_log='wxUSE_LOG=yes'
                           else
                             ac_cv_use_log='wxUSE_LOG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4092,9 +4728,8 @@ else
                           fi
 
                           ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
                           fi
 
                           ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_log"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_log"
           if test "$no_cache" != 1; then


@@ -4102,28 +4737,30 @@ fi
           fi
 
           if test "$wxUSE_LOG" = yes; then
           fi
 
           if test "$wxUSE_LOG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-streams""... $ac_c" 1>&6
-echo "configure:4114: checking for --${enablestring:-enable}-streams" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then
   enableval="$enable_streams"
           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then
   enableval="$enable_streams"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_streams='wxUSE_STREAMS=yes'
                           else
                             ac_cv_use_streams='wxUSE_STREAMS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_streams='wxUSE_STREAMS=yes'
                           else
                             ac_cv_use_streams='wxUSE_STREAMS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4132,9 +4769,8 @@ else
                           fi
 
                           ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
                           fi
 
                           ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_streams"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_streams"
           if test "$no_cache" != 1; then


@@ -4142,28 +4778,30 @@ fi
           fi
 
           if test "$wxUSE_STREAMS" = yes; then
           fi
 
           if test "$wxUSE_STREAMS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-file""... $ac_c" 1>&6
-echo "configure:4154: checking for --${enablestring:-enable}-file" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then
   enableval="$enable_file"
           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then
   enableval="$enable_file"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_file='wxUSE_FILE=yes'
                           else
                             ac_cv_use_file='wxUSE_FILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_file='wxUSE_FILE=yes'
                           else
                             ac_cv_use_file='wxUSE_FILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4172,9 +4810,8 @@ else
                           fi
 
                           ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
                           fi
 
                           ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_file"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_file"
           if test "$no_cache" != 1; then


@@ -4182,28 +4819,30 @@ fi
           fi
 
           if test "$wxUSE_FILE" = yes; then
           fi
 
           if test "$wxUSE_FILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-ffile""... $ac_c" 1>&6
-echo "configure:4194: checking for --${enablestring:-enable}-ffile" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-ffile or --disable-ffile was given.
 if test "${enable_ffile+set}" = set; then
   enableval="$enable_ffile"
           no_cache=0
           # Check whether --enable-ffile or --disable-ffile was given.
 if test "${enable_ffile+set}" = set; then
   enableval="$enable_ffile"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_ffile='wxUSE_FFILE=yes'
                           else
                             ac_cv_use_ffile='wxUSE_FFILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_ffile='wxUSE_FFILE=yes'
                           else
                             ac_cv_use_ffile='wxUSE_FFILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4212,9 +4851,8 @@ else
                           fi
 
                           ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
                           fi
 
                           ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_ffile"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_ffile"
           if test "$no_cache" != 1; then


@@ -4222,28 +4860,30 @@ fi
           fi
 
           if test "$wxUSE_FFILE" = yes; then
           fi
 
           if test "$wxUSE_FFILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-textbuf""... $ac_c" 1>&6
-echo "configure:4234: checking for --${enablestring:-enable}-textbuf" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-textbuf or --disable-textbuf was given.
 if test "${enable_textbuf+set}" = set; then
   enableval="$enable_textbuf"
           no_cache=0
           # Check whether --enable-textbuf or --disable-textbuf was given.
 if test "${enable_textbuf+set}" = set; then
   enableval="$enable_textbuf"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
                           else
                             ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
                           else
                             ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4252,9 +4892,8 @@ else
                           fi
 
                           ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
                           fi
 
                           ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_textbuf"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_textbuf"
           if test "$no_cache" != 1; then


@@ -4262,28 +4901,30 @@ fi
           fi
 
           if test "$wxUSE_TEXTBUFFER" = yes; then
           fi
 
           if test "$wxUSE_TEXTBUFFER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6
-echo "configure:4274: checking for --${enablestring:-enable}-textfile" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then
   enableval="$enable_textfile"
           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then
   enableval="$enable_textfile"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
                           else
                             ac_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
                           else
                             ac_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4292,9 +4933,8 @@ else
                           fi
 
                           ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
                           fi
 
                           ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_textfile"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_textfile"
           if test "$no_cache" != 1; then


@@ -4302,28 +4942,30 @@ fi
           fi
 
           if test "$wxUSE_TEXTFILE" = yes; then
           fi
 
           if test "$wxUSE_TEXTFILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6
-echo "configure:4314: checking for --${enablestring:-enable}-fontmap" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-fontmap or --disable-fontmap was given.
 if test "${enable_fontmap+set}" = set; then
   enableval="$enable_fontmap"
           no_cache=0
           # Check whether --enable-fontmap or --disable-fontmap was given.
 if test "${enable_fontmap+set}" = set; then
   enableval="$enable_fontmap"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
                           else
                             ac_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
                           else
                             ac_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4332,9 +4974,8 @@ else
                           fi
 
                           ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
                           fi
 
                           ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_fontmap"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_fontmap"
           if test "$no_cache" != 1; then


@@ -4342,28 +4983,30 @@ fi
           fi
 
           if test "$wxUSE_FONTMAP" = yes; then
           fi
 
           if test "$wxUSE_FONTMAP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6
-echo "configure:4354: checking for --${enablestring:-enable}-unicode" >&5
+          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 or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then
   enableval="$enable_unicode"
           no_cache=0
           # Check whether --enable-unicode or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then
   enableval="$enable_unicode"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_unicode='wxUSE_UNICODE=yes'
                           else
                             ac_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_unicode='wxUSE_UNICODE=yes'
                           else
                             ac_cv_use_unicode='wxUSE_UNICODE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4372,9 +5015,8 @@ else
                           fi
 
                           ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
                           fi
 
                           ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_unicode"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_unicode"
           if test "$no_cache" != 1; then


@@ -4382,28 +5024,30 @@ fi
           fi
 
           if test "$wxUSE_UNICODE" = yes; then
           fi
 
           if test "$wxUSE_UNICODE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6
-echo "configure:4394: checking for --${enablestring:-enable}-mslu" >&5
+          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 or --disable-mslu was given.
 if test "${enable_mslu+set}" = set; then
   enableval="$enable_mslu"
           no_cache=0
           # Check whether --enable-mslu or --disable-mslu was given.
 if test "${enable_mslu+set}" = set; then
   enableval="$enable_mslu"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
                           else
                             ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
                           else
                             ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4412,9 +5056,8 @@ else
                           fi
 
                           ac_cv_use_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU
                           fi
 
                           ac_cv_use_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_mslu"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_mslu"
           if test "$no_cache" != 1; then


@@ -4422,28 +5065,30 @@ fi
           fi
 
           if test "$wxUSE_UNICODE_MSLU" = yes; then
           fi
 
           if test "$wxUSE_UNICODE_MSLU" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6
-echo "configure:4434: checking for --${enablestring:-enable}-wxprintfv" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxprintfv" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wxprintfv... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then
   enableval="$enable_wxprintfv"
           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then
   enableval="$enable_wxprintfv"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
                           else
                             ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
                           else
                             ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4452,9 +5097,8 @@ else
                           fi
 
                           ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
                           fi
 
                           ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_wxprintfv"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_wxprintfv"
           if test "$no_cache" != 1; then


@@ -4462,28 +5106,30 @@ fi
           fi
 
           if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
           fi
 
           if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6
-echo "configure:4474: checking for --${enablestring:-enable}-std_iostreams" >&5
+          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 or --disable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then
   enableval="$enable_std_iostreams"
           no_cache=0
           # Check whether --enable-std_iostreams or --disable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then
   enableval="$enable_std_iostreams"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
                           else
                             ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
                           else
                             ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4492,9 +5138,8 @@ else
                           fi
 
                           ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM
                           fi
 
                           ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_std_iostreams"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_std_iostreams"
           if test "$no_cache" != 1; then


@@ -4502,28 +5147,30 @@ fi
           fi
 
           if test "$wxUSE_STD_IOSTREAM" = yes; then
           fi
 
           if test "$wxUSE_STD_IOSTREAM" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6
-echo "configure:4514: checking for --${enablestring:-enable}-filesystem" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
   enableval="$enable_filesystem"
           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
   enableval="$enable_filesystem"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
                           else
                             ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
                           else
                             ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4532,9 +5179,8 @@ else
                           fi
 
                           ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
                           fi
 
                           ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_filesystem"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_filesystem"
           if test "$no_cache" != 1; then


@@ -4542,28 +5188,30 @@ fi
           fi
 
           if test "$wxUSE_FILESYSTEM" = yes; then
           fi
 
           if test "$wxUSE_FILESYSTEM" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6
-echo "configure:4554: checking for --${enablestring:-enable}-fs_inet" >&5
+          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
           # Check whether --enable-fs_inet or --disable-fs_inet was given.
 if test "${enable_fs_inet+set}" = set; then
   enableval="$enable_fs_inet"
           no_cache=0
           # Check whether --enable-fs_inet or --disable-fs_inet was given.
 if test "${enable_fs_inet+set}" = set; then
   enableval="$enable_fs_inet"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
                           else
                             ac_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
                           else
                             ac_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4572,9 +5220,8 @@ else
                           fi
 
                           ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
                           fi
 
                           ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_fs_inet"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_fs_inet"
           if test "$no_cache" != 1; then


@@ -4582,28 +5229,30 @@ fi
           fi
 
           if test "$wxUSE_FS_INET" = yes; then
           fi
 
           if test "$wxUSE_FS_INET" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6
-echo "configure:4594: checking for --${enablestring:-enable}-fs_zip" >&5
+          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
           # Check whether --enable-fs_zip or --disable-fs_zip was given.
 if test "${enable_fs_zip+set}" = set; then
   enableval="$enable_fs_zip"
           no_cache=0
           # Check whether --enable-fs_zip or --disable-fs_zip was given.
 if test "${enable_fs_zip+set}" = set; then
   enableval="$enable_fs_zip"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
                           else
                             ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
                           else
                             ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4612,9 +5261,8 @@ else
                           fi
 
                           ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
                           fi
 
                           ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_fs_zip"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_fs_zip"
           if test "$no_cache" != 1; then


@@ -4622,28 +5270,30 @@ fi
           fi
 
           if test "$wxUSE_FS_ZIP" = yes; then
           fi
 
           if test "$wxUSE_FS_ZIP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6
-echo "configure:4634: checking for --${enablestring:-enable}-zipstream" >&5
+          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 or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
   enableval="$enable_zipstream"
           no_cache=0
           # Check whether --enable-zipstream or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
   enableval="$enable_zipstream"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                           else
                             ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                           else
                             ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4652,9 +5302,8 @@ else
                           fi
 
                           ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
                           fi
 
                           ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_zipstream"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_zipstream"
           if test "$no_cache" != 1; then


@@ -4662,29 +5311,31 @@ fi
           fi
 
           if test "$wxUSE_ZIPSTREAM" = yes; then
           fi
 
           if test "$wxUSE_ZIPSTREAM" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6
-echo "configure:4675: checking for --${enablestring:-enable}-catch_segvs" >&5
+          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
           # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
 if test "${enable_catch_segvs+set}" = set; then
   enableval="$enable_catch_segvs"
           no_cache=0
           # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
 if test "${enable_catch_segvs+set}" = set; then
   enableval="$enable_catch_segvs"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
                           else
                             ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
                           else
                             ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4693,9 +5344,8 @@ else
                           fi
 
                           ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
                           fi
 
                           ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_catch_segvs"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_catch_segvs"
           if test "$no_cache" != 1; then


@@ -4703,28 +5353,30 @@ fi
           fi
 
           if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
           fi
 
           if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6
-echo "configure:4715: checking for --${enablestring:-enable}-snglinst" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-snglinst or --disable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then
   enableval="$enable_snglinst"
           no_cache=0
           # Check whether --enable-snglinst or --disable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then
   enableval="$enable_snglinst"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                           else
                             ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                           else
                             ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4733,9 +5385,8 @@ else
                           fi
 
                           ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
                           fi
 
                           ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_snglinst"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_snglinst"
           if test "$no_cache" != 1; then


@@ -4743,29 +5394,31 @@ fi
           fi
 
           if test "$wxUSE_SNGLINST_CHECKER" = yes; then
           fi
 
           if test "$wxUSE_SNGLINST_CHECKER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6
-echo "configure:4756: checking for --${enablestring:-enable}-mimetype" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-mimetype or --disable-mimetype was given.
 if test "${enable_mimetype+set}" = set; then
   enableval="$enable_mimetype"
           no_cache=0
           # Check whether --enable-mimetype or --disable-mimetype was given.
 if test "${enable_mimetype+set}" = set; then
   enableval="$enable_mimetype"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                           else
                             ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                           else
                             ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4774,9 +5427,8 @@ else
                           fi
 
                           ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
                           fi
 
                           ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_mimetype"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_mimetype"
           if test "$no_cache" != 1; then


@@ -4784,28 +5436,30 @@ fi
           fi
 
           if test "$wxUSE_MIMETYPE" = yes; then
           fi
 
           if test "$wxUSE_MIMETYPE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6
-echo "configure:4796: checking for --${enablestring:-enable}-system_options" >&5
+          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 or --disable-system_options was given.
 if test "${enable_system_options+set}" = set; then
   enableval="$enable_system_options"
           no_cache=0
           # Check whether --enable-system_options or --disable-system_options was given.
 if test "${enable_system_options+set}" = set; then
   enableval="$enable_system_options"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                           else
                             ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                           else
                             ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4814,9 +5468,8 @@ else
                           fi
 
                           ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
                           fi
 
                           ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_system_options"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_system_options"
           if test "$no_cache" != 1; then


@@ -4824,29 +5477,31 @@ fi
           fi
 
           if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
           fi
 
           if test "$wxUSE_SYSTEM_OPTIONS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6
-echo "configure:4837: checking for --${enablestring:-enable}-url" >&5
+          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 or --disable-url was given.
 if test "${enable_url+set}" = set; then
   enableval="$enable_url"
           no_cache=0
           # Check whether --enable-url or --disable-url was given.
 if test "${enable_url+set}" = set; then
   enableval="$enable_url"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_url='wxUSE_URL=yes'
                           else
                             ac_cv_use_url='wxUSE_URL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_url='wxUSE_URL=yes'
                           else
                             ac_cv_use_url='wxUSE_URL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4855,9 +5510,8 @@ else
                           fi
 
                           ac_cv_use_url='wxUSE_URL='$DEFAULT_wxUSE_URL
                           fi
 
                           ac_cv_use_url='wxUSE_URL='$DEFAULT_wxUSE_URL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_url"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_url"
           if test "$no_cache" != 1; then


@@ -4865,28 +5519,30 @@ fi
           fi
 
           if test "$wxUSE_URL" = yes; then
           fi
 
           if test "$wxUSE_URL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6
-echo "configure:4877: checking for --${enablestring:-enable}-protocol" >&5
+          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 or --disable-protocol was given.
 if test "${enable_protocol+set}" = set; then
   enableval="$enable_protocol"
           no_cache=0
           # Check whether --enable-protocol or --disable-protocol was given.
 if test "${enable_protocol+set}" = set; then
   enableval="$enable_protocol"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_protocol='wxUSE_PROTOCOL=yes'
                           else
                             ac_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_protocol='wxUSE_PROTOCOL=yes'
                           else
                             ac_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4895,9 +5551,8 @@ else
                           fi
 
                           ac_cv_use_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL
                           fi
 
                           ac_cv_use_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_protocol"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_protocol"
           if test "$no_cache" != 1; then


@@ -4905,28 +5560,30 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6
-echo "configure:4917: checking for --${enablestring:-enable}-protocol_http" >&5
+          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 or --disable-protocol_http was given.
 if test "${enable_protocol_http+set}" = set; then
   enableval="$enable_protocol_http"
           no_cache=0
           # Check whether --enable-protocol_http or --disable-protocol_http was given.
 if test "${enable_protocol_http+set}" = set; then
   enableval="$enable_protocol_http"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
                             ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
                             ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4935,9 +5592,8 @@ else
                           fi
 
                           ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP
                           fi
 
                           ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_protocol_http"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_protocol_http"
           if test "$no_cache" != 1; then


@@ -4945,28 +5601,30 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6
-echo "configure:4957: checking for --${enablestring:-enable}-protocol_ftp" >&5
+          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 or --disable-protocol_ftp was given.
 if test "${enable_protocol_ftp+set}" = set; then
   enableval="$enable_protocol_ftp"
           no_cache=0
           # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given.
 if test "${enable_protocol_ftp+set}" = set; then
   enableval="$enable_protocol_ftp"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
                             ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
                             ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -4975,9 +5633,8 @@ else
                           fi
 
                           ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP
                           fi
 
                           ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_protocol_ftp"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_protocol_ftp"
           if test "$no_cache" != 1; then


@@ -4985,28 +5642,30 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6
-echo "configure:4997: checking for --${enablestring:-enable}-protocol_file" >&5
+          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 or --disable-protocol_file was given.
 if test "${enable_protocol_file+set}" = set; then
   enableval="$enable_protocol_file"
           no_cache=0
           # Check whether --enable-protocol_file or --disable-protocol_file was given.
 if test "${enable_protocol_file+set}" = set; then
   enableval="$enable_protocol_file"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
                           else
                             ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
                           else
                             ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5015,9 +5674,8 @@ else
                           fi
 
                           ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE
                           fi
 
                           ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_protocol_file"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_protocol_file"
           if test "$no_cache" != 1; then


@@ -5025,31 +5683,33 @@ fi
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
 
 
          enablestring=
 
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6
-echo "configure:5040: checking for --${enablestring:-enable}-threads" >&5
+          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 or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
           no_cache=0
           # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_threads='wxUSE_THREADS=yes'
                           else
                             ac_cv_use_threads='wxUSE_THREADS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_threads='wxUSE_THREADS=yes'
                           else
                             ac_cv_use_threads='wxUSE_THREADS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5058,9 +5718,8 @@ else
                           fi
 
                           ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
                           fi
 
                           ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_threads"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_threads"
           if test "$no_cache" != 1; then


@@ -5068,32 +5727,34 @@ fi
           fi
 
           if test "$wxUSE_THREADS" = yes; then
           fi
 
           if test "$wxUSE_THREADS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 
          enablestring=
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6
-echo "configure:5084: checking for --${enablestring:-enable}-docview" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-docview or --disable-docview was given.
 if test "${enable_docview+set}" = set; then
   enableval="$enable_docview"
           no_cache=0
           # Check whether --enable-docview or --disable-docview was given.
 if test "${enable_docview+set}" = set; then
   enableval="$enable_docview"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                           else
                             ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                           else
                             ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5102,9 +5763,8 @@ else
                           fi
 
                           ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
                           fi
 
                           ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_docview"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_docview"
           if test "$no_cache" != 1; then


@@ -5112,28 +5772,30 @@ fi
           fi
 
           if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
           fi
 
           if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6
-echo "configure:5124: checking for --${enablestring:-enable}-help" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-help or --disable-help was given.
 if test "${enable_help+set}" = set; then
   enableval="$enable_help"
           no_cache=0
           # Check whether --enable-help or --disable-help was given.
 if test "${enable_help+set}" = set; then
   enableval="$enable_help"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_help='wxUSE_HELP=yes'
                           else
                             ac_cv_use_help='wxUSE_HELP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_help='wxUSE_HELP=yes'
                           else
                             ac_cv_use_help='wxUSE_HELP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5142,9 +5804,8 @@ else
                           fi
 
                           ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
                           fi
 
                           ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_help"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_help"
           if test "$no_cache" != 1; then


@@ -5152,28 +5813,30 @@ fi
           fi
 
           if test "$wxUSE_HELP" = yes; then
           fi
 
           if test "$wxUSE_HELP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:5164: checking for --${enablestring:-enable}-mshtmlhelp" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
 if test "${enable_mshtmlhelp+set}" = set; then
   enableval="$enable_mshtmlhelp"
           no_cache=0
           # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
 if test "${enable_mshtmlhelp+set}" = set; then
   enableval="$enable_mshtmlhelp"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                           else
                             ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                           else
                             ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5182,9 +5845,8 @@ else
                           fi
 
                           ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
                           fi
 
                           ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_mshtmlhelp"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_mshtmlhelp"
           if test "$no_cache" != 1; then


@@ -5192,28 +5854,30 @@ fi
           fi
 
           if test "$wxUSE_MS_HTML_HELP" = yes; then
           fi
 
           if test "$wxUSE_MS_HTML_HELP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6
-echo "configure:5204: checking for --${enablestring:-enable}-html" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-html or --disable-html was given.
 if test "${enable_html+set}" = set; then
   enableval="$enable_html"
           no_cache=0
           # Check whether --enable-html or --disable-html was given.
 if test "${enable_html+set}" = set; then
   enableval="$enable_html"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_html='wxUSE_HTML=yes'
                           else
                             ac_cv_use_html='wxUSE_HTML=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_html='wxUSE_HTML=yes'
                           else
                             ac_cv_use_html='wxUSE_HTML=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5222,9 +5886,8 @@ else
                           fi
 
                           ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
                           fi
 
                           ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_html"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_html"
           if test "$no_cache" != 1; then


@@ -5232,28 +5895,30 @@ fi
           fi
 
           if test "$wxUSE_HTML" = yes; then
           fi
 
           if test "$wxUSE_HTML" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6
-echo "configure:5244: checking for --${enablestring:-enable}-htmlhelp" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
 if test "${enable_htmlhelp+set}" = set; then
   enableval="$enable_htmlhelp"
           no_cache=0
           # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
 if test "${enable_htmlhelp+set}" = set; then
   enableval="$enable_htmlhelp"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                           else
                             ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                           else
                             ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5262,9 +5927,8 @@ else
                           fi
 
                           ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP
                           fi
 
                           ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_htmlhelp"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_htmlhelp"
           if test "$no_cache" != 1; then


@@ -5272,28 +5936,30 @@ fi
           fi
 
           if test "$wxUSE_WXHTML_HELP" = yes; then
           fi
 
           if test "$wxUSE_WXHTML_HELP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6
-echo "configure:5284: checking for --${enablestring:-enable}-constraints" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-constraints or --disable-constraints was given.
 if test "${enable_constraints+set}" = set; then
   enableval="$enable_constraints"
           no_cache=0
           # Check whether --enable-constraints or --disable-constraints was given.
 if test "${enable_constraints+set}" = set; then
   enableval="$enable_constraints"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else
                             ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else
                             ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5302,9 +5968,8 @@ else
                           fi
 
                           ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
                           fi
 
                           ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_constraints"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_constraints"
           if test "$no_cache" != 1; then


@@ -5312,28 +5977,30 @@ fi
           fi
 
           if test "$wxUSE_CONSTRAINTS" = yes; then
           fi
 
           if test "$wxUSE_CONSTRAINTS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6
-echo "configure:5324: checking for --${enablestring:-enable}-printarch" >&5
+          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 or --disable-printarch was given.
 if test "${enable_printarch+set}" = set; then
   enableval="$enable_printarch"
           no_cache=0
           # Check whether --enable-printarch or --disable-printarch was given.
 if test "${enable_printarch+set}" = set; then
   enableval="$enable_printarch"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                           else
                             ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                           else
                             ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5342,9 +6009,8 @@ else
                           fi
 
                           ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
                           fi
 
                           ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_printarch"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_printarch"
           if test "$no_cache" != 1; then


@@ -5352,28 +6018,30 @@ fi
           fi
 
           if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
           fi
 
           if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6
-echo "configure:5364: checking for --${enablestring:-enable}-mdi" >&5
+          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 or --disable-mdi was given.
 if test "${enable_mdi+set}" = set; then
   enableval="$enable_mdi"
           no_cache=0
           # Check whether --enable-mdi or --disable-mdi was given.
 if test "${enable_mdi+set}" = set; then
   enableval="$enable_mdi"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes'
                           else
                             ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes'
                           else
                             ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5382,9 +6050,8 @@ else
                           fi
 
                           ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
                           fi
 
                           ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_mdi"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_mdi"
           if test "$no_cache" != 1; then


@@ -5392,28 +6059,30 @@ fi
           fi
 
           if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
           fi
 
           if test "$wxUSE_MDI_ARCHITECTURE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6
-echo "configure:5404: checking for --${enablestring:-enable}-loggui" >&5
+          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 or --disable-loggui was given.
 if test "${enable_loggui+set}" = set; then
   enableval="$enable_loggui"
           no_cache=0
           # Check whether --enable-loggui or --disable-loggui was given.
 if test "${enable_loggui+set}" = set; then
   enableval="$enable_loggui"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else
                             ac_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else
                             ac_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5422,9 +6091,8 @@ else
                           fi
 
                           ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
                           fi
 
                           ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_loggui"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_loggui"
           if test "$no_cache" != 1; then


@@ -5432,28 +6100,30 @@ fi
           fi
 
           if test "$wxUSE_LOGGUI" = yes; then
           fi
 
           if test "$wxUSE_LOGGUI" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6
-echo "configure:5444: checking for --${enablestring:-enable}-logwin" >&5
+          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 or --disable-logwin was given.
 if test "${enable_logwin+set}" = set; then
   enableval="$enable_logwin"
           no_cache=0
           # Check whether --enable-logwin or --disable-logwin was given.
 if test "${enable_logwin+set}" = set; then
   enableval="$enable_logwin"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else
                             ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else
                             ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5462,9 +6132,8 @@ else
                           fi
 
                           ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
                           fi
 
                           ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_logwin"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_logwin"
           if test "$no_cache" != 1; then


@@ -5472,28 +6141,30 @@ fi
           fi
 
           if test "$wxUSE_LOGWINDOW" = yes; then
           fi
 
           if test "$wxUSE_LOGWINDOW" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6
-echo "configure:5484: checking for --${enablestring:-enable}-logdialog" >&5
+          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 or --disable-logdialog was given.
 if test "${enable_logdialog+set}" = set; then
   enableval="$enable_logdialog"
           no_cache=0
           # Check whether --enable-logdialog or --disable-logdialog was given.
 if test "${enable_logdialog+set}" = set; then
   enableval="$enable_logdialog"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
                           else
                             ac_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
                           else
                             ac_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5502,9 +6173,8 @@ else
                           fi
 
                           ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG
                           fi
 
                           ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_logdialog"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_logdialog"
           if test "$no_cache" != 1; then


@@ -5512,29 +6182,31 @@ fi
           fi
 
           if test "$wxUSE_LOGDIALOG" = yes; then
           fi
 
           if test "$wxUSE_LOGDIALOG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
          enablestring=
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6
-echo "configure:5525: checking for --${enablestring:-enable}-postscript" >&5
+          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 or --disable-postscript was given.
 if test "${enable_postscript+set}" = set; then
   enableval="$enable_postscript"
           no_cache=0
           # Check whether --enable-postscript or --disable-postscript was given.
 if test "${enable_postscript+set}" = set; then
   enableval="$enable_postscript"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else
                             ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else
                             ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5543,9 +6215,8 @@ else
                           fi
 
                           ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
                           fi
 
                           ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_postscript"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_postscript"
           if test "$no_cache" != 1; then


@@ -5553,31 +6224,33 @@ fi
           fi
 
           if test "$wxUSE_POSTSCRIPT" = yes; then
           fi
 
           if test "$wxUSE_POSTSCRIPT" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
 
 
          enablestring=
 
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-prologio""... $ac_c" 1>&6
-echo "configure:5568: checking for --${enablestring:-enable}-prologio" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-prologio" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-prologio... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-prologio or --disable-prologio was given.
 if test "${enable_prologio+set}" = set; then
   enableval="$enable_prologio"
           no_cache=0
           # Check whether --enable-prologio or --disable-prologio was given.
 if test "${enable_prologio+set}" = set; then
   enableval="$enable_prologio"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
                           else
                             ac_cv_use_prologio='wxUSE_PROLOGIO=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
                           else
                             ac_cv_use_prologio='wxUSE_PROLOGIO=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5586,9 +6259,8 @@ else
                           fi
 
                           ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
                           fi
 
                           ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_prologio"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_prologio"
           if test "$no_cache" != 1; then


@@ -5596,28 +6268,30 @@ fi
           fi
 
           if test "$wxUSE_PROLOGIO" = yes; then
           fi
 
           if test "$wxUSE_PROLOGIO" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6
-echo "configure:5608: checking for --${enablestring:-enable}-resources" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-resources" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-resources... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-resources or --disable-resources was given.
 if test "${enable_resources+set}" = set; then
   enableval="$enable_resources"
           no_cache=0
           # Check whether --enable-resources or --disable-resources was given.
 if test "${enable_resources+set}" = set; then
   enableval="$enable_resources"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_resources='wxUSE_RESOURCES=yes'
                           else
                             ac_cv_use_resources='wxUSE_RESOURCES=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_resources='wxUSE_RESOURCES=yes'
                           else
                             ac_cv_use_resources='wxUSE_RESOURCES=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5626,9 +6300,8 @@ else
                           fi
 
                           ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
                           fi
 
                           ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_resources"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_resources"
           if test "$no_cache" != 1; then


@@ -5636,30 +6309,32 @@ fi
           fi
 
           if test "$wxUSE_RESOURCES" = yes; then
           fi
 
           if test "$wxUSE_RESOURCES" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
 
          enablestring=
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6
-echo "configure:5650: checking for --${enablestring:-enable}-clipboard" >&5
+          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 or --disable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then
   enableval="$enable_clipboard"
           no_cache=0
           # Check whether --enable-clipboard or --disable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then
   enableval="$enable_clipboard"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                           else
                             ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                           else
                             ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5668,9 +6343,8 @@ else
                           fi
 
                           ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
                           fi
 
                           ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_clipboard"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_clipboard"
           if test "$no_cache" != 1; then


@@ -5678,28 +6352,30 @@ fi
           fi
 
           if test "$wxUSE_CLIPBOARD" = yes; then
           fi
 
           if test "$wxUSE_CLIPBOARD" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6
-echo "configure:5690: checking for --${enablestring:-enable}-dnd" >&5
+          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 or --disable-dnd was given.
 if test "${enable_dnd+set}" = set; then
   enableval="$enable_dnd"
           no_cache=0
           # Check whether --enable-dnd or --disable-dnd was given.
 if test "${enable_dnd+set}" = set; then
   enableval="$enable_dnd"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                           else
                             ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                           else
                             ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5708,9 +6384,8 @@ else
                           fi
 
                           ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
                           fi
 
                           ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dnd"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dnd"
           if test "$no_cache" != 1; then


@@ -5718,28 +6393,30 @@ fi
           fi
 
           if test "$wxUSE_DRAG_AND_DROP" = yes; then
           fi
 
           if test "$wxUSE_DRAG_AND_DROP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
-echo "configure:5730: checking for --${enablestring:-enable}-metafile" >&5
+          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 or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
   enableval="$enable_metafile"
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
   enableval="$enable_metafile"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
                             ac_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
                             ac_cv_use_metafile='wxUSE_METAFILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5748,9 +6425,8 @@ else
                           fi
 
                           ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
                           fi
 
                           ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_metafile"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_metafile"
           if test "$no_cache" != 1; then


@@ -5758,31 +6434,33 @@ fi
           fi
 
           if test "$wxUSE_METAFILE" = yes; then
           fi
 
           if test "$wxUSE_METAFILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
 
 
          enablestring=
 
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6
-echo "configure:5773: checking for --${enablestring:-enable}-controls" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-controls or --disable-controls was given.
 if test "${enable_controls+set}" = set; then
   enableval="$enable_controls"
           no_cache=0
           # Check whether --enable-controls or --disable-controls was given.
 if test "${enable_controls+set}" = set; then
   enableval="$enable_controls"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_controls='wxUSE_CONTROLS=yes'
                           else
                             ac_cv_use_controls='wxUSE_CONTROLS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_controls='wxUSE_CONTROLS=yes'
                           else
                             ac_cv_use_controls='wxUSE_CONTROLS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5791,9 +6469,8 @@ else
                           fi
 
                           ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
                           fi
 
                           ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_controls"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_controls"
           if test "$no_cache" != 1; then


@@ -5801,11 +6478,13 @@ fi
           fi
 
           if test "$wxUSE_CONTROLS" = yes; then
           fi
 
           if test "$wxUSE_CONTROLS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_ACCEL=yes
 
 if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_ACCEL=yes


@@ -5886,50 +6565,32 @@ fi
 ## FIXME: This is a blatant hack
 if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
   wxUSE_PRINTING_ARCHITECTURE=no
 ## FIXME: This is a blatant hack
 if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
   wxUSE_PRINTING_ARCHITECTURE=no

-  wxUSE_HELP=no
-  wxUSE_CLIPBOARD=no

   wxUSE_DRAG_AND_DROP=no
   wxUSE_DRAG_AND_DROP=no

-  wxUSE_DATAOBJ=no

   # Generic notebook requires tab dialog
   DEFAULT_wxUSE_TABDIALOG=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   # Generic notebook requires tab dialog
   DEFAULT_wxUSE_TABDIALOG=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no

-  DEFAULT_wxUSE_GAUGE=no

   DEFAULT_wxUSE_SCROLLBAR=no
   DEFAULT_wxUSE_SCROLLBAR=no

-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no

   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAGIMAGE=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAGIMAGE=no

-  DEFAULT_wxUSE_FINDREPLDLG=no
-  DEFAULT_wxUSE_FONTDLG=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NUMBERDLG=no
-  DEFAULT_wxUSE_PROGRESSDLG=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_WIZARDDLG=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STARTUP_TIPS=no

 fi
 
 
          enablestring=
 fi
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6
-echo "configure:5920: checking for --${enablestring:-enable}-accel" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-accel or --disable-accel was given.
 if test "${enable_accel+set}" = set; then
   enableval="$enable_accel"
           no_cache=0
           # Check whether --enable-accel or --disable-accel was given.
 if test "${enable_accel+set}" = set; then
   enableval="$enable_accel"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_accel='wxUSE_ACCEL=yes'
                           else
                             ac_cv_use_accel='wxUSE_ACCEL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_accel='wxUSE_ACCEL=yes'
                           else
                             ac_cv_use_accel='wxUSE_ACCEL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5938,9 +6599,8 @@ else
                           fi
 
                           ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
                           fi
 
                           ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_accel"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_accel"
           if test "$no_cache" != 1; then


@@ -5948,28 +6608,30 @@ fi
           fi
 
           if test "$wxUSE_ACCEL" = yes; then
           fi
 
           if test "$wxUSE_ACCEL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6
-echo "configure:5960: checking for --${enablestring:-enable}-button" >&5
+          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 or --disable-button was given.
 if test "${enable_button+set}" = set; then
   enableval="$enable_button"
           no_cache=0
           # Check whether --enable-button or --disable-button was given.
 if test "${enable_button+set}" = set; then
   enableval="$enable_button"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_button='wxUSE_BUTTON=yes'
                           else
                             ac_cv_use_button='wxUSE_BUTTON=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_button='wxUSE_BUTTON=yes'
                           else
                             ac_cv_use_button='wxUSE_BUTTON=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -5978,9 +6640,8 @@ else
                           fi
 
                           ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON
                           fi
 
                           ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_button"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_button"
           if test "$no_cache" != 1; then


@@ -5988,28 +6649,30 @@ fi
           fi
 
           if test "$wxUSE_BUTTON" = yes; then
           fi
 
           if test "$wxUSE_BUTTON" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6
-echo "configure:6000: checking for --${enablestring:-enable}-bmpbutton" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then
   enableval="$enable_bmpbutton"
           no_cache=0
           # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then
   enableval="$enable_bmpbutton"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                           else
                             ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                           else
                             ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6018,9 +6681,8 @@ else
                           fi
 
                           ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
                           fi
 
                           ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_bmpbutton"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_bmpbutton"
           if test "$no_cache" != 1; then


@@ -6028,28 +6690,30 @@ fi
           fi
 
           if test "$wxUSE_BMPBUTTON" = yes; then
           fi
 
           if test "$wxUSE_BMPBUTTON" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6
-echo "configure:6040: checking for --${enablestring:-enable}-calendar" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-calendar or --disable-calendar was given.
 if test "${enable_calendar+set}" = set; then
   enableval="$enable_calendar"
           no_cache=0
           # Check whether --enable-calendar or --disable-calendar was given.
 if test "${enable_calendar+set}" = set; then
   enableval="$enable_calendar"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_calendar='wxUSE_CALCTRL=yes'
                           else
                             ac_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_calendar='wxUSE_CALCTRL=yes'
                           else
                             ac_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6058,9 +6722,8 @@ else
                           fi
 
                           ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL
                           fi
 
                           ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_calendar"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_calendar"
           if test "$no_cache" != 1; then


@@ -6068,28 +6731,30 @@ fi
           fi
 
           if test "$wxUSE_CALCTRL" = yes; then
           fi
 
           if test "$wxUSE_CALCTRL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6
-echo "configure:6080: checking for --${enablestring:-enable}-caret" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-caret or --disable-caret was given.
 if test "${enable_caret+set}" = set; then
   enableval="$enable_caret"
           no_cache=0
           # Check whether --enable-caret or --disable-caret was given.
 if test "${enable_caret+set}" = set; then
   enableval="$enable_caret"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_caret='wxUSE_CARET=yes'
                           else
                             ac_cv_use_caret='wxUSE_CARET=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_caret='wxUSE_CARET=yes'
                           else
                             ac_cv_use_caret='wxUSE_CARET=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6098,9 +6763,8 @@ else
                           fi
 
                           ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
                           fi
 
                           ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_caret"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_caret"
           if test "$no_cache" != 1; then


@@ -6108,28 +6772,30 @@ fi
           fi
 
           if test "$wxUSE_CARET" = yes; then
           fi
 
           if test "$wxUSE_CARET" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6
-echo "configure:6120: checking for --${enablestring:-enable}-checkbox" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-checkbox or --disable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then
   enableval="$enable_checkbox"
           no_cache=0
           # Check whether --enable-checkbox or --disable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then
   enableval="$enable_checkbox"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
                           else
                             ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
                           else
                             ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6138,9 +6804,8 @@ else
                           fi
 
                           ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
                           fi
 
                           ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_checkbox"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_checkbox"
           if test "$no_cache" != 1; then


@@ -6148,28 +6813,30 @@ fi
           fi
 
           if test "$wxUSE_CHECKBOX" = yes; then
           fi
 
           if test "$wxUSE_CHECKBOX" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6
-echo "configure:6160: checking for --${enablestring:-enable}-checklst" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-checklst or --disable-checklst was given.
 if test "${enable_checklst+set}" = set; then
   enableval="$enable_checklst"
           no_cache=0
           # Check whether --enable-checklst or --disable-checklst was given.
 if test "${enable_checklst+set}" = set; then
   enableval="$enable_checklst"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_checklst='wxUSE_CHECKLST=yes'
                           else
                             ac_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_checklst='wxUSE_CHECKLST=yes'
                           else
                             ac_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6178,9 +6845,8 @@ else
                           fi
 
                           ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
                           fi
 
                           ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_checklst"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_checklst"
           if test "$no_cache" != 1; then


@@ -6188,28 +6854,30 @@ fi
           fi
 
           if test "$wxUSE_CHECKLST" = yes; then
           fi
 
           if test "$wxUSE_CHECKLST" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6
-echo "configure:6200: checking for --${enablestring:-enable}-choice" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-choice or --disable-choice was given.
 if test "${enable_choice+set}" = set; then
   enableval="$enable_choice"
           no_cache=0
           # Check whether --enable-choice or --disable-choice was given.
 if test "${enable_choice+set}" = set; then
   enableval="$enable_choice"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_choice='wxUSE_CHOICE=yes'
                           else
                             ac_cv_use_choice='wxUSE_CHOICE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_choice='wxUSE_CHOICE=yes'
                           else
                             ac_cv_use_choice='wxUSE_CHOICE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6218,9 +6886,8 @@ else
                           fi
 
                           ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
                           fi
 
                           ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_choice"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_choice"
           if test "$no_cache" != 1; then


@@ -6228,28 +6895,30 @@ fi
           fi
 
           if test "$wxUSE_CHOICE" = yes; then
           fi
 
           if test "$wxUSE_CHOICE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6
-echo "configure:6240: checking for --${enablestring:-enable}-combobox" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-combobox or --disable-combobox was given.
 if test "${enable_combobox+set}" = set; then
   enableval="$enable_combobox"
           no_cache=0
           # Check whether --enable-combobox or --disable-combobox was given.
 if test "${enable_combobox+set}" = set; then
   enableval="$enable_combobox"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
                           else
                             ac_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
                           else
                             ac_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6258,9 +6927,8 @@ else
                           fi
 
                           ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
                           fi
 
                           ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_combobox"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_combobox"
           if test "$no_cache" != 1; then


@@ -6268,28 +6936,30 @@ fi
           fi
 
           if test "$wxUSE_COMBOBOX" = yes; then
           fi
 
           if test "$wxUSE_COMBOBOX" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-display""... $ac_c" 1>&6
-echo "configure:6280: checking for --${enablestring:-enable}-display" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-display or --disable-display was given.
 if test "${enable_display+set}" = set; then
   enableval="$enable_display"
           no_cache=0
           # Check whether --enable-display or --disable-display was given.
 if test "${enable_display+set}" = set; then
   enableval="$enable_display"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_display='wxUSE_DISPLAY=yes'
                           else
                             ac_cv_use_display='wxUSE_DISPLAY=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_display='wxUSE_DISPLAY=yes'
                           else
                             ac_cv_use_display='wxUSE_DISPLAY=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6298,9 +6968,8 @@ else
                           fi
 
                           ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY
                           fi
 
                           ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_display"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_display"
           if test "$no_cache" != 1; then


@@ -6308,28 +6977,30 @@ fi
           fi
 
           if test "$wxUSE_DISPLAY" = yes; then
           fi
 
           if test "$wxUSE_DISPLAY" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6
-echo "configure:6320: checking for --${enablestring:-enable}-gauge" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-gauge or --disable-gauge was given.
 if test "${enable_gauge+set}" = set; then
   enableval="$enable_gauge"
           no_cache=0
           # Check whether --enable-gauge or --disable-gauge was given.
 if test "${enable_gauge+set}" = set; then
   enableval="$enable_gauge"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_gauge='wxUSE_GAUGE=yes'
                           else
                             ac_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_gauge='wxUSE_GAUGE=yes'
                           else
                             ac_cv_use_gauge='wxUSE_GAUGE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6338,9 +7009,8 @@ else
                           fi
 
                           ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
                           fi
 
                           ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_gauge"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_gauge"
           if test "$no_cache" != 1; then


@@ -6348,28 +7018,30 @@ fi
           fi
 
           if test "$wxUSE_GAUGE" = yes; then
           fi
 
           if test "$wxUSE_GAUGE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6
-echo "configure:6360: checking for --${enablestring:-enable}-grid" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-grid or --disable-grid was given.
 if test "${enable_grid+set}" = set; then
   enableval="$enable_grid"
           no_cache=0
           # Check whether --enable-grid or --disable-grid was given.
 if test "${enable_grid+set}" = set; then
   enableval="$enable_grid"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_grid='wxUSE_GRID=yes'
                           else
                             ac_cv_use_grid='wxUSE_GRID=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_grid='wxUSE_GRID=yes'
                           else
                             ac_cv_use_grid='wxUSE_GRID=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6378,9 +7050,8 @@ else
                           fi
 
                           ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
                           fi
 
                           ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_grid"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_grid"
           if test "$no_cache" != 1; then


@@ -6388,28 +7059,30 @@ fi
           fi
 
           if test "$wxUSE_GRID" = yes; then
           fi
 
           if test "$wxUSE_GRID" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6
-echo "configure:6400: checking for --${enablestring:-enable}-imaglist" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-imaglist or --disable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then
   enableval="$enable_imaglist"
           no_cache=0
           # Check whether --enable-imaglist or --disable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then
   enableval="$enable_imaglist"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
                           else
                             ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
                           else
                             ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6418,9 +7091,8 @@ else
                           fi
 
                           ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
                           fi
 
                           ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_imaglist"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_imaglist"
           if test "$no_cache" != 1; then


@@ -6428,28 +7100,30 @@ fi
           fi
 
           if test "$wxUSE_IMAGLIST" = yes; then
           fi
 
           if test "$wxUSE_IMAGLIST" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6
-echo "configure:6440: checking for --${enablestring:-enable}-listbox" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-listbox or --disable-listbox was given.
 if test "${enable_listbox+set}" = set; then
   enableval="$enable_listbox"
           no_cache=0
           # Check whether --enable-listbox or --disable-listbox was given.
 if test "${enable_listbox+set}" = set; then
   enableval="$enable_listbox"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_listbox='wxUSE_LISTBOX=yes'
                           else
                             ac_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_listbox='wxUSE_LISTBOX=yes'
                           else
                             ac_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6458,9 +7132,8 @@ else
                           fi
 
                           ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
                           fi
 
                           ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_listbox"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_listbox"
           if test "$no_cache" != 1; then


@@ -6468,28 +7141,30 @@ fi
           fi
 
           if test "$wxUSE_LISTBOX" = yes; then
           fi
 
           if test "$wxUSE_LISTBOX" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6
-echo "configure:6480: checking for --${enablestring:-enable}-listctrl" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-listctrl or --disable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then
   enableval="$enable_listctrl"
           no_cache=0
           # Check whether --enable-listctrl or --disable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then
   enableval="$enable_listctrl"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                           else
                             ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                           else
                             ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6498,9 +7173,8 @@ else
                           fi
 
                           ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
                           fi
 
                           ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_listctrl"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_listctrl"
           if test "$no_cache" != 1; then


@@ -6508,28 +7182,30 @@ fi
           fi
 
           if test "$wxUSE_LISTCTRL" = yes; then
           fi
 
           if test "$wxUSE_LISTCTRL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6
-echo "configure:6520: checking for --${enablestring:-enable}-notebook" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-notebook or --disable-notebook was given.
 if test "${enable_notebook+set}" = set; then
   enableval="$enable_notebook"
           no_cache=0
           # Check whether --enable-notebook or --disable-notebook was given.
 if test "${enable_notebook+set}" = set; then
   enableval="$enable_notebook"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                           else
                             ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                           else
                             ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6538,9 +7214,8 @@ else
                           fi
 
                           ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
                           fi
 
                           ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_notebook"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_notebook"
           if test "$no_cache" != 1; then


@@ -6548,28 +7223,30 @@ fi
           fi
 
           if test "$wxUSE_NOTEBOOK" = yes; then
           fi
 
           if test "$wxUSE_NOTEBOOK" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6
-echo "configure:6560: checking for --${enablestring:-enable}-radiobox" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-radiobox or --disable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then
   enableval="$enable_radiobox"
           no_cache=0
           # Check whether --enable-radiobox or --disable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then
   enableval="$enable_radiobox"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                           else
                             ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                           else
                             ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6578,9 +7255,8 @@ else
                           fi
 
                           ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
                           fi
 
                           ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_radiobox"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_radiobox"
           if test "$no_cache" != 1; then


@@ -6588,28 +7264,30 @@ fi
           fi
 
           if test "$wxUSE_RADIOBOX" = yes; then
           fi
 
           if test "$wxUSE_RADIOBOX" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6
-echo "configure:6600: checking for --${enablestring:-enable}-radiobtn" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-radiobtn or --disable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then
   enableval="$enable_radiobtn"
           no_cache=0
           # Check whether --enable-radiobtn or --disable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then
   enableval="$enable_radiobtn"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                           else
                             ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                           else
                             ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6618,9 +7296,8 @@ else
                           fi
 
                           ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
                           fi
 
                           ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_radiobtn"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_radiobtn"
           if test "$no_cache" != 1; then


@@ -6628,28 +7305,30 @@ fi
           fi
 
           if test "$wxUSE_RADIOBTN" = yes; then
           fi
 
           if test "$wxUSE_RADIOBTN" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6
-echo "configure:6640: checking for --${enablestring:-enable}-sash" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-sash or --disable-sash was given.
 if test "${enable_sash+set}" = set; then
   enableval="$enable_sash"
           no_cache=0
           # Check whether --enable-sash or --disable-sash was given.
 if test "${enable_sash+set}" = set; then
   enableval="$enable_sash"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_sash='wxUSE_SASH=yes'
                           else
                             ac_cv_use_sash='wxUSE_SASH=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_sash='wxUSE_SASH=yes'
                           else
                             ac_cv_use_sash='wxUSE_SASH=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6658,9 +7337,8 @@ else
                           fi
 
                           ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
                           fi
 
                           ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_sash"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_sash"
           if test "$no_cache" != 1; then


@@ -6668,28 +7346,30 @@ fi
           fi
 
           if test "$wxUSE_SASH" = yes; then
           fi
 
           if test "$wxUSE_SASH" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6
-echo "configure:6680: checking for --${enablestring:-enable}-scrollbar" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
   enableval="$enable_scrollbar"
           no_cache=0
           # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
   enableval="$enable_scrollbar"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                           else
                             ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                           else
                             ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6698,9 +7378,8 @@ else
                           fi
 
                           ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
                           fi
 
                           ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_scrollbar"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_scrollbar"
           if test "$no_cache" != 1; then


@@ -6708,28 +7387,30 @@ fi
           fi
 
           if test "$wxUSE_SCROLLBAR" = yes; then
           fi
 
           if test "$wxUSE_SCROLLBAR" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6
-echo "configure:6720: checking for --${enablestring:-enable}-slider" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-slider or --disable-slider was given.
 if test "${enable_slider+set}" = set; then
   enableval="$enable_slider"
           no_cache=0
           # Check whether --enable-slider or --disable-slider was given.
 if test "${enable_slider+set}" = set; then
   enableval="$enable_slider"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_slider='wxUSE_SLIDER=yes'
                           else
                             ac_cv_use_slider='wxUSE_SLIDER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_slider='wxUSE_SLIDER=yes'
                           else
                             ac_cv_use_slider='wxUSE_SLIDER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6738,9 +7419,8 @@ else
                           fi
 
                           ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
                           fi
 
                           ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_slider"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_slider"
           if test "$no_cache" != 1; then


@@ -6748,28 +7428,30 @@ fi
           fi
 
           if test "$wxUSE_SLIDER" = yes; then
           fi
 
           if test "$wxUSE_SLIDER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6
-echo "configure:6760: checking for --${enablestring:-enable}-spinbtn" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-spinbtn or --disable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then
   enableval="$enable_spinbtn"
           no_cache=0
           # Check whether --enable-spinbtn or --disable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then
   enableval="$enable_spinbtn"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                           else
                             ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                           else
                             ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6778,9 +7460,8 @@ else
                           fi
 
                           ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
                           fi
 
                           ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_spinbtn"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_spinbtn"
           if test "$no_cache" != 1; then


@@ -6788,28 +7469,30 @@ fi
           fi
 
           if test "$wxUSE_SPINBTN" = yes; then
           fi
 
           if test "$wxUSE_SPINBTN" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6
-echo "configure:6800: checking for --${enablestring:-enable}-spinctrl" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-spinctrl or --disable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then
   enableval="$enable_spinctrl"
           no_cache=0
           # Check whether --enable-spinctrl or --disable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then
   enableval="$enable_spinctrl"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                           else
                             ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                           else
                             ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6818,9 +7501,8 @@ else
                           fi
 
                           ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
                           fi
 
                           ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_spinctrl"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_spinctrl"
           if test "$no_cache" != 1; then


@@ -6828,28 +7510,30 @@ fi
           fi
 
           if test "$wxUSE_SPINCTRL" = yes; then
           fi
 
           if test "$wxUSE_SPINCTRL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6
-echo "configure:6840: checking for --${enablestring:-enable}-splitter" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-splitter or --disable-splitter was given.
 if test "${enable_splitter+set}" = set; then
   enableval="$enable_splitter"
           no_cache=0
           # Check whether --enable-splitter or --disable-splitter was given.
 if test "${enable_splitter+set}" = set; then
   enableval="$enable_splitter"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_splitter='wxUSE_SPLITTER=yes'
                           else
                             ac_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_splitter='wxUSE_SPLITTER=yes'
                           else
                             ac_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6858,9 +7542,8 @@ else
                           fi
 
                           ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
                           fi
 
                           ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_splitter"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_splitter"
           if test "$no_cache" != 1; then


@@ -6868,28 +7551,30 @@ fi
           fi
 
           if test "$wxUSE_SPLITTER" = yes; then
           fi
 
           if test "$wxUSE_SPLITTER" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6
-echo "configure:6880: checking for --${enablestring:-enable}-statbmp" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-statbmp or --disable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then
   enableval="$enable_statbmp"
           no_cache=0
           # Check whether --enable-statbmp or --disable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then
   enableval="$enable_statbmp"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_statbmp='wxUSE_STATBMP=yes'
                           else
                             ac_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_statbmp='wxUSE_STATBMP=yes'
                           else
                             ac_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6898,9 +7583,8 @@ else
                           fi
 
                           ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
                           fi
 
                           ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_statbmp"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_statbmp"
           if test "$no_cache" != 1; then


@@ -6908,28 +7592,30 @@ fi
           fi
 
           if test "$wxUSE_STATBMP" = yes; then
           fi
 
           if test "$wxUSE_STATBMP" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6
-echo "configure:6920: checking for --${enablestring:-enable}-statbox" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-statbox or --disable-statbox was given.
 if test "${enable_statbox+set}" = set; then
   enableval="$enable_statbox"
           no_cache=0
           # Check whether --enable-statbox or --disable-statbox was given.
 if test "${enable_statbox+set}" = set; then
   enableval="$enable_statbox"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_statbox='wxUSE_STATBOX=yes'
                           else
                             ac_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_statbox='wxUSE_STATBOX=yes'
                           else
                             ac_cv_use_statbox='wxUSE_STATBOX=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6938,9 +7624,8 @@ else
                           fi
 
                           ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
                           fi
 
                           ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_statbox"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_statbox"
           if test "$no_cache" != 1; then


@@ -6948,28 +7633,30 @@ fi
           fi
 
           if test "$wxUSE_STATBOX" = yes; then
           fi
 
           if test "$wxUSE_STATBOX" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6
-echo "configure:6960: checking for --${enablestring:-enable}-statline" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-statline or --disable-statline was given.
 if test "${enable_statline+set}" = set; then
   enableval="$enable_statline"
           no_cache=0
           # Check whether --enable-statline or --disable-statline was given.
 if test "${enable_statline+set}" = set; then
   enableval="$enable_statline"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_statline='wxUSE_STATLINE=yes'
                           else
                             ac_cv_use_statline='wxUSE_STATLINE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_statline='wxUSE_STATLINE=yes'
                           else
                             ac_cv_use_statline='wxUSE_STATLINE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -6978,9 +7665,8 @@ else
                           fi
 
                           ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
                           fi
 
                           ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_statline"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_statline"
           if test "$no_cache" != 1; then


@@ -6988,28 +7674,30 @@ fi
           fi
 
           if test "$wxUSE_STATLINE" = yes; then
           fi
 
           if test "$wxUSE_STATLINE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6
-echo "configure:7000: checking for --${enablestring:-enable}-stattext" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-stattext or --disable-stattext was given.
 if test "${enable_stattext+set}" = set; then
   enableval="$enable_stattext"
           no_cache=0
           # Check whether --enable-stattext or --disable-stattext was given.
 if test "${enable_stattext+set}" = set; then
   enableval="$enable_stattext"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_stattext='wxUSE_STATTEXT=yes'
                           else
                             ac_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_stattext='wxUSE_STATTEXT=yes'
                           else
                             ac_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7018,9 +7706,8 @@ else
                           fi
 
                           ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
                           fi
 
                           ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_stattext"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_stattext"
           if test "$no_cache" != 1; then


@@ -7028,28 +7715,30 @@ fi
           fi
 
           if test "$wxUSE_STATTEXT" = yes; then
           fi
 
           if test "$wxUSE_STATTEXT" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6
-echo "configure:7040: checking for --${enablestring:-enable}-statusbar" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-statusbar or --disable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then
   enableval="$enable_statusbar"
           no_cache=0
           # Check whether --enable-statusbar or --disable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then
   enableval="$enable_statusbar"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
                           else
                             ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
                           else
                             ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7058,9 +7747,8 @@ else
                           fi
 
                           ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
                           fi
 
                           ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_statusbar"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_statusbar"
           if test "$no_cache" != 1; then


@@ -7068,28 +7756,30 @@ fi
           fi
 
           if test "$wxUSE_STATUSBAR" = yes; then
           fi
 
           if test "$wxUSE_STATUSBAR" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6
-echo "configure:7080: checking for --${enablestring:-enable}-tabdialog" >&5
+          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 or --disable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then
   enableval="$enable_tabdialog"
           no_cache=0
           # Check whether --enable-tabdialog or --disable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then
   enableval="$enable_tabdialog"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
                           else
                             ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
                           else
                             ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7098,9 +7788,8 @@ else
                           fi
 
                           ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
                           fi
 
                           ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_tabdialog"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_tabdialog"
           if test "$no_cache" != 1; then


@@ -7108,28 +7797,30 @@ fi
           fi
 
           if test "$wxUSE_TABDIALOG" = yes; then
           fi
 
           if test "$wxUSE_TABDIALOG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6
-echo "configure:7120: checking for --${enablestring:-enable}-textctrl" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-textctrl or --disable-textctrl was given.
 if test "${enable_textctrl+set}" = set; then
   enableval="$enable_textctrl"
           no_cache=0
           # Check whether --enable-textctrl or --disable-textctrl was given.
 if test "${enable_textctrl+set}" = set; then
   enableval="$enable_textctrl"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                           else
                             ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                           else
                             ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7138,9 +7829,8 @@ else
                           fi
 
                           ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
                           fi
 
                           ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_textctrl"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_textctrl"
           if test "$no_cache" != 1; then


@@ -7148,28 +7838,30 @@ fi
           fi
 
           if test "$wxUSE_TEXTCTRL" = yes; then
           fi
 
           if test "$wxUSE_TEXTCTRL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6
-echo "configure:7160: checking for --${enablestring:-enable}-togglebtn" >&5
+          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 or --disable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then
   enableval="$enable_togglebtn"
           no_cache=0
           # Check whether --enable-togglebtn or --disable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then
   enableval="$enable_togglebtn"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                           else
                             ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                           else
                             ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7178,9 +7870,8 @@ else
                           fi
 
                           ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
                           fi
 
                           ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_togglebtn"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_togglebtn"
           if test "$no_cache" != 1; then


@@ -7188,28 +7879,30 @@ fi
           fi
 
           if test "$wxUSE_TOGGLEBTN" = yes; then
           fi
 
           if test "$wxUSE_TOGGLEBTN" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6
-echo "configure:7200: checking for --${enablestring:-enable}-toolbar" >&5
+          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 or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
   enableval="$enable_toolbar"
           no_cache=0
           # Check whether --enable-toolbar or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
   enableval="$enable_toolbar"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                           else
                             ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                           else
                             ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7218,9 +7911,8 @@ else
                           fi
 
                           ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
                           fi
 
                           ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_toolbar"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_toolbar"
           if test "$no_cache" != 1; then


@@ -7228,28 +7920,30 @@ fi
           fi
 
           if test "$wxUSE_TOOLBAR" = yes; then
           fi
 
           if test "$wxUSE_TOOLBAR" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6
-echo "configure:7240: checking for --${enablestring:-enable}-tbarnative" >&5
+          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 or --disable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then
   enableval="$enable_tbarnative"
           no_cache=0
           # Check whether --enable-tbarnative or --disable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then
   enableval="$enable_tbarnative"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                           else
                             ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                           else
                             ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7258,9 +7952,8 @@ else
                           fi
 
                           ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
                           fi
 
                           ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_tbarnative"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_tbarnative"
           if test "$no_cache" != 1; then


@@ -7268,28 +7961,30 @@ fi
           fi
 
           if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
           fi
 
           if test "$wxUSE_TOOLBAR_NATIVE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6
-echo "configure:7280: checking for --${enablestring:-enable}-tbarsmpl" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarsmpl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tbarsmpl... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
 if test "${enable_tbarsmpl+set}" = set; then
   enableval="$enable_tbarsmpl"
           no_cache=0
           # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
 if test "${enable_tbarsmpl+set}" = set; then
   enableval="$enable_tbarsmpl"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
                           else
                             ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
                           else
                             ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7298,9 +7993,8 @@ else
                           fi
 
                           ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
                           fi
 
                           ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_tbarsmpl"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_tbarsmpl"
           if test "$no_cache" != 1; then


@@ -7308,28 +8002,30 @@ fi
           fi
 
           if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
           fi
 
           if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6
-echo "configure:7320: checking for --${enablestring:-enable}-treectrl" >&5
+          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 or --disable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then
   enableval="$enable_treectrl"
           no_cache=0
           # Check whether --enable-treectrl or --disable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then
   enableval="$enable_treectrl"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
                           else
                             ac_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
                           else
                             ac_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7338,9 +8034,8 @@ else
                           fi
 
                           ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
                           fi
 
                           ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_treectrl"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_treectrl"
           if test "$no_cache" != 1; then


@@ -7348,28 +8043,30 @@ fi
           fi
 
           if test "$wxUSE_TREECTRL" = yes; then
           fi
 
           if test "$wxUSE_TREECTRL" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6
-echo "configure:7360: checking for --${enablestring:-enable}-tipwindow" >&5
+          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 or --disable-tipwindow was given.
 if test "${enable_tipwindow+set}" = set; then
   enableval="$enable_tipwindow"
           no_cache=0
           # Check whether --enable-tipwindow or --disable-tipwindow was given.
 if test "${enable_tipwindow+set}" = set; then
   enableval="$enable_tipwindow"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                           else
                             ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                           else
                             ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7378,9 +8075,8 @@ else
                           fi
 
                           ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW
                           fi
 
                           ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_tipwindow"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_tipwindow"
           if test "$no_cache" != 1; then


@@ -7388,28 +8084,30 @@ fi
           fi
 
           if test "$wxUSE_TIPWINDOW" = yes; then
           fi
 
           if test "$wxUSE_TIPWINDOW" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6
-echo "configure:7400: checking for --${enablestring:-enable}-popupwin" >&5
+          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 or --disable-popupwin was given.
 if test "${enable_popupwin+set}" = set; then
   enableval="$enable_popupwin"
           no_cache=0
           # Check whether --enable-popupwin or --disable-popupwin was given.
 if test "${enable_popupwin+set}" = set; then
   enableval="$enable_popupwin"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
                           else
                             ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
                           else
                             ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7418,9 +8116,8 @@ else
                           fi
 
                           ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN
                           fi
 
                           ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_popupwin"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_popupwin"
           if test "$no_cache" != 1; then


@@ -7428,30 +8125,32 @@ fi
           fi
 
           if test "$wxUSE_POPUPWIN" = yes; then
           fi
 
           if test "$wxUSE_POPUPWIN" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
 
          enablestring=
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6
-echo "configure:7442: checking for --${enablestring:-enable}-commondlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-commondlg or --disable-commondlg was given.
 if test "${enable_commondlg+set}" = set; then
   enableval="$enable_commondlg"
           no_cache=0
           # Check whether --enable-commondlg or --disable-commondlg was given.
 if test "${enable_commondlg+set}" = set; then
   enableval="$enable_commondlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
                           else
                             ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
                           else
                             ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7460,9 +8159,8 @@ else
                           fi
 
                           ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
                           fi
 
                           ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_commondlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_commondlg"
           if test "$no_cache" != 1; then


@@ -7470,28 +8168,30 @@ fi
           fi
 
           if test "$wxUSE_COMMONDLGS" = yes; then
           fi
 
           if test "$wxUSE_COMMONDLGS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6
-echo "configure:7482: checking for --${enablestring:-enable}-choicedlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-choicedlg or --disable-choicedlg was given.
 if test "${enable_choicedlg+set}" = set; then
   enableval="$enable_choicedlg"
           no_cache=0
           # Check whether --enable-choicedlg or --disable-choicedlg was given.
 if test "${enable_choicedlg+set}" = set; then
   enableval="$enable_choicedlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
                           else
                             ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
                           else
                             ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7500,9 +8200,8 @@ else
                           fi
 
                           ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG
                           fi
 
                           ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_choicedlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_choicedlg"
           if test "$no_cache" != 1; then


@@ -7510,28 +8209,30 @@ fi
           fi
 
           if test "$wxUSE_CHOICEDLG" = yes; then
           fi
 
           if test "$wxUSE_CHOICEDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6
-echo "configure:7522: checking for --${enablestring:-enable}-coldlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-coldlg or --disable-coldlg was given.
 if test "${enable_coldlg+set}" = set; then
   enableval="$enable_coldlg"
           no_cache=0
           # Check whether --enable-coldlg or --disable-coldlg was given.
 if test "${enable_coldlg+set}" = set; then
   enableval="$enable_coldlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
                           else
                             ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
                           else
                             ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7540,9 +8241,8 @@ else
                           fi
 
                           ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG
                           fi
 
                           ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_coldlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_coldlg"
           if test "$no_cache" != 1; then


@@ -7550,28 +8250,30 @@ fi
           fi
 
           if test "$wxUSE_COLOURDLG" = yes; then
           fi
 
           if test "$wxUSE_COLOURDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6
-echo "configure:7562: checking for --${enablestring:-enable}-filedlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-filedlg or --disable-filedlg was given.
 if test "${enable_filedlg+set}" = set; then
   enableval="$enable_filedlg"
           no_cache=0
           # Check whether --enable-filedlg or --disable-filedlg was given.
 if test "${enable_filedlg+set}" = set; then
   enableval="$enable_filedlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
                           else
                             ac_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
                           else
                             ac_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7580,9 +8282,8 @@ else
                           fi
 
                           ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG
                           fi
 
                           ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_filedlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_filedlg"
           if test "$no_cache" != 1; then


@@ -7590,28 +8291,30 @@ fi
           fi
 
           if test "$wxUSE_FILEDLG" = yes; then
           fi
 
           if test "$wxUSE_FILEDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6
-echo "configure:7602: checking for --${enablestring:-enable}-finddlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-finddlg or --disable-finddlg was given.
 if test "${enable_finddlg+set}" = set; then
   enableval="$enable_finddlg"
           no_cache=0
           # Check whether --enable-finddlg or --disable-finddlg was given.
 if test "${enable_finddlg+set}" = set; then
   enableval="$enable_finddlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
                           else
                             ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
                           else
                             ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7620,9 +8323,8 @@ else
                           fi
 
                           ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
                           fi
 
                           ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_finddlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_finddlg"
           if test "$no_cache" != 1; then


@@ -7630,28 +8332,30 @@ fi
           fi
 
           if test "$wxUSE_FINDREPLDLG" = yes; then
           fi
 
           if test "$wxUSE_FINDREPLDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6
-echo "configure:7642: checking for --${enablestring:-enable}-fontdlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-fontdlg or --disable-fontdlg was given.
 if test "${enable_fontdlg+set}" = set; then
   enableval="$enable_fontdlg"
           no_cache=0
           # Check whether --enable-fontdlg or --disable-fontdlg was given.
 if test "${enable_fontdlg+set}" = set; then
   enableval="$enable_fontdlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
                           else
                             ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
                           else
                             ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7660,9 +8364,8 @@ else
                           fi
 
                           ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG
                           fi
 
                           ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_fontdlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_fontdlg"
           if test "$no_cache" != 1; then


@@ -7670,28 +8373,30 @@ fi
           fi
 
           if test "$wxUSE_FONTDLG" = yes; then
           fi
 
           if test "$wxUSE_FONTDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6
-echo "configure:7682: checking for --${enablestring:-enable}-dirdlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-dirdlg or --disable-dirdlg was given.
 if test "${enable_dirdlg+set}" = set; then
   enableval="$enable_dirdlg"
           no_cache=0
           # Check whether --enable-dirdlg or --disable-dirdlg was given.
 if test "${enable_dirdlg+set}" = set; then
   enableval="$enable_dirdlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
                           else
                             ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
                           else
                             ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7700,9 +8405,8 @@ else
                           fi
 
                           ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
                           fi
 
                           ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dirdlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dirdlg"
           if test "$no_cache" != 1; then


@@ -7710,28 +8414,30 @@ fi
           fi
 
           if test "$wxUSE_DIRDLG" = yes; then
           fi
 
           if test "$wxUSE_DIRDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6
-echo "configure:7722: checking for --${enablestring:-enable}-msgdlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-msgdlg or --disable-msgdlg was given.
 if test "${enable_msgdlg+set}" = set; then
   enableval="$enable_msgdlg"
           no_cache=0
           # Check whether --enable-msgdlg or --disable-msgdlg was given.
 if test "${enable_msgdlg+set}" = set; then
   enableval="$enable_msgdlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
                           else
                             ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
                           else
                             ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7740,9 +8446,8 @@ else
                           fi
 
                           ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG
                           fi
 
                           ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_msgdlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_msgdlg"
           if test "$no_cache" != 1; then


@@ -7750,28 +8455,30 @@ fi
           fi
 
           if test "$wxUSE_MSGDLG" = yes; then
           fi
 
           if test "$wxUSE_MSGDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6
-echo "configure:7762: checking for --${enablestring:-enable}-numberdlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-numberdlg or --disable-numberdlg was given.
 if test "${enable_numberdlg+set}" = set; then
   enableval="$enable_numberdlg"
           no_cache=0
           # Check whether --enable-numberdlg or --disable-numberdlg was given.
 if test "${enable_numberdlg+set}" = set; then
   enableval="$enable_numberdlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
                           else
                             ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
                           else
                             ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7780,9 +8487,8 @@ else
                           fi
 
                           ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG
                           fi
 
                           ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_numberdlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_numberdlg"
           if test "$no_cache" != 1; then


@@ -7790,28 +8496,30 @@ fi
           fi
 
           if test "$wxUSE_NUMBERDLG" = yes; then
           fi
 
           if test "$wxUSE_NUMBERDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6
-echo "configure:7802: checking for --${enablestring:-enable}-splash" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-splash or --disable-splash was given.
 if test "${enable_splash+set}" = set; then
   enableval="$enable_splash"
           no_cache=0
           # Check whether --enable-splash or --disable-splash was given.
 if test "${enable_splash+set}" = set; then
   enableval="$enable_splash"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_splash='wxUSE_SPLASH=yes'
                           else
                             ac_cv_use_splash='wxUSE_SPLASH=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_splash='wxUSE_SPLASH=yes'
                           else
                             ac_cv_use_splash='wxUSE_SPLASH=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7820,9 +8528,8 @@ else
                           fi
 
                           ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH
                           fi
 
                           ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_splash"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_splash"
           if test "$no_cache" != 1; then


@@ -7830,28 +8537,30 @@ fi
           fi
 
           if test "$wxUSE_SPLASH" = yes; then
           fi
 
           if test "$wxUSE_SPLASH" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6
-echo "configure:7842: checking for --${enablestring:-enable}-textdlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
   enableval="$enable_textdlg"
           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
   enableval="$enable_textdlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
                           else
                             ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
                           else
                             ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7860,9 +8569,8 @@ else
                           fi
 
                           ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
                           fi
 
                           ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_textdlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_textdlg"
           if test "$no_cache" != 1; then


@@ -7870,28 +8578,30 @@ fi
           fi
 
           if test "$wxUSE_TEXTDLG" = yes; then
           fi
 
           if test "$wxUSE_TEXTDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6
-echo "configure:7882: checking for --${enablestring:-enable}-tipdlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
   enableval="$enable_tipdlg"
           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
   enableval="$enable_tipdlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
                           else
                             ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
                           else
                             ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7900,9 +8610,8 @@ else
                           fi
 
                           ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
                           fi
 
                           ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_tipdlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_tipdlg"
           if test "$no_cache" != 1; then


@@ -7910,28 +8619,30 @@ fi
           fi
 
           if test "$wxUSE_STARTUP_TIPS" = yes; then
           fi
 
           if test "$wxUSE_STARTUP_TIPS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6
-echo "configure:7922: checking for --${enablestring:-enable}-progressdlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
   enableval="$enable_progressdlg"
           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
   enableval="$enable_progressdlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
                           else
                             ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
                           else
                             ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7940,9 +8651,8 @@ else
                           fi
 
                           ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
                           fi
 
                           ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_progressdlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_progressdlg"
           if test "$no_cache" != 1; then


@@ -7950,28 +8660,30 @@ fi
           fi
 
           if test "$wxUSE_PROGRESSDLG" = yes; then
           fi
 
           if test "$wxUSE_PROGRESSDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6
-echo "configure:7962: checking for --${enablestring:-enable}-wizarddlg" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
 if test "${enable_wizarddlg+set}" = set; then
   enableval="$enable_wizarddlg"
           no_cache=0
           # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
 if test "${enable_wizarddlg+set}" = set; then
   enableval="$enable_wizarddlg"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
                           else
                             ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
                           else
                             ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -7980,9 +8692,8 @@ else
                           fi
 
                           ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG
                           fi
 
                           ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_wizarddlg"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_wizarddlg"
           if test "$no_cache" != 1; then


@@ -7990,30 +8701,32 @@ fi
           fi
 
           if test "$wxUSE_WIZARDDLG" = yes; then
           fi
 
           if test "$wxUSE_WIZARDDLG" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
 
          enablestring=
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6
-echo "configure:8004: checking for --${enablestring:-enable}-menus" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-menus or --disable-menus was given.
 if test "${enable_menus+set}" = set; then
   enableval="$enable_menus"
           no_cache=0
           # Check whether --enable-menus or --disable-menus was given.
 if test "${enable_menus+set}" = set; then
   enableval="$enable_menus"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_menus='wxUSE_MENUS=yes'
                           else
                             ac_cv_use_menus='wxUSE_MENUS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_menus='wxUSE_MENUS=yes'
                           else
                             ac_cv_use_menus='wxUSE_MENUS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8022,9 +8735,8 @@ else
                           fi
 
                           ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS
                           fi
 
                           ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_menus"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_menus"
           if test "$no_cache" != 1; then


@@ -8032,28 +8744,30 @@ fi
           fi
 
           if test "$wxUSE_MENUS" = yes; then
           fi
 
           if test "$wxUSE_MENUS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6
-echo "configure:8044: checking for --${enablestring:-enable}-miniframe" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-miniframe or --disable-miniframe was given.
 if test "${enable_miniframe+set}" = set; then
   enableval="$enable_miniframe"
           no_cache=0
           # Check whether --enable-miniframe or --disable-miniframe was given.
 if test "${enable_miniframe+set}" = set; then
   enableval="$enable_miniframe"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
                           else
                             ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
                           else
                             ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8062,9 +8776,8 @@ else
                           fi
 
                           ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
                           fi
 
                           ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_miniframe"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_miniframe"
           if test "$no_cache" != 1; then


@@ -8072,28 +8785,30 @@ fi
           fi
 
           if test "$wxUSE_MINIFRAME" = yes; then
           fi
 
           if test "$wxUSE_MINIFRAME" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6
-echo "configure:8084: checking for --${enablestring:-enable}-tooltips" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
   enableval="$enable_tooltips"
           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
   enableval="$enable_tooltips"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
                           else
                             ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
                           else
                             ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8102,9 +8817,8 @@ else
                           fi
 
                           ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
                           fi
 
                           ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_tooltips"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_tooltips"
           if test "$no_cache" != 1; then


@@ -8112,28 +8826,30 @@ fi
           fi
 
           if test "$wxUSE_TOOLTIPS" = yes; then
           fi
 
           if test "$wxUSE_TOOLTIPS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6
-echo "configure:8124: checking for --${enablestring:-enable}-splines" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then
   enableval="$enable_splines"
           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then
   enableval="$enable_splines"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_splines='wxUSE_SPLINES=yes'
                           else
                             ac_cv_use_splines='wxUSE_SPLINES=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_splines='wxUSE_SPLINES=yes'
                           else
                             ac_cv_use_splines='wxUSE_SPLINES=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8142,9 +8858,8 @@ else
                           fi
 
                           ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
                           fi
 
                           ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_splines"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_splines"
           if test "$no_cache" != 1; then


@@ -8152,28 +8867,30 @@ fi
           fi
 
           if test "$wxUSE_SPLINES" = yes; then
           fi
 
           if test "$wxUSE_SPLINES" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6
-echo "configure:8164: checking for --${enablestring:-enable}-validators" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then
   enableval="$enable_validators"
           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then
   enableval="$enable_validators"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_validators='wxUSE_VALIDATORS=yes'
                           else
                             ac_cv_use_validators='wxUSE_VALIDATORS=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_validators='wxUSE_VALIDATORS=yes'
                           else
                             ac_cv_use_validators='wxUSE_VALIDATORS=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8182,9 +8899,8 @@ else
                           fi
 
                           ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS
                           fi
 
                           ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_validators"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_validators"
           if test "$no_cache" != 1; then


@@ -8192,28 +8908,30 @@ fi
           fi
 
           if test "$wxUSE_VALIDATORS" = yes; then
           fi
 
           if test "$wxUSE_VALIDATORS" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-busyinfo""... $ac_c" 1>&6
-echo "configure:8204: checking for --${enablestring:-enable}-busyinfo" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
   enableval="$enable_busyinfo"
           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
   enableval="$enable_busyinfo"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
                           else
                             ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
                           else
                             ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8222,9 +8940,8 @@ else
                           fi
 
                           ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
                           fi
 
                           ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_busyinfo"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_busyinfo"
           if test "$no_cache" != 1; then


@@ -8232,28 +8949,30 @@ fi
           fi
 
           if test "$wxUSE_BUSYINFO" = yes; then
           fi
 
           if test "$wxUSE_BUSYINFO" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6
-echo "configure:8244: checking for --${enablestring:-enable}-joystick" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then
   enableval="$enable_joystick"
           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then
   enableval="$enable_joystick"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
                           else
                             ac_cv_use_joystick='wxUSE_JOYSTICK=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
                           else
                             ac_cv_use_joystick='wxUSE_JOYSTICK=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8262,9 +8981,8 @@ else
                           fi
 
                           ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK
                           fi
 
                           ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_joystick"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_joystick"
           if test "$no_cache" != 1; then


@@ -8272,28 +8990,30 @@ fi
           fi
 
           if test "$wxUSE_JOYSTICK" = yes; then
           fi
 
           if test "$wxUSE_JOYSTICK" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
-echo "configure:8284: checking for --${enablestring:-enable}-metafile" >&5
+          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 or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
   enableval="$enable_metafile"
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
   enableval="$enable_metafile"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
                             ac_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
                             ac_cv_use_metafile='wxUSE_METAFILE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8302,9 +9022,8 @@ else
                           fi
 
                           ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
                           fi
 
                           ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_metafile"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_metafile"
           if test "$no_cache" != 1; then


@@ -8312,28 +9031,30 @@ fi
           fi
 
           if test "$wxUSE_METAFILE" = yes; then
           fi
 
           if test "$wxUSE_METAFILE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6
-echo "configure:8324: checking for --${enablestring:-enable}-dragimage" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-dragimage or --disable-dragimage was given.
 if test "${enable_dragimage+set}" = set; then
   enableval="$enable_dragimage"
           no_cache=0
           # Check whether --enable-dragimage or --disable-dragimage was given.
 if test "${enable_dragimage+set}" = set; then
   enableval="$enable_dragimage"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
                           else
                             ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
                           else
                             ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8342,9 +9063,8 @@ else
                           fi
 
                           ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE
                           fi
 
                           ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_dragimage"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_dragimage"
           if test "$no_cache" != 1; then


@@ -8352,28 +9072,30 @@ fi
           fi
 
           if test "$wxUSE_DRAGIMAGE" = yes; then
           fi
 
           if test "$wxUSE_DRAGIMAGE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-accessibility""... $ac_c" 1>&6
-echo "configure:8364: checking for --${enablestring:-enable}-accessibility" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-accessibility or --disable-accessibility was given.
 if test "${enable_accessibility+set}" = set; then
   enableval="$enable_accessibility"
           no_cache=0
           # Check whether --enable-accessibility or --disable-accessibility was given.
 if test "${enable_accessibility+set}" = set; then
   enableval="$enable_accessibility"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
                           else
                             ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
                           else
                             ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8382,9 +9104,8 @@ else
                           fi
 
                           ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY
                           fi
 
                           ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_accessibility"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_accessibility"
           if test "$no_cache" != 1; then


@@ -8392,30 +9113,32 @@ fi
           fi
 
           if test "$wxUSE_ACCESSIBILITY" = yes; then
           fi
 
           if test "$wxUSE_ACCESSIBILITY" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
 
 
          enablestring=
 
 
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6
-echo "configure:8406: checking for --${enablestring:-enable}-palette" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-palette or --disable-palette was given.
 if test "${enable_palette+set}" = set; then
   enableval="$enable_palette"
           no_cache=0
           # Check whether --enable-palette or --disable-palette was given.
 if test "${enable_palette+set}" = set; then
   enableval="$enable_palette"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_palette='wxUSE_PALETTE=yes'
                           else
                             ac_cv_use_palette='wxUSE_PALETTE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_palette='wxUSE_PALETTE=yes'
                           else
                             ac_cv_use_palette='wxUSE_PALETTE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8424,9 +9147,8 @@ else
                           fi
 
                           ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE
                           fi
 
                           ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_palette"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_palette"
           if test "$no_cache" != 1; then


@@ -8434,28 +9156,30 @@ fi
           fi
 
           if test "$wxUSE_PALETTE" = yes; then
           fi
 
           if test "$wxUSE_PALETTE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6
-echo "configure:8446: checking for --${enablestring:-enable}-image" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then
   enableval="$enable_image"
           no_cache=0
           # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then
   enableval="$enable_image"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_image='wxUSE_IMAGE=yes'
                           else
                             ac_cv_use_image='wxUSE_IMAGE=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_image='wxUSE_IMAGE=yes'
                           else
                             ac_cv_use_image='wxUSE_IMAGE=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8464,9 +9188,8 @@ else
                           fi
 
                           ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE
                           fi
 
                           ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_image"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_image"
           if test "$no_cache" != 1; then


@@ -8474,28 +9197,30 @@ fi
           fi
 
           if test "$wxUSE_IMAGE" = yes; then
           fi
 
           if test "$wxUSE_IMAGE" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6
-echo "configure:8486: checking for --${enablestring:-enable}-gif" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then
   enableval="$enable_gif"
           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then
   enableval="$enable_gif"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_gif='wxUSE_GIF=yes'
                           else
                             ac_cv_use_gif='wxUSE_GIF=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_gif='wxUSE_GIF=yes'
                           else
                             ac_cv_use_gif='wxUSE_GIF=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8504,9 +9229,8 @@ else
                           fi
 
                           ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF
                           fi
 
                           ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_gif"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_gif"
           if test "$no_cache" != 1; then


@@ -8514,28 +9238,30 @@ fi
           fi
 
           if test "$wxUSE_GIF" = yes; then
           fi
 
           if test "$wxUSE_GIF" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6
-echo "configure:8526: checking for --${enablestring:-enable}-pcx" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then
   enableval="$enable_pcx"
           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then
   enableval="$enable_pcx"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_pcx='wxUSE_PCX=yes'
                           else
                             ac_cv_use_pcx='wxUSE_PCX=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_pcx='wxUSE_PCX=yes'
                           else
                             ac_cv_use_pcx='wxUSE_PCX=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8544,9 +9270,8 @@ else
                           fi
 
                           ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX
                           fi
 
                           ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_pcx"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_pcx"
           if test "$no_cache" != 1; then


@@ -8554,28 +9279,30 @@ fi
           fi
 
           if test "$wxUSE_PCX" = yes; then
           fi
 
           if test "$wxUSE_PCX" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6
-echo "configure:8566: checking for --${enablestring:-enable}-iff" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-iff or --disable-iff was given.
 if test "${enable_iff+set}" = set; then
   enableval="$enable_iff"
           no_cache=0
           # Check whether --enable-iff or --disable-iff was given.
 if test "${enable_iff+set}" = set; then
   enableval="$enable_iff"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_iff='wxUSE_IFF=yes'
                           else
                             ac_cv_use_iff='wxUSE_IFF=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_iff='wxUSE_IFF=yes'
                           else
                             ac_cv_use_iff='wxUSE_IFF=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8584,9 +9311,8 @@ else
                           fi
 
                           ac_cv_use_iff='wxUSE_IFF='$DEFAULT_wxUSE_IFF
                           fi
 
                           ac_cv_use_iff='wxUSE_IFF='$DEFAULT_wxUSE_IFF

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_iff"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_iff"
           if test "$no_cache" != 1; then


@@ -8594,28 +9320,30 @@ fi
           fi
 
           if test "$wxUSE_IFF" = yes; then
           fi
 
           if test "$wxUSE_IFF" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6
-echo "configure:8606: checking for --${enablestring:-enable}-pnm" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
   enableval="$enable_pnm"
           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
   enableval="$enable_pnm"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_pnm='wxUSE_PNM=yes'
                           else
                             ac_cv_use_pnm='wxUSE_PNM=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_pnm='wxUSE_PNM=yes'
                           else
                             ac_cv_use_pnm='wxUSE_PNM=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8624,9 +9352,8 @@ else
                           fi
 
                           ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM
                           fi
 
                           ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_pnm"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_pnm"
           if test "$no_cache" != 1; then


@@ -8634,28 +9361,30 @@ fi
           fi
 
           if test "$wxUSE_PNM" = yes; then
           fi
 
           if test "$wxUSE_PNM" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6
-echo "configure:8646: checking for --${enablestring:-enable}-xpm" >&5
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6

           no_cache=0
           # Check whether --enable-xpm or --disable-xpm was given.
 if test "${enable_xpm+set}" = set; then
   enableval="$enable_xpm"
           no_cache=0
           # Check whether --enable-xpm or --disable-xpm was given.
 if test "${enable_xpm+set}" = set; then
   enableval="$enable_xpm"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_xpm='wxUSE_XPM=yes'
                           else
                             ac_cv_use_xpm='wxUSE_XPM=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_xpm='wxUSE_XPM=yes'
                           else
                             ac_cv_use_xpm='wxUSE_XPM=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8664,9 +9393,8 @@ else
                           fi
 
                           ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM
                           fi
 
                           ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_xpm"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_xpm"
           if test "$no_cache" != 1; then


@@ -8674,28 +9402,30 @@ fi
           fi
 
           if test "$wxUSE_XPM" = yes; then
           fi
 
           if test "$wxUSE_XPM" = yes; then

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

           else
           else

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

           fi
           fi

-        
+

 
          enablestring=
 
          enablestring=

-          echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6
-echo "configure:8686: checking for --${enablestring:-enable}-ico_cur" >&5
+          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
           # Check whether --enable-ico_cur or --disable-ico_cur was given.
 if test "${enable_ico_cur+set}" = set; then
   enableval="$enable_ico_cur"
           no_cache=0
           # Check whether --enable-ico_cur or --disable-ico_cur was given.
 if test "${enable_ico_cur+set}" = set; then
   enableval="$enable_ico_cur"

-  
+

                           if test "$enableval" = yes; then
                             ac_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
                           else
                             ac_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
                           else
                             ac_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                           fi

-                        
+

 else
 else

-  
+

                           LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"


@@ -8704,9 +9434,8 @@ else
                           fi
 
                           ac_cv_use_ico_cur='wxUSE_ICO_CUR='$DEFAULT_wxUSE_ICO_CUR
                           fi
 
                           ac_cv_use_ico_cur='wxUSE_ICO_CUR='$DEFAULT_wxUSE_ICO_CUR

-                        
-fi

 
 

+fi;

 
           eval "$ac_cv_use_ico_cur"
           if test "$no_cache" != 1; then
 
           eval "$ac_cv_use_ico_cur"
           if test "$no_cache" != 1; then


@@ -8714,12 +9443,65 @@ fi
           fi
 
           if test "$wxUSE_ICO_CUR" = yes; then
           fi
 
           if test "$wxUSE_ICO_CUR" = yes; then

-            echo "$ac_t""yes" 1>&6
+            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
+
+
+fi
+
+
+
+         enablestring=
+          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
+          # Check whether --enable-official_build or --disable-official_build was given.
+if test "${enable_official_build+set}" = set; then
+  enableval="$enable_official_build"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
+                          else
+                            ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD
+
+fi;
+
+          eval "$ac_cv_use_official_build"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_OFFICIAL_BUILD" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

           else
           else

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

           fi
           fi

-        

 
 

+# Check whether --enable-vendor or --disable-vendor was given.
+if test "${enable_vendor+set}" = set; then
+  enableval="$enable_vendor"
+  VENDOR="$enableval"
+fi;
+if test "x$VENDOR" = "x"; then
+    VENDOR="custom"

 fi
 
 case "${host}" in
 fi
 
 case "${host}" in


@@ -8737,11 +9519,11 @@ esac
 
           echo "saving argument cache $wx_arg_cache_file"
           mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
 
           echo "saving argument cache $wx_arg_cache_file"
           mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}

-        

 
 
 
 

-echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:8745: checking for toolkit" >&5
+
+echo "$as_me:$LINENO: checking for toolkit" >&5
+echo $ECHO_N "checking for toolkit... $ECHO_C" >&6

 
 # In Wine, we need to default to MSW, not GTK or MOTIF
 if test "$wxUSE_WINE" = "yes"; then
 
 # In Wine, we need to default to MSW, not GTK or MOTIF
 if test "$wxUSE_WINE" = "yes"; then


@@ -8753,7 +9535,9 @@ fi
 if test "$wxUSE_GUI" = "yes"; then
 
     if test "$USE_BEOS" = 1; then
 if test "$wxUSE_GUI" = "yes"; then
 
     if test "$USE_BEOS" = 1; then

-        { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }
+        { { 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 "$TOOLKIT_GIVEN" = 1; then
     fi
 
     if test "$TOOLKIT_GIVEN" = 1; then


@@ -8786,10 +9570,14 @@ if test "$wxUSE_GUI" = "yes"; then
       1)
       ;;
       0)
       1)
       ;;
       0)

-        { echo "configure: error: Please specify a toolkit -- cannot determine the default for ${host}" 1>&2; exit 1; }
+        { { 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 "configure: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" 1>&2; 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
 
         for toolkit in `echo $ALL_TOOLKITS`; do
     esac
 
         for toolkit in `echo $ALL_TOOLKITS`; do


@@ -8803,12 +9591,19 @@ if test "$wxUSE_GUI" = "yes"; then
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`

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

         fi
       fi
     done
 else
         fi
       fi
     done
 else

-    echo "$ac_t""base ($host_alias hosted) only" 1>&6
+    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

 fi
 
 wants_win32=0
 fi
 
 wants_win32=0


@@ -8836,29 +9631,29 @@ 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 <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __WIN32__ 1
 #define __WIN32__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __WIN95__ 1
 #define __WIN95__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __WINDOWS__ 1
 #define __WINDOWS__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __GNUWIN32__ 1
 #define __GNUWIN32__ 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define STRICT 1
 #define STRICT 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define WINVER 0x0400
 #define WINVER 0x0400

-EOF
+_ACEOF

 
 fi
 if test "$doesnt_want_win32" = 1 ; then
 
 fi
 if test "$doesnt_want_win32" = 1 ; then


@@ -8868,61 +9663,68 @@ fi
 
 if test "$USE_UNIX" = 1 ; then
     wxUSE_UNIX=yes
 
 if test "$USE_UNIX" = 1 ; then
     wxUSE_UNIX=yes

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define __UNIX__ 1
 #define __UNIX__ 1

-EOF
+_ACEOF

 
 fi
 
 
 
 fi
 
 

-cat > confcache <<\EOF
+cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure

-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.

 #
 #

-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.

 #
 #

-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+

 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.

-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else

   if test -w $cache_file; then
   if test -w $cache_file; then

-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file

   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 

-

 if test "$build" != "$host" ; then
     if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX"; then
         CC=$host_alias-gcc
 if test "$build" != "$host" ; then
     if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX"; then
         CC=$host_alias-gcc


@@ -8935,219 +9737,650 @@ if test "$build" != "$host" ; then
         NM=$host_alias-nm
         STRIP=$host_alias-strip
     else
         NM=$host_alias-nm
         STRIP=$host_alias-strip
     else

-        { echo "configure: error: $build_alias -> $host_alias cross compilation not supported yet." 1>&2; exit 1; }
+        { { echo "$as_me:$LINENO: error: $build_alias -> $host_alias cross compilation not supported yet." >&5
+echo "$as_me: error: $build_alias -> $host_alias cross compilation not supported yet." >&2;}
+   { (exit 1); exit 1; }; }

     fi
 fi
 
 CFLAGS=${CFLAGS:=}
     fi
 fi
 
 CFLAGS=${CFLAGS:=}

-# Extract the first word of "gcc", so it can be a program name with args.
+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 -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
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.

 set dummy gcc; ac_word=$2
 set dummy gcc; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8947: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+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
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

 fi
 fi
 fi
 fi

-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC

 if test -n "$CC"; then
 if test -n "$CC"; then

-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC

 else
 else

-  echo "$ac_t""no" 1>&6
+  CC="$ac_cv_prog_CC"

 fi
 
 fi
 

+fi

 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8977: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"

   ac_prog_rejected=no
   ac_prog_rejected=no

-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-       continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    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
+    break 2
+  fi
+done
+done
+

 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift

-  if test $# -gt 0; then
+  if test $# != 0; then

     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift

-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"

   fi
 fi
 fi
 fi
   fi
 fi
 fi
 fi

-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC

 if test -n "$CC"; then
 if test -n "$CC"; then

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

 else
 else

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

 fi
 
 fi
 

-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9028: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

 fi
 fi
 fi
 fi

-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC

 if test -n "$CC"; then
 if test -n "$CC"; then

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

 else
 else

-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:9060: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done

 
 

-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi

 
 

-cat > conftest.$ac_ext << EOF
+  test -n "$ac_ct_CC" && break
+done

 
 

-#line 9071 "configure"
-#include "confdefs.h"
+  CC=$ac_ct_CC
+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; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-main(){return(0);}
-EOF
-if { (eval echo configure:9076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:$LINENO: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+        ;;
+    conftest.$ac_ext )
+        # This is the source file.
+        ;;
+    [ab].out )
+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;
+    *.* )
+        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        # FIXME: I believe we export ac_cv_exeext for Libtool,
+        # but it would be cool to find out if it's true.  Does anybody
+        # maintain Libtool? --akim.
+        export ac_cv_exeext
+        break;;
+    * )
+        break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&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; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check 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'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no

   else
   else

-    ac_cv_prog_cc_cross=yes
+    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

-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no

 fi
 fi

-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:9102: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:9107: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:9116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # 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
+# `rm'.
+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 | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done

 else
 else

-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+  { { 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; }; }
+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.$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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done

 else
 else

-  GCC=
+  echo "$as_me: failed program was:" >&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; }; }

 fi
 
 fi
 

-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:9135: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
+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

 else
 else

-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f 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`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_prog_cc_g=yes
 else
   ac_cv_prog_cc_g=yes
 else

-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

+ac_cv_prog_cc_g=no

 fi
 fi

-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

 if test "$ac_test_CFLAGS" = set; then
 if test "$ac_test_CFLAGS" = set; then

-  CFLAGS="$ac_save_CFLAGS"
+  CFLAGS=$ac_save_CFLAGS

 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"


@@ -9161,130 +10394,523 @@ else
     CFLAGS=
   fi
 fi
     CFLAGS=
   fi
 fi

+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX                  -qlanglvl=ansi
+# Ultrix and OSF/1     -std1
+# HP-UX 10.20 and later        -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE
+# SVR4                 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+  *)
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$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

 
 
 
 

-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:9168: checking how to run the C preprocessor" >&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
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6

 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 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 eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_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,
   # On the NeXT, cc -E runs the code through the compiler's parser,

-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 9183 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi

 else
 else

-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 9200 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   :
 else
   :
 else

-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 9217 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi

 else
 else

-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
+  ac_cpp_err=yes

 fi
 fi

-rm -f conftest*
+if test -z "$ac_cpp_err"; then
+  # 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
 fi

-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break

 fi
 fi

-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # 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 >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  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.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+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; }; }

 fi
 fi

-  CPP="$ac_cv_prog_CPP"
+
+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 for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_cv_prog_CPP="$CPP"
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi

 fi
 fi

-echo "$ac_t""$CPP" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+

 
 

-if test $ac_cv_prog_gcc = yes; then
-    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:9249: checking whether ${CC-cc} needs -traditional" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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

 else
     ac_pattern="Autoconf.*'x'"
 else
     ac_pattern="Autoconf.*'x'"

-  cat > conftest.$ac_ext <<EOF
-#line 9255 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <sgtty.h>
 Autoconf TIOCGETP
 #include <sgtty.h>
 Autoconf TIOCGETP

-EOF
+_ACEOF

 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "$ac_pattern" >/dev/null 2>&1; then
-  rm -rf conftest*
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then

   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=yes
 else

-  rm -rf conftest*

   ac_cv_prog_gcc_traditional=no
 fi
 rm -f conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
   ac_cv_prog_gcc_traditional=no
 fi
 rm -f conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then

-    cat > conftest.$ac_ext <<EOF
-#line 9273 "configure"
-#include "confdefs.h"
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <termio.h>
 Autoconf TCGETA
 #include <termio.h>
 Autoconf TCGETA

-EOF
+_ACEOF

 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "$ac_pattern" >/dev/null 2>&1; then
-  rm -rf conftest*
+  $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 "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6

   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi


@@ -9292,144 +10918,227 @@ fi
 
 
 
 
 
 

-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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

 
 
 CXXFLAGS=${CXXFLAGS:=}
 
 
 CXXFLAGS=${CXXFLAGS:=}

-for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9310: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

 fi
 fi
 fi
 fi

-CXX="$ac_cv_prog_CXX"
+CXX=$ac_cv_prog_CXX

 if test -n "$CXX"; then
 if test -n "$CXX"; then

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

 else
 else

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

 fi
 
 fi
 

-test -n "$CXX" && break
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CXX"; then
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done

 done
 done

-test -n "$CXX" || CXX="gcc"
-
-
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:9342: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 9353 "configure"
-#include "confdefs.h"

 
 

-int main(){return(0);}
-EOF
-if { (eval echo configure:9358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cxx_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cxx_cross=no
-  else
-    ac_cv_prog_cxx_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cxx_works=no

 fi
 fi

-rm -fr conftest*
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-if test $ac_cv_prog_cxx_works = no; then
-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:9384: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:9389: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
-else
-  ac_cv_prog_gxx=no

 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
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 fi
 
 fi
 

-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+  test -n "$ac_ct_CXX" && break
+done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+
+  CXX=$ac_ct_CXX
+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`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif

 
 

-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f 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`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-ac_test_CXXFLAGS="${CXXFLAGS+set}"
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:9417: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_prog_cxx_g=yes
 else
   ac_cv_prog_cxx_g=yes
 else

-  ac_cv_prog_cxx_g=no
-fi
-rm -f conftest*
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

+ac_cv_prog_cxx_g=no

 fi
 fi

-
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6

 if test "$ac_test_CXXFLAGS" = set; then
 if test "$ac_test_CXXFLAGS" = set; then

-  CXXFLAGS="$ac_save_CXXFLAGS"
+  CXXFLAGS=$ac_save_CXXFLAGS

 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
     CXXFLAGS="-g -O2"
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
     CXXFLAGS="-g -O2"


@@ -9443,75 +11152,224 @@ else
     CXXFLAGS=
   fi
 fi
     CXXFLAGS=
   fi
 fi

+for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

 
 
 ac_ext=c
 
 
 ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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

 
 
 
 

-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9460: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

 fi
 fi
 fi
 fi

-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB

 if test -n "$RANLIB"; then
 if test -n "$RANLIB"; then

-  echo "$ac_t""$RANLIB" 1>&6
+  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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  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
+
+  RANLIB=$ac_ct_RANLIB

 else
 else

-  echo "$ac_t""no" 1>&6
+  RANLIB="$ac_cv_prog_RANLIB"

 fi
 
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 fi
 
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9491: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
 fi
 fi
   test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
 fi
 fi

-AR="$ac_cv_prog_AR"
+AR=$ac_cv_prog_AR

 if test -n "$AR"; then
 if test -n "$AR"; then

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

 else
 else

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

 fi
 
 
 fi
 
 


@@ -9522,60 +11380,73 @@ fi
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/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"
 # ./install, which can be erroneously created by make from ./install.sh.
 # 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"
 # ./install, which can be erroneously created by make from ./install.sh.

-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:9531: checking for a BSD compatible install" >&5
+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 -z "$INSTALL"; then

-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS=        }"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/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
-        if test -f $ac_dir/$ac_prog; then
-         if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         else
-           ac_cv_path_install="$ac_dir/$ac_prog -c"
-           break 2
-         fi
-       fi
+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/* | \
+  /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 $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          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="$ac_save_IFS"
+    done
+    ;;
+esac
+done
+

 
 fi
   if test "${ac_cv_path_install+set}" = set; then
 
 fi
   if test "${ac_cv_path_install+set}" = set; then

-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install

   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.

-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh

   fi
 fi
   fi
 fi

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

 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
 
 # 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_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'

 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 


@@ -9611,41 +11482,47 @@ esac
 
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9616: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true"
 fi
 fi
   test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true"
 fi
 fi

-STRIP="$ac_cv_prog_STRIP"
+STRIP=$ac_cv_prog_STRIP

 if test -n "$STRIP"; then
 if test -n "$STRIP"; then

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

 else
 else

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

 fi
 
 
 fi
 
 

-echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
-echo "configure:9645: checking if make is GNU make" >&5
-if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking if make is GNU make" >&5
+echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6
+if test "${wx_cv_prog_makeisgnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
+

     if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
             egrep -s GNU > /dev/null); then
         wx_cv_prog_makeisgnu="yes"
     if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
             egrep -s GNU > /dev/null); then
         wx_cv_prog_makeisgnu="yes"


@@ -9654,8 +11531,8 @@ else
     fi
 
 fi
     fi
 
 fi

-
-echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
+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=""
 
 if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
     IF_GNU_MAKE=""


@@ -9666,12 +11543,12 @@ fi
 
 
 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
 
 
 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then

-echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6
-echo "configure:9671: checking if make supports VPATH" >&5
-if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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
 else

-  
+

 cat - << EOF > confMake
 check : file
        cp \$? \$@
 cat - << EOF > confMake
 check : file
        cp \$? \$@


@@ -9693,11 +11570,22 @@ else
 fi
 
 fi
 fi
 
 fi

-
-echo "$ac_t""$wx_cv_prog_makevpath" 1>&6
+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
 
 if test "x$wx_cv_prog_makevpath" != "xyes"; then

-{ echo "configure: error: 
+{ { 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,
 You need a make-utility that is able to use the variable
 VPATH correctly.
 If your version of make does not support VPATH correctly,


@@ -9707,142 +11595,304 @@ 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.
 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.

-" 1>&2; exit 1; }
-fi fi 
+" >&2;}
+   { (exit 1); exit 1; }; }
+fi fi

 for ac_prog in 'bison -y' byacc
 do
 for ac_prog in 'bison -y' byacc
 do

-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # Extract the first word of "$ac_prog", so it can be a program name with args.

 set dummy $ac_prog; ac_word=$2
 set dummy $ac_prog; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9718: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_YACC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_YACC="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

 fi
 fi
 fi
 fi

-YACC="$ac_cv_prog_YACC"
+YACC=$ac_cv_prog_YACC

 if test -n "$YACC"; then
 if test -n "$YACC"; then

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

 else
 else

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

 fi
 
 fi
 

-test -n "$YACC" && break
+  test -n "$YACC" && break

 done
 test -n "$YACC" || YACC="yacc"
 
 
 done
 test -n "$YACC" || YACC="yacc"
 
 

-# Extract the first word of "flex", so it can be a program name with args.
-set dummy flex; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9752: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+for ac_prog in flex lex
+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_LEX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LEX="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

 fi
 fi
 fi
 fi

-LEX="$ac_cv_prog_LEX"
+LEX=$ac_cv_prog_LEX

 if test -n "$LEX"; then
 if test -n "$LEX"; then

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

 else
 else

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

 fi
 
 fi
 

+  test -n "$LEX" && break
+done
+test -n "$LEX" || LEX=":"
+

 if test -z "$LEXLIB"
 then
 if test -z "$LEXLIB"
 then

-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:9786: checking for yywrap in -l$ac_lib" >&5
-ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 9794 "configure"
-#include "confdefs.h"
+  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
+echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
+if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char yywrap();
+   builtin and then its argument prototype would still apply.  */
+char yywrap ();
+int
+main ()
+{
+yywrap ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_fl_yywrap=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_fl_yywrap=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
+echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
+if test $ac_cv_lib_fl_yywrap = yes; then
+  LEXLIB="-lfl"
+else
+  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
+echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
+if test "${ac_cv_lib_l_yywrap+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ll  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 

-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:9805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char yywrap ();
+int
+main ()
+{
+yywrap ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_l_yywrap=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_l_yywrap=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
+echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
+if test $ac_cv_lib_l_yywrap = yes; then
+  LEXLIB="-ll"

 fi
 fi

-rm -f conftest*
-LIBS="$ac_save_LIBS"

 
 fi
 
 fi

-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
-fi

 
 fi
 
 
 fi
 

+if test "x$LEX" != "x:"; then
+  echo "$as_me:$LINENO: checking lex output file root" >&5
+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
+if test "${ac_cv_prog_lex_root+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # The minimal lex program is just a single line: %%.  But some broken lexes
+# (Solaris, I think it was) want two %% lines, so accommodate them.
+cat >conftest.l <<_ACEOF
+%%
+%%
+_ACEOF
+{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
+  (eval $LEX conftest.l) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
+rm -f conftest.l
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root

 
 

-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:9829: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent. Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
+ac_save_LIBS=$LIBS
+LIBS="$LIBS $LEXLIB"
+cat >conftest.$ac_ext <<_ACEOF
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_lex_yytext_pointer=yes

 else
 else

-  ac_cv_prog_LN_S=ln
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+rm -f "${LEX_OUTPUT_ROOT}.c"
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define YYTEXT_POINTER 1
+_ACEOF
+

 fi
 fi

+

 fi
 fi

-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
+
+echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

 else
 else

-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6

 fi
 
 
 fi
 
 


@@ -9850,44 +11900,62 @@ case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
             LIBS="$LIBS -lstdcpp"
       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
   *-pc-os2_emx | *-pc-os2-emx )
             LIBS="$LIBS -lstdcpp"
       if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then

-                              echo $ac_n "checking for drand48 in -lcExt""... $ac_c" 1>&6
-echo "configure:9855: checking for drand48 in -lcExt" >&5
-ac_lib_var=`echo cExt'_'drand48 | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                              echo "$as_me:$LINENO: checking for drand48 in -lcExt" >&5
+echo $ECHO_N "checking for drand48 in -lcExt... $ECHO_C" >&6
+if test "${ac_cv_lib_cExt_drand48+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lcExt  $LIBS"
 LIBS="-lcExt  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 9863 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char drand48();
-
-int main() {
-drand48()
-; return 0; }
-EOF
-if { (eval echo configure:9874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char drand48 ();
+int
+main ()
+{
+drand48 ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_cExt_drand48=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_cExt_drand48=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_cExt_drand48" >&5
+echo "${ECHO_T}$ac_cv_lib_cExt_drand48" >&6
+if test $ac_cv_lib_cExt_drand48 = yes; then

   LIBS="$LIBS -lcExt"
   LIBS="$LIBS -lcExt"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
       else
 fi
 
       else


@@ -9897,839 +11965,4320 @@ fi
 esac
 
 
 esac
 
 

-if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
-    for ac_hdr in strings.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9906: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9911 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+    echo "$as_me:$LINENO: checking for strings.h" >&5
+echo $ECHO_N "checking for strings.h... $ECHO_C" >&6
+if test "${ac_cv_header_strings_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_strings_h=no

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: $ac_cv_header_strings_h" >&5
+echo "${ECHO_T}$ac_cv_header_strings_h" >&6
+    if test "$ac_cv_header_strings_h" = "no"; then
+        echo "$as_me:$LINENO: result: forced no into cache" >&5
+echo "${ECHO_T}forced no into cache" >&6
+    else
+        { echo "$as_me:$LINENO: WARNING: strings.h is not compatible with Mac OS X" >&5
+echo "$as_me: WARNING: strings.h is not compatible with Mac OS X" >&2;}
+    fi

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_stdc=yes

 else
 else

-  echo "$ac_t""no" 1>&6
-fi
-done
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

+ac_cv_header_stdc=no

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-for ac_hdr in stdlib.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9948: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9953 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no

 fi
 rm -f conftest*
 fi
 rm -f conftest*

+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done

 
 

-for ac_hdr in malloc.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9988: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9993 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no

 fi
 rm -f conftest*
 fi
 rm -f conftest*

+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+
+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
+  :

 else
 else

-  echo "$ac_t""no" 1>&6
-fi
-done
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif

 
 

-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10028: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10033 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: 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_stdc=no

 fi
 fi

-rm -f conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 fi

-done
-
-for ac_hdr in wchar.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10068: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10073 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+
+# 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
+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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

+

 done
 
 
 done
 
 

-if test "$ac_cv_header_wchar_h" != "yes"; then
-        for ac_hdr in wcstr.h
+
+for ac_header in strings.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10110: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10115 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

+

 done
 
 done
 

-fi

 
 

-for ac_hdr in fnmatch.h
+
+for ac_header in stdlib.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10152: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10157 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  echo "$ac_t""no" 1>&6
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-done
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 
 

+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF

 
 

-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
-    for ac_func in fnmatch
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10193: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10198 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
+fi

 
 

-int main() {
+done

 
 

-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif

 
 

-; return 0; }
-EOF
-if { (eval echo configure:10221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+for ac_header in malloc.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 fi

+

 done
 
 done
 

-fi

 
 

-for ac_hdr in langinfo.h
+for ac_header in unistd.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10251: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10256 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

-done

 
 

+done

 
 

-case "${host}" in
-  *-pc-os2_emx | *-pc-os2-emx )
-            if test $ac_cv_header_langinfo_h = "yes"; then
-          LIBS="$LIBS -lintl"
-      fi
-  ;;
-esac

 
 

-if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes"; then
-                for ac_hdr in X11/XKBlib.h
+for ac_header in wchar.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10302: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10307 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi

 else
 else

-  echo "$ac_t""no" 1>&6
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-done
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

 
 

-    fi

 fi
 fi

+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF

 
 

+fi

 
 

-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:10343: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10348 "configure"
-#include "confdefs.h"
-
-int main() {
+done

 
 

-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;

 
 

-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
+if test "$ac_cv_header_wchar_h" != "yes"; then

 
 

-; return 0; }
-EOF
-if { (eval echo configure:10397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
+for ac_header in wcstr.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
+
+for ac_header in fnmatch.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
+
+for ac_func in fnmatch
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end 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
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+fi
+
+
+for ac_header in langinfo.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+case "${host}" in
+  *-pc-os2_emx | *-pc-os2-emx )
+            if test $ac_cv_header_langinfo_h = "yes"; then
+          LIBS="$LIBS -lintl"
+      fi
+  ;;
+esac
+
+if test "$wxUSE_GUI" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes"; then
+
+for ac_header in X11/XKBlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+    fi

 fi
 
 fi
 

-echo "$ac_t""$ac_cv_c_const" 1>&6
+
+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+if test "${ac_cv_c_const+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this.  */
+  typedef int charset[2];
+  const charset x;
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *ccp;
+  char **p;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  ccp = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++ccp;
+  p = (char**) ccp;
+  ccp = (char const *const *) p;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+  }
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_const=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_c_const=no
+fi
+rm -f 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

 if test $ac_cv_c_const = no; then
 if test $ac_cv_c_const = no; then

-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
+
+cat >>confdefs.h <<\_ACEOF
+#define const
+_ACEOF

 
 fi
 
 
 fi
 

-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:10418: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6
+if test "${ac_cv_c_inline+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   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 <<EOF
-#line 10425 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif

 
 

-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:10432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_c_inline=$ac_kw; break
 else
   ac_cv_c_inline=$ac_kw; break
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

 done
 
 fi
 done
 
 fi

-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6
+case $ac_cv_c_inline in

   inline | yes) ;;
   inline | yes) ;;

-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
+  no)
+cat >>confdefs.h <<\_ACEOF
+#define inline
+_ACEOF

  ;;
  ;;

-  *)  cat >> confdefs.h <<EOF
+  *)  cat >>confdefs.h <<_ACEOF

 #define inline $ac_cv_c_inline
 #define inline $ac_cv_c_inline

-EOF
+_ACEOF

  ;;
 esac
 
 
  ;;
 esac
 
 

-echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:10459: checking size of char" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
+echo "$as_me:$LINENO: checking for char" >&5
+echo $ECHO_N "checking for char... $ECHO_C" >&6
+if test "${ac_cv_type_char+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((char *) 0)
+  return 0;
+if (sizeof (char))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_char=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_char=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
+echo "${ECHO_T}$ac_cv_type_char" >&6
+
+echo "$as_me:$LINENO: checking size of char" >&5
+echo $ECHO_N "checking size of char... $ECHO_C" >&6
+if test "${ac_cv_sizeof_char+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_char" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

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

-  ac_cv_sizeof_char=1
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 conftest.$ac_objext conftest.$ac_ext
+  done

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10467 "configure"
-#include "confdefs.h"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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 conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_char=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (char)); }
+unsigned long ulongval () { return (long) (sizeof (char)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (char))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (char))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (char))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_char=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_char=`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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (char), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_char=0
 fi
   ac_cv_sizeof_char=0
 fi

-rm -fr conftest*

 fi
 fi

+echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_ACEOF
+
+
+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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((short *) 0)
+  return 0;
+if (sizeof (short))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_short=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_short=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+echo "${ECHO_T}$ac_cv_type_short" >&6
+
+echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6
+if test "${ac_cv_sizeof_short+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_short" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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

-echo "$ac_t""$ac_cv_sizeof_char" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-EOF
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
+test_array [0] = 0

 
 

-echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10498: checking size of short" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 conftest.$ac_objext conftest.$ac_ext
+  done

 else
 else

-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_short=2
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_short=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10506 "configure"
-#include "confdefs.h"
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (short)); }
+unsigned long ulongval () { return (long) (sizeof (short)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(short));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (short))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (short))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (short))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_short=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_short=`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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_short=0
 fi
   ac_cv_sizeof_short=0
 fi

-rm -fr conftest*

 fi
 fi

+echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
+
+
+echo "$as_me:$LINENO: checking for void *" >&5
+echo $ECHO_N "checking for void *... $ECHO_C" >&6
+if test "${ac_cv_type_void_p+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((void * *) 0)
+  return 0;
+if (sizeof (void *))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_void_p=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_void_p=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
+echo "${ECHO_T}$ac_cv_type_void_p" >&6
+
+echo "$as_me:$LINENO: checking size of void *" >&5
+echo $ECHO_N "checking size of void *... $ECHO_C" >&6
+if test "${ac_cv_sizeof_void_p+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_void_p" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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

-echo "$ac_t""$ac_cv_sizeof_short" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-EOF
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)];
+test_array [0] = 0

 
 

-echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:10537: checking size of void *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 conftest.$ac_objext conftest.$ac_ext
+  done

 else
 else

-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_void_p=4
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_void_p=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10545 "configure"
-#include "confdefs.h"
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (void *)); }
+unsigned long ulongval () { return (long) (sizeof (void *)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(void *));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (void *))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (void *))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (void *))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_void_p=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_void_p=`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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (void *), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_void_p=0
 fi
   ac_cv_sizeof_void_p=0
 fi

-rm -fr conftest*

 fi
 fi

+echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
+
+
+echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6
+if test "${ac_cv_type_int+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((int *) 0)
+  return 0;
+if (sizeof (int))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_int=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_int=no
+fi
+rm -f 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
+
+echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6
+if test "${ac_cv_sizeof_int+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_int" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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

-echo "$ac_t""$ac_cv_sizeof_void_p" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-EOF
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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 conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0

 
 

-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:10576: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_int=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac

 else
   if test "$cross_compiling" = yes; then
 else
   if test "$cross_compiling" = yes; then

-  ac_cv_sizeof_int=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10584 "configure"
-#include "confdefs.h"
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (int)); }
+unsigned long ulongval () { return (long) (sizeof (int)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (int))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (int))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (int))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_int=`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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_int=0
 fi
   ac_cv_sizeof_int=0
 fi

-rm -fr conftest*

 fi
 fi

+echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
+
+echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6
+if test "${ac_cv_type_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((long *) 0)
+  return 0;
+if (sizeof (long))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6
+
+echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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

-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+test_array [0] = 0

 
 

+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+test_array [0] = 0

 
 

-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:10615: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 conftest.$ac_objext conftest.$ac_ext
+  done

 else
 else

-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long=4
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10623 "configure"
-#include "confdefs.h"
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (long)); }
+unsigned long ulongval () { return (long) (sizeof (long)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (long))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (long))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_long=0
 fi
   ac_cv_sizeof_long=0
 fi

-rm -fr conftest*
-fi
-

 fi
 fi

-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+cat >>confdefs.h <<_ACEOF

 #define SIZEOF_LONG $ac_cv_sizeof_long
 #define SIZEOF_LONG $ac_cv_sizeof_long

-EOF
+_ACEOF

 
 
 
 case "${host}" in
     arm-*-linux* )
 
 
 
 case "${host}" in
     arm-*-linux* )

-        echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10657: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
+        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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((long long *) 0)
+  return 0;
+if (sizeof (long long))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long_long=no
+fi
+rm -f 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
+
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_long_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

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

-  ac_cv_sizeof_long_long=8
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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 conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10665 "configure"
-#include "confdefs.h"
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (long long))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_long_long=0
 fi
   ac_cv_sizeof_long_long=0
 fi

-rm -fr conftest*
-fi
-

 fi
 fi

-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
+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
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long

-EOF
+_ACEOF

 
 
     ;;
     *-hp-hpux* )
 
 
     ;;
     *-hp-hpux* )

-        echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10698: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
+        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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((long long *) 0)
+  return 0;
+if (sizeof (long long))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long_long=no
+fi
+rm -f 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
+
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_long_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

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

-  ac_cv_sizeof_long_long=0
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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 conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10706 "configure"
-#include "confdefs.h"
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (long long))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_long_long=0
 fi
   ac_cv_sizeof_long_long=0
 fi

-rm -fr conftest*
-fi
-

 fi
 fi

-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
+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
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long

-EOF
+_ACEOF

 
 
         if test "$ac_cv_sizeof_long_long" != "0"; then
 
 
         if test "$ac_cv_sizeof_long_long" != "0"; then


@@ -10737,55 +16286,377 @@ EOF
         fi
     ;;
     * )
         fi
     ;;
     * )

-        echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10742: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
+        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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((long long *) 0)
+  return 0;
+if (sizeof (long long))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long_long=no
+fi
+rm -f 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
+
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_long_long" = yes; then
+  # The cast to unsigned long works around a bug in the HP C Compiler
+  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+  # This bug is HP SR number 8606223364.

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

-  ac_cv_sizeof_long_long=0
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_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 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 conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10750 "configure"
-#include "confdefs.h"
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }

 #include <stdio.h>
 #include <stdio.h>

-main()
+#include <stdlib.h>
+int
+main ()

 {
 {

-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    exit (1);
+  if (((long) (sizeof (long long))) < 0)
+    {
+      long i = longval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);
+      fprintf (f, "%ld\n", i);
+    }
+  else
+    {
+      unsigned long i = ulongval ();
+      if (i != ((long) (sizeof (long long))))
+       exit (1);
+      fprintf (f, "%lu\n", i);
+    }
+  exit (ferror (f) || fclose (f) != 0);
+
+  ;
+  return 0;

 }
 }

-EOF
-if { (eval echo configure:10761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_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 )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*

   ac_cv_sizeof_long_long=0
 fi
   ac_cv_sizeof_long_long=0
 fi

-rm -fr conftest*
-fi
-

 fi
 fi

-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
+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
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long

-EOF
+_ACEOF

 
 
 esac
 
 
 
 esac
 

-echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:10783: checking size of wchar_t" >&5
-if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking size of wchar_t" >&5
+echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
+if test "${wx_cv_sizeof_wchar_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
+

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

-  
+

             case "${host}" in
               *-pc-msdosdjgpp )
                 wx_cv_sizeof_wchar_t=0
             case "${host}" in
               *-pc-msdosdjgpp )
                 wx_cv_sizeof_wchar_t=0


@@ -10794,12 +16665,16 @@ else
                 wx_cv_sizeof_wchar_t=4
                 ;;
             esac
                 wx_cv_sizeof_wchar_t=4
                 ;;
             esac

-        
-    
+
+

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10802 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
             /* DJGPP only has fake wchar_t: */
             #ifdef __DJGPP__
 
             /* DJGPP only has fake wchar_t: */
             #ifdef __DJGPP__


@@ -10822,136 +16697,182 @@ else
                 fprintf(f, "%i", sizeof(wchar_t));
                 exit(0);
             }
                 fprintf(f, "%i", sizeof(wchar_t));
                 exit(0);
             }

-        
-EOF
-if { (eval echo configure:10828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_sizeof_wchar_t=`cat conftestval`
 else
   wx_cv_sizeof_wchar_t=`cat conftestval`
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  wx_cv_sizeof_wchar_t=0
+  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_sizeof_wchar_t=0

 fi
 fi

-rm -fr conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

-

 fi
 fi

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

 
 

-echo "$ac_t""$wx_cv_sizeof_wchar_t" 1>&6
-
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<_ACEOF

 #define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
 #define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t

-EOF
+_ACEOF

 
 
 # Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
   enableval="$enable_largefile"
 
 
 # Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
   enableval="$enable_largefile"

-  :
-fi

 
 

+fi;

 if test "$enable_largefile" != no; then
             wx_largefile=no
 if test "$enable_largefile" != no; then
             wx_largefile=no

-    
-    echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:10860: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-          cat > conftest.$ac_ext <<EOF
-#line 10866 "configure"
-#include "confdefs.h"
+
+    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
+#line $LINENO "configure"
+/* 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>
 #define _FILE_OFFSET_BITS 64
                           #include <sys/types.h>

-int main() {
+int
+main ()
+{

 typedef struct {
     unsigned int field: sizeof(off_t) == 8;
 } wxlf;
 
 typedef struct {
     unsigned int field: sizeof(off_t) == 8;
 } wxlf;
 

-; return 0; }
-EOF
-if { (eval echo configure:10877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_sys_file_offset_bits=64
 else
   ac_cv_sys_file_offset_bits=64
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_sys_file_offset_bits=no
-fi
-rm -f conftest*
-        
-    
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_sys_file_offset_bits=no

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext
+

 
 

-echo "$ac_t""$ac_cv_sys_file_offset_bits" 1>&6
+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
 
     if test "$ac_cv_sys_file_offset_bits" != no; then
         wx_largefile=yes

-        cat >> confdefs.h <<EOF
+        cat >>confdefs.h <<_ACEOF

 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits

-EOF
+_ACEOF

 
     fi
 
     if test "x$wx_largefile" != "xyes"; then
 
     fi
 
     if test "x$wx_largefile" != "xyes"; then

-        
-    echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:10904: checking for _LARGE_FILES value needed for large files" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-          cat > conftest.$ac_ext <<EOF
-#line 10910 "configure"
-#include "confdefs.h"
+
+    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
+#line $LINENO "configure"
+/* 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>
 #define _LARGE_FILES 1
                           #include <sys/types.h>

-int main() {
+int
+main ()
+{

 typedef struct {
     unsigned int field: sizeof(off_t) == 8;
 } wxlf;
 
 typedef struct {
     unsigned int field: sizeof(off_t) == 8;
 } wxlf;
 

-; return 0; }
-EOF
-if { (eval echo configure:10921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_sys_large_files=1
 else
   ac_cv_sys_large_files=1
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_sys_large_files=no
-fi
-rm -f conftest*
-        
-    
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_sys_large_files=no

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$ac_cv_sys_large_files" 1>&6
+
+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
 
     if test "$ac_cv_sys_large_files" != no; then
         wx_largefile=yes

-        cat >> confdefs.h <<EOF
+        cat >>confdefs.h <<_ACEOF

 #define _LARGE_FILES $ac_cv_sys_large_files
 #define _LARGE_FILES $ac_cv_sys_large_files

-EOF
+_ACEOF

 
     fi
 
     fi
 
 
     fi
 
     fi
 

-    echo $ac_n "checking if large file support is available""... $ac_c" 1>&6
-echo "configure:10948: checking if large file support is available" >&5
+    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
     if test "x$wx_largefile" = "xyes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define HAVE_LARGEFILE_SUPPORT 1
 #define HAVE_LARGEFILE_SUPPORT 1

-EOF
+_ACEOF

 
     fi
 
     fi

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

 fi
 
 
 fi
 
 


@@ -10964,62 +16885,103 @@ if test "x$wx_largefile" = "xyes"; then
     CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
 fi
 
     CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
 fi
 

-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:10969: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+if test "${ac_cv_c_bigendian+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.

-cat > conftest.$ac_ext <<EOF
-#line 10976 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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>
 #include <sys/types.h>
 #include <sys/param.h>

-int main() {
+int
+main ()
+{

 
 #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
  bogus endian macros
 #endif
 
 #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
  bogus endian macros
 #endif

-; return 0; }
-EOF
-if { (eval echo configure:10987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   # It does; now see whether it defined to BIG_ENDIAN or not.
   # It does; now see whether it defined to BIG_ENDIAN or not.

-cat > conftest.$ac_ext <<EOF
-#line 10991 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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>
 #include <sys/types.h>
 #include <sys/param.h>

-int main() {
+int
+main ()
+{

 
 #if BYTE_ORDER != BIG_ENDIAN
  not big endian
 #endif
 
 #if BYTE_ORDER != BIG_ENDIAN
  not big endian
 #endif

-; return 0; }
-EOF
-if { (eval echo configure:11002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_c_bigendian=yes
 else
   ac_cv_c_bigendian=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_bigendian=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_c_bigendian=no

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+

 fi
 fi

-rm -f conftest*
+rm -f 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
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 else

-  cat > conftest.$ac_ext <<EOF
-#line 11022 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
   union


@@ -11030,354 +16992,889 @@ main () {
   u.l = 1;
   exit (u.c[sizeof (long) - 1] == 1);
 }
   u.l = 1;
   exit (u.c[sizeof (long) - 1] == 1);
 }

-EOF
-if { (eval echo configure:11035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_c_bigendian=no
 else
   ac_cv_c_bigendian=no
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_bigendian=yes
+  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
 fi

-rm -fr conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-

 fi
 fi
 fi
 fi

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

 if test $ac_cv_c_bigendian = unknown; then
 if test $ac_cv_c_bigendian = unknown; then

-  echo "configure: 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" 1>&2
+  { 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
 fi
 if test $ac_cv_c_bigendian = yes; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define WORDS_BIGENDIAN 1
 #define WORDS_BIGENDIAN 1

-EOF
+_ACEOF

 
 fi
 
 
 
 fi
 
 

-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:11063: checking how to run the C++ preprocessor" >&5
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+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

 if test -z "$CXXCPP"; then
 if test -z "$CXXCPP"; then

-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi

 else
 else

-  ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-  CXXCPP="${CXX-g++} -E"
-  cat > conftest.$ac_ext <<EOF
-#line 11076 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   :
 else
   :
 else

-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CXXCPP=/lib/cpp
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes

 fi
 fi

-rm -f conftest*
-  ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+if test -z "$ac_cpp_err"; then
+  # 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
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$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 >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break

 fi
 fi

+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }

 fi
 fi

-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+

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

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_IOSTREAMH 1
 #define wxUSE_IOSTREAMH 1

-EOF
+_ACEOF

 
   else
 
   else

-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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_hdr in iostream
+for ac_header in iostream

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11125: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11130 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_cxx_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

+

 done
 
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       :
     else
 done
 
 
     if test "$ac_cv_header_iostream" = "yes" ; then
       :
     else

-      cat >> confdefs.h <<\EOF
+      cat >>confdefs.h <<\_ACEOF

 #define wxUSE_IOSTREAMH 1
 #define wxUSE_IOSTREAMH 1

-EOF
+_ACEOF

 
     fi
 
     ac_ext=c
 
     fi
 
     ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:11183: checking if C++ compiler supports bool" >&5
-if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5
+echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6
+if test "${wx_cv_cpp_bool+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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 <<EOF
-#line 11198 "configure"
-#include "confdefs.h"
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 

-      
-int main() {
+
+int
+main ()
+{

 
         bool b = true;
 
         return 0;
 
         bool b = true;
 
         return 0;

-      
-; return 0; }
-EOF
-if { (eval echo configure:11210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

         wx_cv_cpp_bool=yes
         wx_cv_cpp_bool=yes

-      
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

         wx_cv_cpp_bool=no
         wx_cv_cpp_bool=no

-      
-    
+
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

 
     ac_ext=c
 
     ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""$wx_cv_cpp_bool" 1>&6
+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
 
   if test "$wx_cv_cpp_bool" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define HAVE_BOOL 1
 #define HAVE_BOOL 1

-EOF
+_ACEOF

 
   fi
 
 
 
 
   fi
 
 
 

-  echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6
-echo "configure:11248: checking if C++ compiler supports the explicit keyword" >&5
-if eval "test \"`echo '$''{'wx_cv_explicit'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
+echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6
+if test "${wx_cv_explicit+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+
+    ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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 <<EOF
-#line 11263 "configure"
-#include "confdefs.h"
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
         class Foo { public: explicit Foo(int) {} };
 
         class Foo { public: explicit Foo(int) {} };

-      
-int main() {
+
+int
+main ()
+{

 
         return 0;
 
         return 0;

-      
-; return 0; }
-EOF
-if { (eval echo configure:11274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-        cat > conftest.$ac_ext <<EOF
-#line 11278 "configure"
-#include "confdefs.h"
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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) { }
 
                 class Foo { public: explicit Foo(int) {} };
                 static void TakeFoo(const Foo& foo) { }

-            
-int main() {
+
+int
+main ()
+{

 
                 TakeFoo(17);
                 return 0;
 
                 TakeFoo(17);
                 return 0;

-            
-; return 0; }
-EOF
-if { (eval echo configure:11291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_explicit=no
 else
   wx_cv_explicit=no
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_explicit=yes
-        
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_explicit=yes
+

 fi
 fi

-rm -f conftest*
-      
+rm -f conftest.$ac_objext conftest.$ac_ext
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_explicit=no
-    
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_explicit=no
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

 
     ac_ext=c
 
     ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""$wx_cv_explicit" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_explicit" >&5
+echo "${ECHO_T}$wx_cv_explicit" >&6

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

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define HAVE_EXPLICIT 1
 #define HAVE_EXPLICIT 1

-EOF
+_ACEOF

 
   fi
 
 
 
   fi
 
 

-echo $ac_n "checking whether the compiler supports const_cast<>""... $ac_c" 1>&6
-echo "configure:11333: checking whether the compiler supports const_cast<>" >&5
-if eval "test \"`echo '$''{'ac_cv_cxx_const_cast'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether the compiler supports const_cast<>" >&5
+echo $ECHO_N "checking whether the compiler supports const_cast<>... $ECHO_C" >&6
+if test "${ac_cv_cxx_const_cast+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
- ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross

 
 

- cat > conftest.$ac_ext <<EOF
-#line 11346 "configure"
-#include "confdefs.h"

 
 

-int main() {
+ ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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;
 int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;

-; return 0; }
-EOF
-if { (eval echo configure:11353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_cxx_const_cast=yes
 else
   ac_cv_cxx_const_cast=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cxx_const_cast=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_cxx_const_cast=no

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

  ac_ext=c
  ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""$ac_cv_cxx_const_cast" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_cxx_const_cast" >&5
+echo "${ECHO_T}$ac_cv_cxx_const_cast" >&6

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

-  cat >> confdefs.h <<\EOF
-#define HAVE_CONST_CAST 
-EOF
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CONST_CAST
+_ACEOF

 
 fi
 
 
 
 fi
 
 

+if test "$wxUSE_STL" = "yes"; then
+    ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+        echo "$as_me:$LINENO: checking for basic STL functionality" >&5
+echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+                     { { echo "$as_me:$LINENO: error: Basic STL functionality missing" >&5
+echo "$as_me: error: Basic STL functionality missing" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+        echo "$as_me:$LINENO: checking for std::wstring in <string>" >&5
+echo $ECHO_N "checking for std::wstring in <string>... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string>
+int
+main ()
+{
+std::wstring foo;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_WSTRING 1
+_ACEOF
+
+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 conftest.$ac_objext conftest.$ac_ext
+
+        echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5
+echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                    cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_STRING_COMPARE 1
+_ACEOF
+
+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 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
+

 
 SEARCH_INCLUDE="\
     /usr/local/include        \
 
 SEARCH_INCLUDE="\
     /usr/local/include        \


@@ -11447,105 +17944,130 @@ SEARCH_INCLUDE="\
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 
 

-cat > confcache <<\EOF
+cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure

-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.

 #
 #

-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.

 #
 #

-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+

 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.

-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else

   if test -w $cache_file; then
   if test -w $cache_file; then

-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file

   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 
   else
     echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
 

-

 if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
 if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then

-    echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
-echo "configure:11501: checking for glibc 2.1 or later" >&5
-if eval "test \"`echo '$''{'wx_cv_lib_glibc21'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 11507 "configure"
-#include "confdefs.h"
+    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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <features.h>
 #include <features.h>

-int main() {
+int
+main ()
+{

 
                 #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
                     #error not glibc2.1
                 #endif
 
                 #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
                     #error not glibc2.1
                 #endif

-            
-; return 0; }
-EOF
-if { (eval echo configure:11518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                 wx_cv_lib_glibc21=yes
                 wx_cv_lib_glibc21=yes

-            
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

                 wx_cv_lib_glibc21=no
                 wx_cv_lib_glibc21=no

-            
-        
-fi
-rm -f conftest*
-    
+
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_lib_glibc21" 1>&6
+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
     if test "$wx_cv_lib_glibc21" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxHAVE_GLIBC2 1
 #define wxHAVE_GLIBC2 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "x$wx_cv_lib_glibc21" = "xyes"; then
     if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
 
     fi
 fi
 
 if test "x$wx_cv_lib_glibc21" = "xyes"; then
     if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define _GNU_SOURCE 1
 #define _GNU_SOURCE 1

-EOF
+_ACEOF

 
     fi
 fi
 
     fi
 fi


@@ -11554,105 +18076,238 @@ fi
 
 REGEX_INCLUDE=
 if test "$wxUSE_REGEX" != "no"; then
 
 REGEX_INCLUDE=
 if test "$wxUSE_REGEX" != "no"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_REGEX 1
 #define wxUSE_REGEX 1

-EOF
+_ACEOF

 
 
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
 
 
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then

-                        ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:11566: checking for regex.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11571 "configure"
-#include "confdefs.h"
+                        if test "${ac_cv_header_regex_h+set}" = set; 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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
+echo "${ECHO_T}$ac_cv_header_regex_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking regex.h usability" >&5
+echo $ECHO_N "checking regex.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default

 #include <regex.h>
 #include <regex.h>

-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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 regex.h presence" >&5
+echo $ECHO_N "checking regex.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <regex.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: regex.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: regex.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: regex.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: regex.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: regex.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+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
+  ac_cv_header_regex_h=$ac_header_preproc

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5
+echo "${ECHO_T}$ac_cv_header_regex_h" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  for ac_func in regcomp
+if test $ac_cv_header_regex_h = yes; then
+
+for ac_func in regcomp

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11595: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11600 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:11623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-else
-  echo "$ac_t""no" 1>&6

 fi
 
 
 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 "configure: error: system regex library not found! Use --with-regex to use built-in version" 1>&2; exit 1; }
+                { { 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; }; }

             else
             else

-                echo "configure: warning: system regex library not found, will use built-in instead" 1>&2
+                { 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;}

                 wxUSE_REGEX=builtin
             fi
         else
                 wxUSE_REGEX=builtin
             fi
         else


@@ -11669,28 +18324,32 @@ fi
 ZLIB_INCLUDE=
 ZLIB_LINK=
 if test "$wxUSE_ZLIB" != "no" ; then
 ZLIB_INCLUDE=
 ZLIB_LINK=
 if test "$wxUSE_ZLIB" != "no" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ZLIB 1
 #define wxUSE_ZLIB 1

-EOF
+_ACEOF

 
 
     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 $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6
-echo "configure:11683: checking for zlib.h >= 1.1.4" >&5
-if eval "test \"`echo '$''{'ac_cv_header_zlib_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                                                                    echo "$as_me:$LINENO: checking for zlib.h >= 1.1.4" >&5
+echo $ECHO_N "checking for zlib.h >= 1.1.4... $ECHO_C" >&6
+if test "${ac_cv_header_zlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test "$cross_compiling" = yes; then
                       unset ac_cv_header_zlib_h
 else
   if test "$cross_compiling" = yes; then
                       unset ac_cv_header_zlib_h

-                
+

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 11692 "configure"
-#include "confdefs.h"
-                    
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

                         #include <zlib.h>
                         #include <stdio.h>
 
                         #include <zlib.h>
                         #include <stdio.h>
 


@@ -11705,109 +18364,238 @@ else
                                      ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
                             exit(0);
                         }
                                      ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
                             exit(0);
                         }

-                    
-EOF
-if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_zlib_h=`cat conftestval`
 else
   ac_cv_header_zlib_h=`cat conftestval`
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_zlib_h=no
+  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

 fi
 fi

-rm -fr conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

-            

 fi
 fi

-
-echo "$ac_t""$ac_cv_header_zlib_h" 1>&6
-                                    ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:11729: checking for zlib.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+                                    if test "${ac_cv_header_zlib_h+set}" = set; then
+  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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 11734 "configure"
-#include "confdefs.h"
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking zlib.h usability" >&5
+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default

 #include <zlib.h>
 #include <zlib.h>

-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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 zlib.h presence" >&5
+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+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
 else

-  echo "$ac_t""no" 1>&6
+  ac_cv_header_zlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
+

 fi
 
 
 fi
 
 

+

             system_zlib_h_ok=$ac_cv_header_zlib_h
         fi
 
         if test "$system_zlib_h_ok" = "yes"; then
             system_zlib_h_ok=$ac_cv_header_zlib_h
         fi
 
         if test "$system_zlib_h_ok" = "yes"; then

-            echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:11766: checking for deflate in -lz" >&5
-ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+            echo "$as_me:$LINENO: checking for deflate in -lz" >&5
+echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_deflate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lz  $LIBS"
 LIBS="-lz  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 11774 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char deflate();
-
-int main() {
-deflate()
-; return 0; }
-EOF
-if { (eval echo configure:11785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char deflate ();
+int
+main ()
+{
+deflate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_z_deflate=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_z_deflate=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
+echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
+if test $ac_cv_lib_z_deflate = yes; then

   ZLIB_LINK=" -lz"
   ZLIB_LINK=" -lz"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
         fi
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then
 fi
 
         fi
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then

-                { echo "configure: error: zlib library not found or too old! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }
+                { { 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; }; }

             else
             else

-                echo "configure: warning: zlib library not found or too old, will use built-in instead" 1>&2
+                { 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;}

                 wxUSE_ZLIB=builtin
             fi
         else
                 wxUSE_ZLIB=builtin
             fi
         else


@@ -11824,36 +18612,42 @@ fi
 PNG_INCLUDE=
 PNG_LINK=
 if test "$wxUSE_LIBPNG" != "no" ; then
 PNG_INCLUDE=
 PNG_LINK=
 if test "$wxUSE_LIBPNG" != "no" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LIBPNG 1
 #define wxUSE_LIBPNG 1

-EOF
+_ACEOF

 
 
     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
 
 
     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then

-        echo "configure: warning: wxMGL doesn't work with builtin png library, will use MGL one instead" 1>&2
+        { 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
         wxUSE_LIBPNG=sys
     fi
 
                 if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then

-        echo "configure: warning: system png library doesn't work without system zlib, will use built-in instead" 1>&2
+        { 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;}

         wxUSE_LIBPNG=builtin
     fi
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
         wxUSE_LIBPNG=builtin
     fi
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then

-                                    echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6
-echo "configure:11846: checking for png.h > 0.90" >&5
-if eval "test \"`echo '$''{'ac_cv_header_png_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                                    echo "$as_me:$LINENO: checking for png.h > 0.90" >&5
+echo $ECHO_N "checking for png.h > 0.90... $ECHO_C" >&6
+if test "${ac_cv_header_png_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test "$cross_compiling" = yes; then
                       unset ac_cv_header_png_h
 else
   if test "$cross_compiling" = yes; then
                       unset ac_cv_header_png_h

-                
+

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 11855 "configure"
-#include "confdefs.h"
-                    
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

                         #include <png.h>
                         #include <stdio.h>
 
                         #include <png.h>
                         #include <stdio.h>
 


@@ -11865,106 +18659,235 @@ else
                                      PNG_LIBPNG_VER > 90 ? "yes" : "no");
                             exit(0);
                         }
                                      PNG_LIBPNG_VER > 90 ? "yes" : "no");
                             exit(0);
                         }

-                    
-EOF
-if { (eval echo configure:11871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_png_h=`cat conftestval`
 else
   ac_cv_header_png_h=`cat conftestval`
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_png_h=no
+  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
 fi

-rm -fr conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

-            

 fi
 fi

-
-echo "$ac_t""$ac_cv_header_png_h" 1>&6
-            ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:11889: checking for png.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+echo "${ECHO_T}$ac_cv_header_png_h" >&6
+            if test "${ac_cv_header_png_h+set}" = set; then
+  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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+echo "${ECHO_T}$ac_cv_header_png_h" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 11894 "configure"
-#include "confdefs.h"
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking png.h usability" >&5
+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default

 #include <png.h>
 #include <png.h>

-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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 png.h presence" >&5
+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <png.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+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
 else

-  echo "$ac_t""no" 1>&6
+  ac_cv_header_png_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+echo "${ECHO_T}$ac_cv_header_png_h" >&6
+

 fi
 
 
 fi
 
 

+

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

-                echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:11923: checking for png_check_sig in -lpng" >&5
-ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lpng -lz -lm $LIBS"
 LIBS="-lpng -lz -lm $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 11931 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char png_check_sig();
-
-int main() {
-png_check_sig()
-; return 0; }
-EOF
-if { (eval echo configure:11942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char png_check_sig ();
+int
+main ()
+{
+png_check_sig ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_png_png_check_sig=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_png_png_check_sig=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+if test $ac_cv_lib_png_png_check_sig = yes; then

   PNG_LINK=" -lpng"
   PNG_LINK=" -lpng"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
             fi
 
             if test "x$PNG_LINK" = "x" ; then
                 if test "$wxUSE_LIBPNG" = "sys" ; then
 fi
 
             fi
 
             if test "x$PNG_LINK" = "x" ; then
                 if test "$wxUSE_LIBPNG" = "sys" ; then

-                    { echo "configure: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
+                    { { 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
                 else

-                    echo "configure: warning: system png library not found or too old, will use built-in instead" 1>&2
+                    { 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
             else
                     wxUSE_LIBPNG=builtin
                 fi
             else


@@ -11984,100 +18907,141 @@ fi
 JPEG_INCLUDE=
 JPEG_LINK=
 if test "$wxUSE_LIBJPEG" != "no" ; then
 JPEG_INCLUDE=
 JPEG_LINK=
 if test "$wxUSE_LIBJPEG" != "no" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LIBJPEG 1
 #define wxUSE_LIBJPEG 1

-EOF
+_ACEOF

 
 
     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
 
 
     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then

-        echo "configure: warning: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" 1>&2
+        { 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
         wxUSE_LIBJPEG=sys
     fi
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then

-                                                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:12001: checking for jpeglib.h" >&5
-            if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12006 "configure"
-#include "confdefs.h"
+                                                echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6
+            if test "${ac_cv_header_jpeglib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* 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() {

 
 

-                    
-; return 0; }
-EOF
-if { (eval echo configure:12018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+int
+main ()
+{
+
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_header_jpeglib_h=yes
 else
   ac_cv_header_jpeglib_h=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_jpeglib_h=no
-                
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_jpeglib_h=no
+

 fi
 fi

-rm -f conftest*
-            
+rm -f conftest.$ac_objext conftest.$ac_ext
+

 fi
 
 fi
 

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

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

-                echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:12036: checking for jpeg_read_header in -ljpeg" >&5
-ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
+echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6
+if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-ljpeg  $LIBS"
 LIBS="-ljpeg  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 12044 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char jpeg_read_header();
-
-int main() {
-jpeg_read_header()
-; return 0; }
-EOF
-if { (eval echo configure:12055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char jpeg_read_header ();
+int
+main ()
+{
+jpeg_read_header ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_jpeg_jpeg_read_header=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_jpeg_jpeg_read_header=no
+fi
+rm -f conftest.$ac_objext 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"
   JPEG_LINK=" -ljpeg"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
             fi
 
             if test "x$JPEG_LINK" = "x" ; then
                 if test "$wxUSE_LIBJPEG" = "sys" ; then
 fi
 
             fi
 
             if test "x$JPEG_LINK" = "x" ; then
                 if test "$wxUSE_LIBJPEG" = "sys" ; then

-                    { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; }
+                    { { 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
                 else

-                    echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2
+                    { 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=builtin
                 fi
             else


@@ -12096,9 +19060,9 @@ TIFF_INCLUDE=
 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 <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LIBTIFF 1
 #define wxUSE_LIBTIFF 1

-EOF
+_ACEOF

 
 
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
 
 
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then


@@ -12108,85 +19072,207 @@ EOF
         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

-        ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:12114: checking for tiffio.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12119 "configure"
-#include "confdefs.h"
+        if test "${ac_cv_header_tiffio_h+set}" = set; then
+  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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking tiffio.h usability" >&5
+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default

 #include <tiffio.h>
 #include <tiffio.h>

-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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 tiffio.h presence" >&5
+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <tiffio.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+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
+  ac_cv_header_tiffio_h=$ac_header_preproc

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
-echo "configure:12141: checking for TIFFError in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test $ac_cv_header_tiffio_h = yes; then
+  echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5
+echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6
+if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
 LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 12149 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char TIFFError();
-
-int main() {
-TIFFError()
-; return 0; }
-EOF
-if { (eval echo configure:12160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char TIFFError ();
+int
+main ()
+{
+TIFFError ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_tiff_TIFFError=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_tiff_TIFFError=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFError" >&5
+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6
+if test $ac_cv_lib_tiff_TIFFError = yes; then

   TIFF_LINK=" -ltiff"
   TIFF_LINK=" -ltiff"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-                       
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
 
 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 "configure: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" 1>&2; exit 1; }
+                { { 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; }; }

             else
             else

-                echo "configure: warning: system tiff library not found, will use built-in instead" 1>&2
+                { 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;}

                 wxUSE_LIBTIFF=builtin
             fi
         else
                 wxUSE_LIBTIFF=builtin
             fi
         else


@@ -12200,6 +19286,300 @@ fi
 fi
 
 
 fi
 
 

+if test "$wxUSE_EXPAT" != "no"; then
+    wxUSE_XML=1
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_EXPAT 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_XML 1
+_ACEOF
+
+
+    if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
+        if test "${ac_cv_header_expat_h+set}" = set; 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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking expat.h usability" >&5
+echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <expat.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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 expat.h presence" >&5
+echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <expat.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+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
+  ac_cv_header_expat_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+
+fi
+if test $ac_cv_header_expat_h = yes; then
+  found_expat_h=1
+fi
+
+
+        if test "x$found_expat_h" = "x1"; then
+                        echo "$as_me:$LINENO: checking if expat.h is valid C++ header" >&5
+echo $ECHO_N "checking if expat.h is valid C++ header... $ECHO_C" >&6
+if test "${wx_cv_expat_is_not_broken+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+                ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+                cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <expat.h>
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  wx_cv_expat_is_not_broken=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_expat_is_not_broken=no
+
+fi
+rm -f 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_expat_is_not_broken" >&5
+echo "${ECHO_T}$wx_cv_expat_is_not_broken" >&6
+            if test "$wx_cv_expat_is_not_broken" = "yes" ; then
+                echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lexpat  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XML_ParserCreate ();
+int
+main ()
+{
+XML_ParserCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_expat_XML_ParserCreate=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_expat_XML_ParserCreate=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+  EXPAT_LINK=" -lexpat"
+fi
+
+            fi
+        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; }; }
+            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;}
+                wxUSE_EXPAT=builtin
+            fi
+        else
+                        wxUSE_EXPAT=sys
+        fi
+    fi
+    if test "$wxUSE_EXPAT" = "builtin" ; then
+
+
+subdirs="$subdirs src/expat"
+
+    fi
+fi
+
+
+

 AFMINSTALL=
 WIN32INSTALL=
 
 AFMINSTALL=
 WIN32INSTALL=
 


@@ -12208,129 +19588,290 @@ TOOLKIT_INCLUDE=
 WIDGET_SET=
 
 if test "$USE_WIN32" = 1 ; then
 WIDGET_SET=
 
 if test "$USE_WIN32" = 1 ; then

-    for ac_hdr in w32api.h
+
+for ac_header in w32api.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12216: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12221 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

+

 done
 
 done
 

-    ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:12254: checking for windows.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12259 "configure"
-#include "confdefs.h"
+    if test "${ac_cv_header_windows_h+set}" = set; then
+  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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5
+echo "${ECHO_T}$ac_cv_header_windows_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking windows.h usability" >&5
+echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default

 #include <windows.h>
 #include <windows.h>

-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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 windows.h presence" >&5
+echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <windows.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi

 else
 else

-  echo "$ac_t""no" 1>&6
-
-        { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-    
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+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
+  ac_cv_header_windows_h=$ac_header_preproc

 fi
 fi

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

 
 

-
-        echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6
-echo "configure:12290: checking if w32api has good enough MSIE support" >&5
-if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test $ac_cv_header_windows_h = yes; then
+  :

 else
 else

-  
-      cat > conftest.$ac_ext <<EOF
-#line 12296 "configure"
-#include "confdefs.h"
-#include <w32api.h>
-int main() {

 
 

-                       #define wxCHECK_W32API_VERSION( major, minor ) \
-                       ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
-                       && ( ( __W32API_MAJOR_VERSION > (major) ) \
-                       || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
+        { { 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; }; }

 
 

-                       #if !wxCHECK_W32API_VERSION(1,1)
-                       #error You need w32api 1.1 or newer
-                       #endif
-                     
-; return 0; }
-EOF
-if { (eval echo configure:12312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                        wx_cv_w32api_win32_ie=yes
-                     
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                        wx_cv_w32api_win32_ie=no
-                     
-fi
-rm -f conftest*
-    

 fi
 
 fi
 

-echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6
-    if test "$wx_cv_w32api_win32_ie" = "yes" ; then
-        CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
-    fi

 
 

-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"

 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"


@@ -12338,7 +19879,7 @@ echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6
 
     case "${host}" in
         *-*-cygwin* )
 
     case "${host}" in
         *-*-cygwin* )

-                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+                        LIBS="$LIBS -lkernel32 -luser32"

             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 


@@ -12347,26 +19888,18 @@ echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6
     fi
     if test "$wxUSE_ODBC" = "yes" ; then
         LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
     fi
     if test "$wxUSE_ODBC" = "yes" ; then
         LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ODBC 1
 #define wxUSE_ODBC 1

-EOF
+_ACEOF

 
     fi
 
     fi

-    
+

     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
         WIN32INSTALL=win32install
 fi
 
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
         WIN32INSTALL=win32install
 fi
 

-if test "$USE_DARWIN" = 1; then
-            if test "$wxUSE_PRECOMP" = "yes"; then
-        CPPFLAGS="$CPPFLAGS -cpp-precomp"
-    else
-        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
-    fi
-fi
-

 if test "$wxUSE_GUI" = "yes"; then
     USE_GUI=1
 
 if test "$wxUSE_GUI" = "yes"; then
     USE_GUI=1
 


@@ -12379,21 +19912,20 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_MSW" = 1 ; then
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
     if test "$wxUSE_MSW" = 1 ; then
         TOOLKIT=MSW
         GUIDIST=MSW_DIST

-
-                        LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"

     fi
 
     if test "$wxUSE_GTK" = 1; then
     fi
 
     if test "$wxUSE_GTK" = 1; then

-        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
-echo "configure:12389: checking for GTK+ version" >&5
+        echo "$as_me:$LINENO: checking for GTK+ version" >&5
+echo $ECHO_N "checking for GTK+ version... $ECHO_C" >&6

 
         gtk_version_cached=1
 
         gtk_version_cached=1

-        if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        if test "${wx_cv_lib_gtk+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
+

                                                 gtk_version_cached=0
                                                 gtk_version_cached=0

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

 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then
 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then


@@ -12405,17 +19937,16 @@ else
                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"
                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"

-  :
+

 else
   enable_gtktest=yes
 else
   enable_gtktest=yes

-fi
-
+fi;

 
   pkg_config_args=gtk+-2.0
   for module in . $GTK_MODULES
   do
       case "$module" in
 
   pkg_config_args=gtk+-2.0
   for module in . $GTK_MODULES
   do
       case "$module" in

-         gthread) 
+         gthread)

              pkg_config_args="$pkg_config_args gthread-2.0"
          ;;
       esac
              pkg_config_args="$pkg_config_args gthread-2.0"
          ;;
       esac


@@ -12425,38 +19956,42 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12430: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  case "$PKG_CONFIG" in
-  /*)
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)

   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;

-  ?:/*)                         
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-  ;;

   *)
   *)

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi

-PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

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

 else
 else

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

 fi
 
 
 fi
 
 


@@ -12473,8 +20008,8 @@ fi
   fi
 
   min_gtk_version=2.0.0
   fi
 
   min_gtk_version=2.0.0

-  echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:12478: checking for GTK+ - version >= $min_gtk_version" >&5
+  echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6

 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs


@@ -12508,15 +20043,19 @@ echo "configure:12478: checking for GTK+ - version >= $min_gtk_version" >&5
       if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
       if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else

-  cat > conftest.$ac_ext <<EOF
-#line 12513 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 

-int 
+int

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -12535,7 +20074,7 @@ main ()
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_version))
     {
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_version))
     {

-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+      printf("\n*** 'pkg-config --modversion gtk+-2.0' 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 pkg-config was correct, then it is best\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 pkg-config was correct, then it is best\n");


@@ -12545,7 +20084,7 @@ main ()
       printf("*** required on your system.\n");
       printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
       printf("*** to point to the correct configuration files\n");
       printf("*** required on your system.\n");
       printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
       printf("*** to point to the correct configuration files\n");

-    } 
+    }

   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
           (gtk_minor_version != GTK_MINOR_VERSION) ||
            (gtk_micro_version != GTK_MICRO_VERSION))
   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
           (gtk_minor_version != GTK_MINOR_VERSION) ||
            (gtk_micro_version != GTK_MICRO_VERSION))


@@ -12583,28 +20122,40 @@ main ()
   return 1;
 }
 
   return 1;
 }
 

-EOF
-if { (eval echo configure:12588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   :
 else
   :
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  no_gtk=yes
+  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

 fi
 fi

-rm -fr conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" 1>&6
-     wx_cv_lib_gtk=2.0     
+     echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6
+     wx_cv_lib_gtk=2.0

   else
   else

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

      if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
        echo "*** See http://pkgconfig.sourceforge.net"
      if test "$PKG_CONFIG" = "no" ; then
        echo "*** A new enough version of pkg-config was not found."
        echo "*** See http://pkgconfig.sourceforge.net"


@@ -12617,19 +20168,37 @@ fi
          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 <<EOF
-#line 12622 "configure"
-#include "confdefs.h"
+          cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 #include <gtk/gtk.h>
 #include <stdio.h>
 
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 

-int main() {
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
-; return 0; }
-EOF
-if { (eval echo configure:12632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+int
+main ()
+{
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
           echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
           echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"


@@ -12638,15 +20207,15 @@ if { (eval echo configure:12632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
           echo "*** is required on your system"
          echo "***"
           echo "*** If you have an old version installed, it is best to remove it, although"
           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 "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   echo "*** The test program failed to compile or link. See the file config.log for the"
+  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."
 fi
           echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
 fi

-rm -f conftest*
+rm -f 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


@@ -12655,18 +20224,19 @@ rm -f conftest*
      GTK_LIBS=""
      :
   fi
      GTK_LIBS=""
      :
   fi

-  
-  
+
+

   rm -f conf.gtktest
 
                 else
   rm -f conf.gtktest
 
                 else

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

 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
   gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
   gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""

-fi
+fi;

 
 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then
 
 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then


@@ -12674,21 +20244,19 @@ if test "${with_gtk_exec_prefix+set}" = set; then
   gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""
   gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""

-fi
-
+fi;

 # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"
 # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"

-  :
+

 else
   enable_gtktest=yes
 else
   enable_gtktest=yes

-fi
-
+fi;

 
   for module in . $GTK_MODULES
   do
       case "$module" in
 
   for module in . $GTK_MODULES
   do
       case "$module" in

-         gthread) 
+         gthread)

              gtk_config_args="$gtk_config_args gthread"
          ;;
       esac
              gtk_config_args="$gtk_config_args gthread"
          ;;
       esac


@@ -12709,43 +20277,47 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12714: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  case "$GTK_CONFIG" in
-  /*)
+  case $GTK_CONFIG in
+  [\\/]* | ?:[\\/]*)

   ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
   ;;
   ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
   ;;

-  ?:/*)                         
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path.
-  ;;

   *)
   *)

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi

-GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
+GTK_CONFIG=$ac_cv_path_GTK_CONFIG
+

 if test -n "$GTK_CONFIG"; then
 if test -n "$GTK_CONFIG"; then

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

 else
 else

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

 fi
 
   min_gtk_version=1.2.7
 fi
 
   min_gtk_version=1.2.7

-  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:12749: checking for GTK - version >= $min_gtk_version" >&5
+  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6

   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes


@@ -12767,15 +20339,19 @@ echo "configure:12749: checking for GTK - version >= $min_gtk_version" >&5
       if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
       if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else

-  cat > conftest.$ac_ext <<EOF
-#line 12772 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 

-int 
+int

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -12794,7 +20370,7 @@ main ()
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_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", 
+      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");
              $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");


@@ -12805,7 +20381,7 @@ main ()
       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");
       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) ||
 #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) ||


@@ -12845,28 +20421,40 @@ main ()
   return 1;
 }
 
   return 1;
 }
 

-EOF
-if { (eval echo configure:12850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   :
 else
   :
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  no_gtk=yes
+  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

 fi
 fi

-rm -fr conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     echo "$ac_t""yes" 1>&6
-     wx_cv_lib_gtk=1.2.7     
+     echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+     wx_cv_lib_gtk=1.2.7

   else
   else

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

      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"


@@ -12879,19 +20467,37 @@ fi
           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 <<EOF
-#line 12884 "configure"
-#include "confdefs.h"
+          cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 #include <gtk/gtk.h>
 #include <stdio.h>
 
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 

-int main() {
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
-; return 0; }
-EOF
-if { (eval echo configure:12894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+int
+main ()
+{
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"


@@ -12905,17 +20511,17 @@ if { (eval echo configure:12894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
           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 "*** 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" 
+          echo "***    rpm --erase --nodeps gtk gtk-devel"

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   echo "*** The test program failed to compile or link. See the file config.log for the"
+  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 "*** or that you have moved GTK since it was installed. In the latter case, you"
           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" 
+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG"

 fi
 fi

-rm -f conftest*
+rm -f 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


@@ -12924,19 +20530,20 @@ rm -f conftest*
      GTK_LIBS=""
      :
   fi
      GTK_LIBS=""
      :
   fi

-  
-  
+
+

   rm -f conf.gtktest
 
 
                     if test -z "$wx_cv_lib_gtk"; then
   rm -f conf.gtktest
 
 
                     if test -z "$wx_cv_lib_gtk"; then

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

 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
   gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""
 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
   gtk_config_prefix="$withval"
 else
   gtk_config_prefix=""

-fi
+fi;

 
 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then
 
 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
 if test "${with_gtk_exec_prefix+set}" = set; then


@@ -12944,21 +20551,19 @@ if test "${with_gtk_exec_prefix+set}" = set; then
   gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""
   gtk_config_exec_prefix="$withval"
 else
   gtk_config_exec_prefix=""

-fi
-
+fi;

 # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"
 # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"

-  :
+

 else
   enable_gtktest=yes
 else
   enable_gtktest=yes

-fi
-
+fi;

 
   for module in . $GTK_MODULES
   do
       case "$module" in
 
   for module in . $GTK_MODULES
   do
       case "$module" in

-         gthread) 
+         gthread)

              gtk_config_args="$gtk_config_args gthread"
          ;;
       esac
              gtk_config_args="$gtk_config_args gthread"
          ;;
       esac


@@ -12979,43 +20584,47 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12984: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  case "$GTK_CONFIG" in
-  /*)
+  case $GTK_CONFIG in
+  [\\/]* | ?:[\\/]*)

   ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
   ;;
   ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
   ;;

-  ?:/*)                         
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path.
-  ;;

   *)
   *)

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi
   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
   ;;
 esac
 fi

-GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
+GTK_CONFIG=$ac_cv_path_GTK_CONFIG
+

 if test -n "$GTK_CONFIG"; then
 if test -n "$GTK_CONFIG"; then

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

 else
 else

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

 fi
 
   min_gtk_version=1.2.3
 fi
 
   min_gtk_version=1.2.3

-  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:13019: checking for GTK - version >= $min_gtk_version" >&5
+  echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6

   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes


@@ -13037,15 +20646,19 @@ echo "configure:13019: checking for GTK - version >= $min_gtk_version" >&5
       if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
       if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else

-  cat > conftest.$ac_ext <<EOF
-#line 13042 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 

-int 
+int

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -13064,7 +20677,7 @@ main ()
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_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", 
+      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");
              $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");


@@ -13075,7 +20688,7 @@ main ()
       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");
       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) ||
 #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) ||


@@ -13115,28 +20728,40 @@ main ()
   return 1;
 }
 
   return 1;
 }
 

-EOF
-if { (eval echo configure:13120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   :
 else
   :
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  no_gtk=yes
+  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

 fi
 fi

-rm -fr conftest*
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     echo "$ac_t""yes" 1>&6
-     wx_cv_lib_gtk=1.2.3     
+     echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+     wx_cv_lib_gtk=1.2.3

   else
   else

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

      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
      if test "$GTK_CONFIG" = "no" ; then
        echo "*** The gtk-config script installed by GTK could not be found"
        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"


@@ -13149,19 +20774,37 @@ fi
           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 <<EOF
-#line 13154 "configure"
-#include "confdefs.h"
+          cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 #include <gtk/gtk.h>
 #include <stdio.h>
 
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 

-int main() {
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
-; return 0; }
-EOF
-if { (eval echo configure:13164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+int
+main ()
+{
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"


@@ -13175,17 +20818,17 @@ if { (eval echo configure:13164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } &&
           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 "*** 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" 
+          echo "***    rpm --erase --nodeps gtk gtk-devel"

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-   echo "*** The test program failed to compile or link. See the file config.log for the"
+  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 "*** or that you have moved GTK since it was installed. In the latter case, you"
           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" 
+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG"

 fi
 fi

-rm -f conftest*
+rm -f 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


@@ -13194,8 +20837,8 @@ rm -f conftest*
      GTK_LIBS=""
      :
   fi
      GTK_LIBS=""
      :
   fi

-  
-  
+
+

   rm -f conf.gtktest
 
                     fi
   rm -f conf.gtktest
 
                     fi


@@ -13207,13 +20850,14 @@ rm -f conftest*
                                                             wx_cv_cflags_gtk=$GTK_CFLAGS
                     wx_cv_libs_gtk=$GTK_LIBS
                 fi
                                                             wx_cv_cflags_gtk=$GTK_CFLAGS
                     wx_cv_libs_gtk=$GTK_LIBS
                 fi

-            
-        
+
+

 fi
 
 
                         if test "$gtk_version_cached" = 1; then
 fi
 
 
                         if test "$gtk_version_cached" = 1; then

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

         fi
 
         case "$wx_cv_lib_gtk" in
         fi
 
         case "$wx_cv_lib_gtk" in


@@ -13225,55 +20869,66 @@ fi
                     ;;
             1.2.3)  WXGTK12=1
                     ;;
                     ;;
             1.2.3)  WXGTK12=1
                     ;;

-            *)      { echo "configure: error: 
+            *)      { { echo "$as_me:$LINENO: error:
+Please check that gtk-config is in path, the directory
+where GTK+ libraries are installed (returned by
+'gtk-config --libs' command) is in LD_LIBRARY_PATH or
+equivalent variable and GTK+ is version 1.2.3 or above.
+                            " >&5
+echo "$as_me: error:

 Please check that gtk-config is in path, the directory
 where GTK+ libraries are installed (returned by
 'gtk-config --libs' command) is in LD_LIBRARY_PATH or
 equivalent variable and GTK+ is version 1.2.3 or above.
 Please check that gtk-config is in path, the directory
 where GTK+ libraries are installed (returned by
 'gtk-config --libs' command) is in LD_LIBRARY_PATH or
 equivalent variable and GTK+ is version 1.2.3 or above.

-                            " 1>&2; exit 1; }
+                            " >&2;}
+   { (exit 1); exit 1; }; }

                     ;;
         esac
 
         if test "$WXGTK20" = 1; then
             if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
                     ;;
         esac
 
         if test "$WXGTK20" = 1; then
             if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then

-                
+

   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13247: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  case "$PKG_CONFIG" in
-  /*)
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)

   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;

-  ?:/*)                         
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-  ;;

   *)
   *)

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi

-PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

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

 else
 else

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

 fi
 
   fi
 fi
 
   fi


@@ -13286,33 +20941,36 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

-        echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
-echo "configure:13291: checking for pangoft2" >&5
+        echo "$as_me:$LINENO: checking for pangoft2" >&5
+echo $ECHO_N "checking for pangoft2... $ECHO_C" >&6

 
         if $PKG_CONFIG --exists "pangoft2" ; then
 
         if $PKG_CONFIG --exists "pangoft2" ; then

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

             succeeded=yes
 
             succeeded=yes
 

-            echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
-echo "configure:13298: checking PANGOFT2_CFLAGS" >&5
+            echo "$as_me:$LINENO: checking PANGOFT2_CFLAGS" >&5
+echo $ECHO_N "checking PANGOFT2_CFLAGS... $ECHO_C" >&6

             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`

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

 
 

-            echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
-echo "configure:13303: checking PANGOFT2_LIBS" >&5
+            echo "$as_me:$LINENO: checking PANGOFT2_LIBS" >&5
+echo $ECHO_N "checking PANGOFT2_LIBS... $ECHO_C" >&6

             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`

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

         else
             PANGOFT2_CFLAGS=""
             PANGOFT2_LIBS=""
         else
             PANGOFT2_CFLAGS=""
             PANGOFT2_LIBS=""

-            ## If we have a custom action on failure, don't print errors, but 
+            ## If we have a custom action on failure, don't print errors, but

             ## do set a variable so people can do so.
             PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
             ## do set a variable so people can do so.
             PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`

-            
+

         fi
 
         fi
 

-        
-        
+
+

      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"
      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"


@@ -13320,148 +20978,201 @@ echo "configure:13303: checking PANGOFT2_LIBS" >&5
   fi
 
   if test $succeeded = yes; then
   fi
 
   if test $succeeded = yes; then

-     
+

                         CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
                         CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"

-                        LIBS="$LIBS $PANGOFT2_LIBS"
-                    
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
+

   else
   else

-     
-                        echo "configure: warning: pangoft2 library not found, library will be compiled without printing support" 1>&2
+
+                        { 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"
                         wxUSE_PRINTING_ARCHITECTURE="no"

-                    
-                
+
+

   fi
 
             fi
         else
             if test "$wxUSE_UNICODE" = "yes"; then
   fi
 
             fi
         else
             if test "$wxUSE_UNICODE" = "yes"; then

-                echo "configure: warning: Unicode configuration not supported with GTK+ 1.x" 1>&2
+                { 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
         fi
 
                         if test "$USE_DARWIN" != 1; then
                 wxUSE_UNICODE=no
             fi
         fi
 
                         if test "$USE_DARWIN" != 1; then

-            for ac_func in poll
+
+for ac_func in poll

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13348: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 13353 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:13376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
         fi
 
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
 fi
 done
 
         fi
 
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"

-        GUI_TK_LIBRARY="$wx_cv_libs_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"

 
         AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 
 
         AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 

-                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:13410: checking for gdk_im_open in -lgdk" >&5
-ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                echo "$as_me:$LINENO: checking for gdk_im_open in -lgdk" >&5
+echo $ECHO_N "checking for gdk_im_open in -lgdk... $ECHO_C" >&6
+if test "${ac_cv_lib_gdk_gdk_im_open+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lgdk  $LIBS"
 LIBS="-lgdk  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 13418 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char gdk_im_open();
-
-int main() {
-gdk_im_open()
-; return 0; }
-EOF
-if { (eval echo configure:13429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+   builtin and then its argument prototype would still apply.  */
+char gdk_im_open ();
+int
+main ()
+{
+gdk_im_open ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_gdk_gdk_im_open=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_gdk_gdk_im_open=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_gdk_gdk_im_open" >&5
+echo "${ECHO_T}$ac_cv_lib_gdk_gdk_im_open" >&6
+if test $ac_cv_lib_gdk_gdk_im_open = yes; then
+  cat >>confdefs.h <<\_ACEOF

 #define HAVE_XIM 1
 #define HAVE_XIM 1

-EOF
+_ACEOF

 
 

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
 
     if test "$wxUSE_MGL" = 1; then
 fi
 
     fi
 
     if test "$wxUSE_MGL" = 1; then

-       echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:13456: checking for SciTech MGL library" >&5
+       echo "$as_me:$LINENO: checking for SciTech MGL library" >&5
+echo $ECHO_N "checking for SciTech MGL library... $ECHO_C" >&6

         if test "x$MGL_ROOT" = x ; then
         if test "x$MGL_ROOT" = x ; then

-            echo "$ac_t""not found" 1>&6
-            { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
+            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
         else

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

         fi
 
         fi
 

-        echo $ac_n "checking for libmgl location""... $ac_c" 1>&6
-echo "configure:13465: checking for libmgl location" >&5
+        echo "$as_me:$LINENO: checking for libmgl location" >&5
+echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6

                         case "${host}" in
             *-*-linux* )
               if test "x$wxUSE_SHARED" = xyes ; then
                         case "${host}" in
             *-*-linux* )
               if test "x$wxUSE_SHARED" = xyes ; then


@@ -13474,7 +21185,9 @@ echo "configure:13465: checking for libmgl location" >&5
               mgl_os_candidates="dos32/dj2"
               ;;
             *)
               mgl_os_candidates="dos32/dj2"
               ;;
             *)

-              { echo "configure: error: This system type ${host} is not yet supported by wxMGL." 1>&2; exit 1; }
+              { { 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=""
         esac
 
         mgl_lib_type=""


@@ -13500,10 +21213,14 @@ echo "configure:13465: checking for libmgl location" >&5
         done
 
         if test "x$mgl_os" = x ; then
         done
 
         if test "x$mgl_os" = x ; then

-            echo "$ac_t""not found" 1>&6
-            { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
+            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 "$ac_t"""$MGL_ROOT/lib/$mgl_lib_type/$mgl_os"" 1>&6
+        echo "$as_me:$LINENO: result: \"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&5
+echo "${ECHO_T}\"$MGL_ROOT/lib/$mgl_lib_type/$mgl_os\"" >&6

 
         wxUSE_UNIVERSAL="yes"
 
 
         wxUSE_UNIVERSAL="yes"
 


@@ -13516,19 +21233,26 @@ echo "configure:13465: checking for libmgl location" >&5
     fi
 
     if test "$wxUSE_MICROWIN" = 1; then
     fi
 
     if test "$wxUSE_MICROWIN" = 1; then

-        echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6
-echo "configure:13521: checking for MicroWindows" >&5
+        echo "$as_me:$LINENO: checking for MicroWindows" >&5
+echo $ECHO_N "checking for MicroWindows... $ECHO_C" >&6

         if test "x$MICROWINDOWS" = x ; then
         if test "x$MICROWINDOWS" = x ; then

-            echo "$ac_t""not found" 1>&6
-            { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; }
+            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
         else

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

         fi
 
         if test -f $MICROWINDOWS/lib/libmwin.a; then
         fi
 
         if test -f $MICROWINDOWS/lib/libmwin.a; then

-            echo "$ac_t""MicroWindows' libraries found." 1>&6
+            echo "$as_me:$LINENO: result: MicroWindows' libraries found." >&5
+echo "${ECHO_T}MicroWindows' libraries found." >&6

         else
         else

-            { echo "configure: error: Cannot find MicroWindows libraries, make sure they are compiled." 1>&2; exit 1; }
+            { { 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"
         fi
 
         TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"


@@ -13544,19 +21268,15 @@ echo "configure:13521: checking for MicroWindows" >&5
     fi
 
     if test "$wxUSE_X11" = 1; then
     fi
 
     if test "$wxUSE_X11" = 1; then

-                        # If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:13553: checking for X" >&5
+                        echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6
+

 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
   withval="$with_x"
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
   withval="$with_x"

-  :
-fi

 
 

+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 is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.


@@ -13566,193 +21286,184 @@ else
     # Both variables are already set.
     have_x=yes
   else
     # Both variables are already set.
     have_x=yes
   else

-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    if test "${ac_cv_have_x+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   # One or both of the vars are not set, and there is no cached value.
 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 -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
+ac_x_includes=no ac_x_libraries=no
+rm -fr conftest.dir
+if mkdir conftest.dir; then
+  cd conftest.dir

   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   # Make sure to not put "make" in the Imakefile rules, since we grep it out.

-  cat > Imakefile <<'EOF'
+  cat >Imakefile <<'_ACEOF'

 acfindx:
        @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
 acfindx:
        @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'

-EOF
+_ACEOF

   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl; do
       if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
     for ac_extension in a so sl; do
       if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&

-        test -f $ac_im_libdir/libX11.$ac_extension; then
+         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.
         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
+    case $ac_im_incroot in

        /usr/include) ;;
        /usr/include) ;;

-       *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
+       *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;

     esac
     esac

-    case "$ac_im_usrlibdir" in
+    case $ac_im_usrlibdir in

        /usr/lib | /lib) ;;
        /usr/lib | /lib) ;;

-       *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
+       *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;

     esac
   fi
   cd ..
     esac
   fi
   cd ..

-  rm -fr conftestdir
+  rm -fr conftest.dir

 fi
 
 fi
 

-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
+# 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
+
+/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
+
+/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 Intrinsic.h.

   # First, try using that file with no special directory specified.
   # First, try using that file with no special directory specified.

-cat > conftest.$ac_ext <<EOF
-#line 13615 "configure"
-#include "confdefs.h"
-#include <$x_direct_test_include>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Intrinsic.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then

   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else

-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /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  \
-                              \
-    /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  \
-                              \
-    /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 \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  for ac_dir in $ac_x_header_dirs; do
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
+    ac_x_includes=$ac_dir
+    break
+  fi
+done

 fi
 fi

-rm -f conftest*
-fi # $ac_x_includes = NO
+rm -f conftest.err conftest.$ac_ext
+fi # $ac_x_includes = no

 
 

-if test "$ac_x_libraries" = NO; then
+if test "$ac_x_libraries" = no; then

   # Check for the libraries.
   # Check for the libraries.

-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-

   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.

-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 13689 "configure"
-#include "confdefs.h"
-
-int main() {
-${x_direct_test_function}()
-; return 0; }
-EOF
-if { (eval echo configure:13696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
+  ac_save_LIBS=$LIBS
+  LIBS="-lXt $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Intrinsic.h>
+int
+main ()
+{
+XtMalloc (0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  LIBS=$ac_save_LIBS

 # We can link X programs with no special library path.
 ac_x_libraries=
 else
 # We can link X programs with no special library path.
 ac_x_libraries=
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11     \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
+  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
 do

+  # Don't even attempt the hair of trying to link an X program!

   for ac_extension in a so sl; do
   for ac_extension in a so sl; do

-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+    if test -r $ac_dir/libXt.$ac_extension; then

       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi

-rm -f conftest*
-fi # $ac_x_libraries = NO
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi # $ac_x_libraries = no

 
 

-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then

   # Didn't find X anywhere.  Cache the known absence of X.
   ac_cv_have_x="have_x=no"
 else
   # Didn't find X anywhere.  Cache the known absence of X.
   ac_cv_have_x="have_x=no"
 else


@@ -13761,12 +21472,14 @@ else
                ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
 fi
 fi
                ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
 fi
 fi

+

   fi
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
   fi
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then

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

   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.


@@ -13775,14 +21488,16 @@ else
   # 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"
   # 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 "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6

 fi
 
 if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 fi
 
 if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.

-  cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF

 #define X_DISPLAY_MISSING 1
 #define X_DISPLAY_MISSING 1

-EOF
+_ACEOF

 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else


@@ -13795,60 +21510,99 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .

-    case "`(uname -sr) 2>/dev/null`" in
+    case `(uname -sr) 2>/dev/null` in

     "SunOS 5"*)
     "SunOS 5"*)

-      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:13802: checking whether -R must be followed by a space" >&5
-      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-      cat > conftest.$ac_ext <<EOF
-#line 13805 "configure"
-#include "confdefs.h"
-
-int main() {
+      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-; return 0; }
-EOF
-if { (eval echo configure:13812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_R_nospace=yes
 else
   ac_R_nospace=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_nospace=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_R_nospace=no

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

       if test $ac_R_nospace = yes; then
       if test $ac_R_nospace = yes; then

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

        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"

-       cat > conftest.$ac_ext <<EOF
-#line 13828 "configure"
-#include "confdefs.h"
-
-int main() {
+       cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-; return 0; }
-EOF
-if { (eval echo configure:13835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_R_space=yes
 else
   ac_R_space=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_space=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_R_space=no

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

        if test $ac_R_space = yes; then
        if test $ac_R_space = yes; then

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

          X_LIBS="$X_LIBS -R $x_libraries"
        else
          X_LIBS="$X_LIBS -R $x_libraries"
        else

-         echo "$ac_t""neither works" 1>&6
+         echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6

        fi
       fi
        fi
       fi

-      LIBS="$ac_xsave_LIBS"
+      LIBS=$ac_xsave_LIBS

     esac
   fi
 
     esac
   fi
 


@@ -13859,528 +21613,862 @@ rm -f conftest*
   if test "$ISC" = yes; then
     X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
   else
   if test "$ISC" = yes; then
     X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
   else

-    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And karl@cs.umb.edu says
+    # 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).
     # the Alpha needs dnet_stub (dnet does not exist).

-    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:13867: checking for dnet_ntoa in -ldnet" >&5
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 13875 "configure"
-#include "confdefs.h"
+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
+   builtin and then its argument prototype would still apply.  */
+char XOpenDisplay ();
+int
+main ()
+{
+XOpenDisplay ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:13886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+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
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dnet_ntoa ();
+int
+main ()
+{
+dnet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dnet_dnet_ntoa=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_dnet_ntoa=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

-      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:13908: checking for dnet_ntoa in -ldnet_stub" >&5
-ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-ldnet_stub  $LIBS"
 LIBS="-ldnet_stub  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 13916 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:13927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dnet_ntoa ();
+int
+main ()
+{
+dnet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dnet_stub_dnet_ntoa=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_stub_dnet_ntoa=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
 fi
 
     fi

+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+    LIBS="$ac_xsave_LIBS"

 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     # to get the SysV transport functions.
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     # to get the SysV transport functions.

-    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)

     # needs -lnsl.
     # The nsl library prevents programs from opening the X display
     # needs -lnsl.
     # The nsl library prevents programs from opening the X display

-    # on Irix 5.2, according to dickey@clark.net.
-    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:13956: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 13961 "configure"
-#include "confdefs.h"
+    # 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char gethostbyname(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
 choke me
 #else
 /* 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
 #else

-gethostbyname();
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:13984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != gethostbyname;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_gethostbyname=no
+fi
+rm -f conftest.$ac_objext 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 = no; then
 
     if test $ac_cv_func_gethostbyname = no; then

-      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:14005: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lnsl  $LIBS"
 LIBS="-lnsl  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 14013 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:14024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_nsl_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f conftest.$ac_objext 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 conftest*
-LIBS="$ac_save_LIBS"

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+      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

 else
 else

-  echo "$ac_t""no" 1>&6
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_bsd_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_bsd_gethostbyname=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+if test $ac_cv_lib_bsd_gethostbyname = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"

 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
     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@lia.di.epfl.ch: it contains
-    # gethostby* variants that don't use the nameserver (or something).
-    # -lsocket must be given before -lnsl if both are needed.
-    # We assume that if connect needs -lnsl, so does gethostbyname.
-    echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:14054: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14059 "configure"
-#include "confdefs.h"
+    # 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
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char connect(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char connect ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_connect) || defined (__stub___connect)
 choke me
 #else
 /* 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
 #else

-connect();
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:14082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != connect;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6

 
     if test $ac_cv_func_connect = no; then
 
     if test $ac_cv_func_connect = no; then

-      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:14103: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 14111 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:14122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char connect ();
+int
+main ()
+{
+connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_connect=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
 
 fi
 
     fi
 

-    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-    echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:14146: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14151 "configure"
-#include "confdefs.h"
+    # 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char remove(); below.  */
-#include <assert.h>
+    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.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char remove ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_remove) || defined (__stub___remove)
 choke me
 #else
 /* 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
 #else

-remove();
+char (*f) () = remove;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:14174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_remove=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != remove;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_remove=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_remove=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6

 
     if test $ac_cv_func_remove = no; then
 
     if test $ac_cv_func_remove = no; then

-      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:14195: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+if test "${ac_cv_lib_posix_remove+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lposix  $LIBS"
 LIBS="-lposix  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 14203 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-remove()
-; return 0; }
-EOF
-if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char remove ();
+int
+main ()
+{
+remove ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_posix_remove=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_posix_remove=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+if test $ac_cv_lib_posix_remove = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:14238: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 14243 "configure"
-#include "confdefs.h"
+    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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char shmat(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char shmat ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_shmat) || defined (__stub___shmat)
 choke me
 #else
 /* 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
 #else

-shmat();
+char (*f) () = shmat;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:14266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != shmat;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shmat=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shmat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6

 
     if test $ac_cv_func_shmat = no; then
 
     if test $ac_cv_func_shmat = no; then

-      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:14287: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lipc  $LIBS"
 LIBS="-lipc  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 14295 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-shmat()
-; return 0; }
-EOF
-if { (eval echo configure:14306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char shmat ();
+int
+main ()
+{
+shmat ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ipc_shmat=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ipc_shmat=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
   fi
 
   # Check for libraries that X11R6 Xt/Xaw programs need.
 fi
 
     fi
   fi
 
   # Check for libraries that X11R6 Xt/Xaw programs need.

-  ac_save_LDFLAGS="$LDFLAGS"
+  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.
   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.

-  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:14339: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
+  # 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"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 14347 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber();
-
-int main() {
-IceConnectionNumber()
-; return 0; }
-EOF
-if { (eval echo configure:14358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char IceConnectionNumber ();
+int
+main ()
+{
+IceConnectionNumber ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ICE_IceConnectionNumber=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ICE_IceConnectionNumber=no
+fi
+rm -f conftest.$ac_objext 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"
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-  LDFLAGS="$ac_save_LDFLAGS"
+  LDFLAGS=$ac_save_LDFLAGS

 
 fi
 
 
         if test "$no_x" = "yes"; then
 
 fi
 
 
         if test "$no_x" = "yes"; then

-          { echo "configure: error: X11 not found" 1>&2; exit 1; }
+          { { echo "$as_me:$LINENO: error: X11 not found" >&5
+echo "$as_me: error: X11 not found" >&2;}
+   { (exit please use --x-includes and/or --x-libraries options); exit please use --x-includes and/or --x-libraries options; }; }

         fi
 
         GUI_TK_LIBRARY="$X_LIBS"
         fi
 
         GUI_TK_LIBRARY="$X_LIBS"


@@ -14389,24 +22477,28 @@ fi
         COMPILED_X_PROGRAM=0
 
         if test "$wxUSE_NANOX" = "yes"; then
         COMPILED_X_PROGRAM=0
 
         if test "$wxUSE_NANOX" = "yes"; then

-            echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
-echo "configure:14394: checking for MicroWindows/NanoX distribution" >&5
+            echo "$as_me:$LINENO: checking for MicroWindows/NanoX distribution" >&5
+echo $ECHO_N "checking for MicroWindows/NanoX distribution... $ECHO_C" >&6

             if test "x$MICROWIN" = x ; then
             if test "x$MICROWIN" = x ; then

-                echo "$ac_t""not found" 1>&6
-                { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; }
+                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
             else

-                echo "$ac_t""$MICROWIN" 1>&6
-                cat >> confdefs.h <<\EOF
+                echo "$as_me:$LINENO: result: $MICROWIN" >&5
+echo "${ECHO_T}$MICROWIN" >&6
+                cat >>confdefs.h <<\_ACEOF

 #define wxUSE_NANOX 1
 #define wxUSE_NANOX 1

-EOF
+_ACEOF

 
             fi
         fi
 
         xpm_link=
 
             fi
         fi
 
         xpm_link=

-        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:14409: checking for Xpm library" >&5
-        
+        echo "$as_me:$LINENO: checking for Xpm library" >&5
+echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
+

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do


@@ -14419,7 +22511,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
   done
 
         if test "$ac_find_libraries" != "" ; then
   done
 
         if test "$ac_find_libraries" != "" ; then

-            
+

   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -14430,132 +22522,176 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
             xpm_link=" -lXpm"
 
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
             xpm_link=" -lXpm"

-            cat >> confdefs.h <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define wxHAVE_LIB_XPM 1
 #define wxHAVE_LIB_XPM 1

-EOF
+_ACEOF

 
 

-            echo "$ac_t""found at $ac_find_libraries" 1>&6
+            echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
+echo "${ECHO_T}found at $ac_find_libraries" >&6

         else
         else

-            cat > conftest.$ac_ext <<EOF
-#line 14441 "configure"
-#include "confdefs.h"
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                     #include <X11/xpm.h>
 
                     #include <X11/xpm.h>

-                
-int main() {
+
+int
+main ()
+{

 
                     int version;
                     version = XpmLibraryVersion();
 
                     int version;
                     version = XpmLibraryVersion();

-                
-; return 0; }
-EOF
-if { (eval echo configure:14453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                     xpm_link=" -lXpm"
                     xpm_link=" -lXpm"

-                    cat >> confdefs.h <<\EOF
+                    cat >>confdefs.h <<\_ACEOF

 #define wxHAVE_LIB_XPM 1
 #define wxHAVE_LIB_XPM 1

-EOF
+_ACEOF

 
 

-                    echo "$ac_t""found in default search path" 1>&6
+                    echo "$as_me:$LINENO: result: found in default search path" >&5
+echo "${ECHO_T}found in default search path" >&6

                     COMPILED_X_PROGRAM=0
                     COMPILED_X_PROGRAM=0

-                
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    echo "$ac_t""no" 1>&6
-                    echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
-                
-            
+  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: WARNING: library will be compiled without support for images in XPM format" >&5
+echo "$as_me: WARNING: library will be compiled without support for images in XPM format" >&2;}
+
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

         fi
 
         fi
 

-        echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
-echo "configure:14478: checking for XShapeQueryExtension in -lXext" >&5
-ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
+echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6
+if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
 LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 14486 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char XShapeQueryExtension();
-
-int main() {
-XShapeQueryExtension()
-; return 0; }
-EOF
-if { (eval echo configure:14497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+   builtin and then its argument prototype would still apply.  */
+char XShapeQueryExtension ();
+int
+main ()
+{
+XShapeQueryExtension ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_Xext_XShapeQueryExtension=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xext_XShapeQueryExtension=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6
+if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  

                       GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
                       wxHAVE_XEXT_LIB=1
                       GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
                       wxHAVE_XEXT_LIB=1

-                     
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
 
         if test "$wxUSE_UNICODE" = "yes"; then
 fi
 
 
         if test "$wxUSE_UNICODE" = "yes"; then

-                
+

   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14529: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  case "$PKG_CONFIG" in
-  /*)
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)

   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;

-  ?:/*)                         
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-  ;;

   *)
   *)

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi

-PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

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

 else
 else

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

 fi
 
   fi
 fi
 
   fi


@@ -14568,33 +22704,36 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

-        echo $ac_n "checking for pangox""... $ac_c" 1>&6
-echo "configure:14573: checking for pangox" >&5
+        echo "$as_me:$LINENO: checking for pangox" >&5
+echo $ECHO_N "checking for pangox... $ECHO_C" >&6

 
         if $PKG_CONFIG --exists "pangox" ; then
 
         if $PKG_CONFIG --exists "pangox" ; then

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

             succeeded=yes
 
             succeeded=yes
 

-            echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6
-echo "configure:14580: checking PANGOX_CFLAGS" >&5
+            echo "$as_me:$LINENO: checking PANGOX_CFLAGS" >&5
+echo $ECHO_N "checking PANGOX_CFLAGS... $ECHO_C" >&6

             PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"`
             PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"`

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

 
 

-            echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6
-echo "configure:14585: checking PANGOX_LIBS" >&5
+            echo "$as_me:$LINENO: checking PANGOX_LIBS" >&5
+echo $ECHO_N "checking PANGOX_LIBS... $ECHO_C" >&6

             PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`
             PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`

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

         else
             PANGOX_CFLAGS=""
             PANGOX_LIBS=""
         else
             PANGOX_CFLAGS=""
             PANGOX_LIBS=""

-            ## If we have a custom action on failure, don't print errors, but 
+            ## If we have a custom action on failure, don't print errors, but

             ## do set a variable so people can do so.
             PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"`
             ## do set a variable so people can do so.
             PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"`

-            
+

         fi
 
         fi
 

-        
-        
+
+

      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"
      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"


@@ -14602,55 +22741,61 @@ echo "configure:14585: checking PANGOX_LIBS" >&5
   fi
 
   if test $succeeded = yes; then
   fi
 
   if test $succeeded = yes; then

-     
+

                         CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
                         CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"

-                        LIBS="$LIBS $PANGOX_LIBS"
-                    
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
+

   else
   else

-     
-                        { echo "configure: error: pangox library not found, library cannot be compiled in Unicode mode" 1>&2; exit 1; }
-                    
-                
+
+                        { { 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; }; }
+
+

   fi
 
   fi
 

-                
+

   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14624: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  case "$PKG_CONFIG" in
-  /*)
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)

   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;

-  ?:/*)                         
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-  ;;

   *)
   *)

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi

-PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

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

 else
 else

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

 fi
 
   fi
 fi
 
   fi


@@ -14663,33 +22808,36 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

-        echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
-echo "configure:14668: checking for pangoft2" >&5
+        echo "$as_me:$LINENO: checking for pangoft2" >&5
+echo $ECHO_N "checking for pangoft2... $ECHO_C" >&6

 
         if $PKG_CONFIG --exists "pangoft2" ; then
 
         if $PKG_CONFIG --exists "pangoft2" ; then

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

             succeeded=yes
 
             succeeded=yes
 

-            echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
-echo "configure:14675: checking PANGOFT2_CFLAGS" >&5
+            echo "$as_me:$LINENO: checking PANGOFT2_CFLAGS" >&5
+echo $ECHO_N "checking PANGOFT2_CFLAGS... $ECHO_C" >&6

             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`

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

 
 

-            echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
-echo "configure:14680: checking PANGOFT2_LIBS" >&5
+            echo "$as_me:$LINENO: checking PANGOFT2_LIBS" >&5
+echo $ECHO_N "checking PANGOFT2_LIBS... $ECHO_C" >&6

             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`

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

         else
             PANGOFT2_CFLAGS=""
             PANGOFT2_LIBS=""
         else
             PANGOFT2_CFLAGS=""
             PANGOFT2_LIBS=""

-            ## If we have a custom action on failure, don't print errors, but 
+            ## If we have a custom action on failure, don't print errors, but

             ## do set a variable so people can do so.
             PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
             ## do set a variable so people can do so.
             PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`

-            
+

         fi
 
         fi
 

-        
-        
+
+

      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"
      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"


@@ -14697,56 +22845,61 @@ echo "configure:14680: checking PANGOFT2_LIBS" >&5
   fi
 
   if test $succeeded = yes; then
   fi
 
   if test $succeeded = yes; then

-     
+

                         CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
                         CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"

-                        LIBS="$LIBS $PANGOFT2_LIBS"
-                    
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
+

   else
   else

-     
-                        echo "configure: warning: pangoft2 library not found, library will be compiled without printing support" 1>&2
+
+                        { 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"
                         wxUSE_PRINTING_ARCHITECTURE="no"

-                    
-                
+
+

   fi
 
   fi
 

-                
+

   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
   succeeded=no
 
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14720: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  case "$PKG_CONFIG" in
-  /*)
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)

   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;

-  ?:/*)                         
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-  ;;

   *)
   *)

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi

-PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+

 if test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG"; then

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

 else
 else

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

 fi
 
   fi
 fi
 
   fi


@@ -14759,33 +22912,36 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then

-        echo $ac_n "checking for pangoxft""... $ac_c" 1>&6
-echo "configure:14764: checking for pangoxft" >&5
+        echo "$as_me:$LINENO: checking for pangoxft" >&5
+echo $ECHO_N "checking for pangoxft... $ECHO_C" >&6

 
         if $PKG_CONFIG --exists "pangoxft" ; then
 
         if $PKG_CONFIG --exists "pangoxft" ; then

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

             succeeded=yes
 
             succeeded=yes
 

-            echo $ac_n "checking PANGOXFT_CFLAGS""... $ac_c" 1>&6
-echo "configure:14771: checking PANGOXFT_CFLAGS" >&5
+            echo "$as_me:$LINENO: checking PANGOXFT_CFLAGS" >&5
+echo $ECHO_N "checking PANGOXFT_CFLAGS... $ECHO_C" >&6

             PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"`
             PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"`

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

 
 

-            echo $ac_n "checking PANGOXFT_LIBS""... $ac_c" 1>&6
-echo "configure:14776: checking PANGOXFT_LIBS" >&5
+            echo "$as_me:$LINENO: checking PANGOXFT_LIBS" >&5
+echo $ECHO_N "checking PANGOXFT_LIBS... $ECHO_C" >&6

             PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"`
             PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"`

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

         else
             PANGOXFT_CFLAGS=""
             PANGOXFT_LIBS=""
         else
             PANGOXFT_CFLAGS=""
             PANGOXFT_LIBS=""

-            ## If we have a custom action on failure, don't print errors, but 
+            ## If we have a custom action on failure, don't print errors, but

             ## do set a variable so people can do so.
             PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft"`
             ## do set a variable so people can do so.
             PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft"`

-            
+

         fi
 
         fi
 

-        
-        
+
+

      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"
      else
         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"


@@ -14793,15 +22949,16 @@ echo "configure:14776: checking PANGOXFT_LIBS" >&5
   fi
 
   if test $succeeded = yes; then
   fi
 
   if test $succeeded = yes; then

-     
+

                         CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
                         CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"

-                        LIBS="$LIBS $PANGOXFT_LIBS"
-                    
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
+

   else
   else

-     
-                        echo "configure: warning: pangoxft library not found, library will be compiled without anti-aliasing support" 1>&2
-                    
-                
+
+                        { 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;}
+
+

   fi
 
         fi
   fi
 
         fi


@@ -14824,9 +22981,10 @@ echo "configure:14776: checking PANGOXFT_LIBS" >&5
     if test "$wxUSE_MOTIF" = 1; then
                         if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
     if test "$wxUSE_MOTIF" = 1; then
                         if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.

-  cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF

 #define X_DISPLAY_MISSING 1
 #define X_DISPLAY_MISSING 1

-EOF
+_ACEOF

 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else


@@ -14839,60 +22997,99 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .

-    case "`(uname -sr) 2>/dev/null`" in
+    case `(uname -sr) 2>/dev/null` in

     "SunOS 5"*)
     "SunOS 5"*)

-      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:14846: checking whether -R must be followed by a space" >&5
-      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-      cat > conftest.$ac_ext <<EOF
-#line 14849 "configure"
-#include "confdefs.h"
-
-int main() {
+      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-; return 0; }
-EOF
-if { (eval echo configure:14856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_R_nospace=yes
 else
   ac_R_nospace=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_nospace=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_R_nospace=no

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

       if test $ac_R_nospace = yes; then
       if test $ac_R_nospace = yes; then

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

        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        X_LIBS="$X_LIBS -R$x_libraries"
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"

-       cat > conftest.$ac_ext <<EOF
-#line 14872 "configure"
-#include "confdefs.h"
-
-int main() {
+       cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-; return 0; }
-EOF
-if { (eval echo configure:14879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_R_space=yes
 else
   ac_R_space=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_space=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_R_space=no

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

        if test $ac_R_space = yes; then
        if test $ac_R_space = yes; then

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

          X_LIBS="$X_LIBS -R $x_libraries"
        else
          X_LIBS="$X_LIBS -R $x_libraries"
        else

-         echo "$ac_t""neither works" 1>&6
+         echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6

        fi
       fi
        fi
       fi

-      LIBS="$ac_xsave_LIBS"
+      LIBS=$ac_xsave_LIBS

     esac
   fi
 
     esac
   fi
 


@@ -14903,528 +23100,862 @@ rm -f conftest*
   if test "$ISC" = yes; then
     X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
   else
   if test "$ISC" = yes; then
     X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
   else

-    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And karl@cs.umb.edu says
+    # 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).
     # the Alpha needs dnet_stub (dnet does not exist).

-    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:14911: checking for dnet_ntoa in -ldnet" >&5
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14919 "configure"
-#include "confdefs.h"
+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:14930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+   builtin and then its argument prototype would still apply.  */
+char XOpenDisplay ();
+int
+main ()
+{
+XOpenDisplay ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dnet_ntoa ();
+int
+main ()
+{
+dnet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dnet_dnet_ntoa=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_dnet_ntoa=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

-      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:14952: checking for dnet_ntoa in -ldnet_stub" >&5
-ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-ldnet_stub  $LIBS"
 LIBS="-ldnet_stub  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 14960 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
-
-int main() {
-dnet_ntoa()
-; return 0; }
-EOF
-if { (eval echo configure:14971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char dnet_ntoa ();
+int
+main ()
+{
+dnet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dnet_stub_dnet_ntoa=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_stub_dnet_ntoa=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
 fi
 
     fi

+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+    LIBS="$ac_xsave_LIBS"

 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     # to get the SysV transport functions.
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
     # to get the SysV transport functions.

-    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)

     # needs -lnsl.
     # The nsl library prevents programs from opening the X display
     # needs -lnsl.
     # The nsl library prevents programs from opening the X display

-    # on Irix 5.2, according to dickey@clark.net.
-    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:15000: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15005 "configure"
-#include "confdefs.h"
+    # 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char gethostbyname(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
 choke me
 #else
 /* 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
 #else

-gethostbyname();
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:15028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != gethostbyname;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_gethostbyname=no
+fi
+rm -f conftest.$ac_objext 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 = no; then
 
     if test $ac_cv_func_gethostbyname = no; then

-      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:15049: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lnsl  $LIBS"
 LIBS="-lnsl  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 15057 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:15068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_nsl_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f conftest.$ac_objext 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 conftest*
-LIBS="$ac_save_LIBS"

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+      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

 else
 else

-  echo "$ac_t""no" 1>&6
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_bsd_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_bsd_gethostbyname=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+if test $ac_cv_lib_bsd_gethostbyname = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"

 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
     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@lia.di.epfl.ch: it contains
-    # gethostby* variants that don't use the nameserver (or something).
-    # -lsocket must be given before -lnsl if both are needed.
-    # We assume that if connect needs -lnsl, so does gethostbyname.
-    echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:15098: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15103 "configure"
-#include "confdefs.h"
+    # 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
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char connect(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char connect ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_connect) || defined (__stub___connect)
 choke me
 #else
 /* 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
 #else

-connect();
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:15126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_connect=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != connect;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_connect=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6

 
     if test $ac_cv_func_connect = no; then
 
     if test $ac_cv_func_connect = no; then

-      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:15147: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 15155 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:15166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char connect ();
+int
+main ()
+{
+connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_connect=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
 
 fi
 
     fi
 

-    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-    echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:15190: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15195 "configure"
-#include "confdefs.h"
+    # 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char remove(); below.  */
-#include <assert.h>
+    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.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char remove ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_remove) || defined (__stub___remove)
 choke me
 #else
 /* 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
 #else

-remove();
+char (*f) () = remove;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:15218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_remove=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != remove;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_remove=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_remove=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6

 
     if test $ac_cv_func_remove = no; then
 
     if test $ac_cv_func_remove = no; then

-      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:15239: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+if test "${ac_cv_lib_posix_remove+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lposix  $LIBS"
 LIBS="-lposix  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 15247 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char remove();
-
-int main() {
-remove()
-; return 0; }
-EOF
-if { (eval echo configure:15258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char remove ();
+int
+main ()
+{
+remove ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_posix_remove=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_posix_remove=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+if test $ac_cv_lib_posix_remove = yes; then

   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

-    echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:15282: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15287 "configure"
-#include "confdefs.h"
+    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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char shmat(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char shmat ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_shmat) || defined (__stub___shmat)
 choke me
 #else
 /* 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
 #else

-shmat();
+char (*f) () = shmat;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:15310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
+int
+main ()
+{
+return f != shmat;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shmat=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shmat=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6

 
     if test $ac_cv_func_shmat = no; then
 
     if test $ac_cv_func_shmat = no; then

-      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:15331: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lipc  $LIBS"
 LIBS="-lipc  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 15339 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char shmat();
-
-int main() {
-shmat()
-; return 0; }
-EOF
-if { (eval echo configure:15350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char shmat ();
+int
+main ()
+{
+shmat ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ipc_shmat=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ipc_shmat=no
+fi
+rm -f conftest.$ac_objext 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"
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
     fi
   fi
 
   # Check for libraries that X11R6 Xt/Xaw programs need.
 fi
 
     fi
   fi
 
   # Check for libraries that X11R6 Xt/Xaw programs need.

-  ac_save_LDFLAGS="$LDFLAGS"
+  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.
   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.

-  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:15383: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
+  # 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"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 15391 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber();
-
-int main() {
-IceConnectionNumber()
-; return 0; }
-EOF
-if { (eval echo configure:15402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char IceConnectionNumber ();
+int
+main ()
+{
+IceConnectionNumber ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ICE_IceConnectionNumber=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ICE_IceConnectionNumber=no
+fi
+rm -f conftest.$ac_objext 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"
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"

-else
-  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-  LDFLAGS="$ac_save_LDFLAGS"
+  LDFLAGS=$ac_save_LDFLAGS

 
 fi
 
 
         if test "$no_x" = "yes"; then
 
 fi
 
 
         if test "$no_x" = "yes"; then

-          { echo "configure: error: X11 not found" 1>&2; exit 1; }
+          { { echo "$as_me:$LINENO: error: X11 not found" >&5
+echo "$as_me: error: X11 not found" >&2;}
+   { (exit please use --x-includes and/or --x-libraries options); exit please use --x-includes and/or --x-libraries options; }; }

         fi
 
                         GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
         fi
 
                         GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`


@@ -15432,9 +23963,9 @@ fi
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 

-        echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:15437: checking for Motif/Lesstif headers" >&5
-        
+        echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5
+echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6
+

 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include;
   do
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE /usr/include;
   do


@@ -15445,8 +23976,9 @@ for ac_dir in $SEARCH_INCLUDE /usr/include;
   done
 
         if test "$ac_find_includes" != "" ; then
   done
 
         if test "$ac_find_includes" != "" ; then

-            echo "$ac_t""found in $ac_find_includes" 1>&6
-            
+            echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
+echo "${ECHO_T}found in $ac_find_includes" >&6
+

     if test "x$ac_find_includes" = "x/usr/include"; then
     ac_path_to_include=""
   else
     if test "x$ac_find_includes" = "x/usr/include"; then
     ac_path_to_include=""
   else


@@ -15461,42 +23993,64 @@ for ac_dir in $SEARCH_INCLUDE /usr/include;
 
             TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
         else
 
             TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
         else

-            cat > conftest.$ac_ext <<EOF
-#line 15466 "configure"
-#include "confdefs.h"
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                     #include <Xm/Xm.h>
 
                     #include <Xm/Xm.h>

-                
-int main() {
+
+int
+main ()
+{

 
                     int version;
                     version = xmUseVersion;
 
                     int version;
                     version = xmUseVersion;

-                
-; return 0; }
-EOF
-if { (eval echo configure:15478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    echo "$ac_t""found in default search path" 1>&6
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                    echo "$as_me:$LINENO: result: found in default search path" >&5
+echo "${ECHO_T}found in default search path" >&6

                     COMPILED_X_PROGRAM=1
                     COMPILED_X_PROGRAM=1

-                
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    echo "$ac_t""no" 1>&6
-                    { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
-                
-            
+  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 CFLAGS to contain the location of Xm/Xm.h" >&5
+echo "$as_me: error: please set CFLAGS to contain the location of Xm/Xm.h" >&2;}
+   { (exit 1); exit 1; }; }
+
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

         fi
 
         if test "$COMPILED_X_PROGRAM" = 0; then
         fi
 
         if test "$COMPILED_X_PROGRAM" = 0; then

-            echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:15499: checking for Motif/Lesstif library" >&5
-            
+            echo "$as_me:$LINENO: checking for Motif/Lesstif library" >&5
+echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6
+

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do


@@ -15509,9 +24063,10 @@ for ac_dir in $SEARCH_LIB /usr/lib;
   done
 
             if test "$ac_find_libraries" != "" ; then
   done
 
             if test "$ac_find_libraries" != "" ; then

-                echo "$ac_t""found at $ac_find_libraries" 1>&6
+                echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
+echo "${ECHO_T}found at $ac_find_libraries" >&6
+

 
 

-                

   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -15525,45 +24080,67 @@ for ac_dir in $SEARCH_LIB /usr/lib;
                                                                 save_CFLAGS=$CFLAGS
                 CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
                                                                 save_CFLAGS=$CFLAGS
                 CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 

-                cat > conftest.$ac_ext <<EOF
-#line 15530 "configure"
-#include "confdefs.h"
+                cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                         #include <Xm/Xm.h>
 
                         #include <Xm/Xm.h>

-                    
-int main() {
+
+int
+main ()
+{

 
                         int version;
                         version = xmUseVersion;
 
                         int version;
                         version = xmUseVersion;

-                    
-; return 0; }
-EOF
-if { (eval echo configure:15542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                        echo "$ac_t""found in default search path" 1>&6
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                        echo "$as_me:$LINENO: result: found in default search path" >&5
+echo "${ECHO_T}found in default search path" >&6

                         COMPILED_X_PROGRAM=1
                         COMPILED_X_PROGRAM=1

-                    
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                        echo "$ac_t""no" 1>&6
-                        { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
-                    
-                
+  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 LDFLAGS to contain the location of libXm" >&5
+echo "$as_me: error: please set LDFLAGS to contain the location of libXm" >&2;}
+   { (exit 1); exit 1; }; }
+
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

 
                 CFLAGS=$save_CFLAGS
             fi
         fi
 
         xpm_link=
 
                 CFLAGS=$save_CFLAGS
             fi
         fi
 
         xpm_link=

-        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:15566: checking for Xpm library" >&5
-        
+        echo "$as_me:$LINENO: checking for Xpm library" >&5
+echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
+

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do


@@ -15576,7 +24153,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
   done
 
         if test "$ac_find_libraries" != "" ; then
   done
 
         if test "$ac_find_libraries" != "" ; then

-            
+

   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -15588,56 +24165,78 @@ for ac_dir in $SEARCH_LIB /usr/lib;
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
 
             xpm_link=" -lXpm"
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
 
             xpm_link=" -lXpm"

-            cat >> confdefs.h <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define wxHAVE_LIB_XPM 1
 #define wxHAVE_LIB_XPM 1

-EOF
+_ACEOF

 
 

-            echo "$ac_t""found at $ac_find_libraries" 1>&6
+            echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
+echo "${ECHO_T}found at $ac_find_libraries" >&6

         else
             save_CFLAGS=$CFLAGS
             CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
         else
             save_CFLAGS=$CFLAGS
             CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 

-            cat > conftest.$ac_ext <<EOF
-#line 15602 "configure"
-#include "confdefs.h"
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                     #include <X11/xpm.h>
 
                     #include <X11/xpm.h>

-                
-int main() {
+
+int
+main ()
+{

 
                     int version;
                     version = XpmLibraryVersion();
 
                     int version;
                     version = XpmLibraryVersion();

-                
-; return 0; }
-EOF
-if { (eval echo configure:15614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                     xpm_link=" -lXpm"
                     xpm_link=" -lXpm"

-                    cat >> confdefs.h <<\EOF
+                    cat >>confdefs.h <<\_ACEOF

 #define wxHAVE_LIB_XPM 1
 #define wxHAVE_LIB_XPM 1

-EOF
+_ACEOF

 
 

-                    echo "$ac_t""found in default search path" 1>&6
+                    echo "$as_me:$LINENO: result: found in default search path" >&5
+echo "${ECHO_T}found in default search path" >&6

                     COMPILED_X_PROGRAM=0
                     COMPILED_X_PROGRAM=0

-                
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    echo "$ac_t""no" 1>&6
-                    echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
-                
-            
+  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: WARNING: library will be compiled without support for images in XPM format" >&5
+echo "$as_me: WARNING: library will be compiled without support for images in XPM format" >&2;}
+
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

 
             CFLAGS=$save_CFLAGS
         fi
 
 
             CFLAGS=$save_CFLAGS
         fi
 

-        echo $ac_n "checking if we need -lXp and/or -lSM -lICE""... $ac_c" 1>&6
-echo "configure:15641: checking if we need -lXp and/or -lSM -lICE" >&5
+        echo "$as_me:$LINENO: checking if we need -lXp and/or -lSM -lICE" >&5
+echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6

         libp_link=""
         libsm_ice_link=""
         libs_found=0
         libp_link=""
         libsm_ice_link=""
         libs_found=0


@@ -15650,38 +24249,57 @@ echo "configure:15641: checking if we need -lXp and/or -lSM -lICE" >&5
                         save_CFLAGS=$CFLAGS
                         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
                         save_CFLAGS=$CFLAGS
                         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 

-                        cat > conftest.$ac_ext <<EOF
-#line 15655 "configure"
-#include "confdefs.h"
+                        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                                 #include <Xm/Xm.h>
                                 #include <Xm/List.h>
 
                                 #include <Xm/Xm.h>
                                 #include <Xm/List.h>

-                            
-int main() {
+
+int
+main ()
+{

 
                                 XmString string = NULL;
                                 Widget w = NULL;
                                 int position = 0;
                                 XmListAddItem(w, string, position);
 
                                 XmString string = NULL;
                                 Widget w = NULL;
                                 int position = 0;
                                 XmListAddItem(w, string, position);

-                            
-; return 0; }
-EOF
-if { (eval echo configure:15670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                                 libp_link="$libp"
                                 libsm_ice_link="$libsm_ice"
                                 libp_link="$libp"
                                 libsm_ice_link="$libsm_ice"

-                                echo "$ac_t""need${libp_link}${libsm_ice_link}" 1>&6
+                                echo "$as_me:$LINENO: result: need${libp_link}${libsm_ice_link}" >&5
+echo "${ECHO_T}need${libp_link}${libsm_ice_link}" >&6

                                 libs_found=1
                                 libs_found=1

-                            
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                        
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

 
                         LIBS="$save_LIBS"
                         CFLAGS=$save_CFLAGS
 
                         LIBS="$save_LIBS"
                         CFLAGS=$save_CFLAGS


@@ -15691,50 +24309,73 @@ rm -f conftest*
         done
 
         if test "$libs_found" = "0"; then
         done
 
         if test "$libs_found" = "0"; then

-            echo "$ac_t""can't find the right libraries" 1>&6
-            { echo "configure: error: can't link a simple motif program" 1>&2; exit 1; }
+            echo "$as_me:$LINENO: result: can't find the right libraries" >&5
+echo "${ECHO_T}can't find the right libraries" >&6
+            { { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5
+echo "$as_me: error: can't link a simple motif program" >&2;}
+   { (exit 1); exit 1; }; }

         fi
 
         save_CFLAGS=$CFLAGS
         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
         fi
 
         save_CFLAGS=$CFLAGS
         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"

-        echo $ac_n "checking for Motif 2""... $ac_c" 1>&6
-echo "configure:15702: checking for Motif 2" >&5
-        cat > conftest.$ac_ext <<EOF
-#line 15704 "configure"
-#include "confdefs.h"
+        echo "$as_me:$LINENO: checking for Motif 2" >&5
+echo $ECHO_N "checking for Motif 2... $ECHO_C" >&6
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                         #include <Xm/Xm.h>
 
                         #include <Xm/Xm.h>

-                       
-int main() {
+
+int
+main ()
+{

 
                         #if XmVersion < 2000
                         #error "Not Motif 2"
                         #endif
 
                         #if XmVersion < 2000
                         #error "Not Motif 2"
                         #endif

-                       
-; return 0; }
-EOF
-if { (eval echo configure:15717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                        cat >> confdefs.h <<\EOF
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                        cat >>confdefs.h <<\_ACEOF

 #define __WXMOTIF20__ 1
 #define __WXMOTIF20__ 1

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

 
 

-                        echo "$ac_t""found" 1>&6
-                       

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                        cat >> confdefs.h <<\EOF
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+                        cat >>confdefs.h <<\_ACEOF

 #define __WXMOTIF20__ 0
 #define __WXMOTIF20__ 0

-EOF
+_ACEOF
+
+                        echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6

 
 

-                        echo "$ac_t""not found" 1>&6
-                       

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

         CFLAGS=$save_CFLAGS
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
         CFLAGS=$save_CFLAGS
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"


@@ -15749,41 +24390,61 @@ rm -f conftest*
         save_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
         save_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 

-        echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:15754: checking for X11/extensions/shape.h" >&5
-        cat > conftest.$ac_ext <<EOF
-#line 15756 "configure"
-#include "confdefs.h"
-
-                        #include <X11/Xlib.h> 
+        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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                        #include <X11/Xlib.h>

                         #include <X11/extensions/shape.h>
                         #include <X11/extensions/shape.h>

-                       
-int main() {
+
+int
+main ()
+{

 
                         int dummy1, dummy2;
                         XShapeQueryExtension((Display*)NULL,
                                              (int*)NULL, (int*)NULL);
 
                         int dummy1, dummy2;
                         XShapeQueryExtension((Display*)NULL,
                                              (int*)NULL, (int*)NULL);

-                       
-; return 0; }
-EOF
-if { (eval echo configure:15770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                        cat >> confdefs.h <<\EOF
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                        cat >>confdefs.h <<\_ACEOF

 #define HAVE_XSHAPE 1
 #define HAVE_XSHAPE 1

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

 
 

-                        echo "$ac_t""found" 1>&6
-                       

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                        echo "$ac_t""not found" 1>&6
-                       
+  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
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

         CFLAGS="$save_CFLAGS"
     fi
 
         CFLAGS="$save_CFLAGS"
     fi
 


@@ -15793,6 +24454,7 @@ rm -f conftest*
         TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
         TOOLKIT=MAC
                 GUIDIST=MACX_DIST
         TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
         TOOLKIT=MAC
                 GUIDIST=MACX_DIST

+                        WXBASEPORT="_carbon"

     fi
 
     if test "$wxUSE_COCOA" = 1; then
     fi
 
     if test "$wxUSE_COCOA" = 1; then


@@ -15804,7 +24466,8 @@ rm -f conftest*
     if test "$wxUSE_PM" = 1; then
         TOOLKIT=PM
         GUIDIST=GTK_DIST
     if test "$wxUSE_PM" = 1; then
         TOOLKIT=PM
         GUIDIST=GTK_DIST

-        echo "configure: warning: OS/2 threads are not yet supported... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: OS/2 threads are not yet supported... disabled" >&5
+echo "$as_me: WARNING: OS/2 threads are not yet supported... disabled" >&2;}

         wxUSE_THREADS="no"
     fi
 
         wxUSE_THREADS="no"
     fi
 


@@ -15890,123 +24553,347 @@ IODBC_C_SRC=""
 
 if test "$TOOLKIT" != "MSW" ; then
 
 
 if test "$TOOLKIT" != "MSW" ; then
 

-    if test "$wxUSE_ODBC" != "no" ; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_ODBC 1
-EOF
-
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-    
-                WXODBCFLAG="-D_IODBC_"
-
-
-        if test "$wxUSE_ODBC" = "sys" ; then
-                        
-            ac_safe=`echo "sql.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sql.h""... $ac_c" 1>&6
-echo "configure:15908: checking for sql.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15913 "configure"
-#include "confdefs.h"
+    if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
+
+        if test "${ac_cv_header_sql_h+set}" = set; 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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
+echo "${ECHO_T}$ac_cv_header_sql_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking sql.h usability" >&5
+echo $ECHO_N "checking sql.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default

 #include <sql.h>
 #include <sql.h>

-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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 sql.h presence" >&5
+echo $ECHO_N "checking sql.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sql.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sql.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: sql.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sql.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sql.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sql.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sql.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for sql.h" >&5
+echo $ECHO_N "checking for sql.h... $ECHO_C" >&6
+if test "${ac_cv_header_sql_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_sql_h=$ac_header_preproc

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
+echo "${ECHO_T}$ac_cv_header_sql_h" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
+if test $ac_cv_header_sql_h = yes; then
+  found_sql_h=1

 fi
 
 fi
 

-            
-echo $ac_n "checking for library containing SQLAllocEnv""... $ac_c" 1>&6
-echo "configure:15941: checking for library containing SQLAllocEnv" >&5
-if eval "test \"`echo '$''{'ac_cv_search_SQLAllocEnv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+        if test "x$found_sql_h" = "x1" ; then
+            echo "$as_me:$LINENO: checking for iodbc in -lSQLAllocEnv" >&5
+echo $ECHO_N "checking for iodbc in -lSQLAllocEnv... $ECHO_C" >&6
+if test "${ac_cv_lib_SQLAllocEnv_iodbc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_SQLAllocEnv="no"
-cat > conftest.$ac_ext <<EOF
-#line 15948 "configure"
-#include "confdefs.h"
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSQLAllocEnv  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char SQLAllocEnv();
+   builtin and then its argument prototype would still apply.  */
+char iodbc ();
+int
+main ()
+{
+iodbc ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_SQLAllocEnv_iodbc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_SQLAllocEnv_iodbc=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_iodbc" >&5
+echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_iodbc" >&6
+if test $ac_cv_lib_SQLAllocEnv_iodbc = yes; then
+  ODBC_LINK=" -liodbc"
+else
+
+                echo "$as_me:$LINENO: checking for unixodbc in -lSQLAllocEnv" >&5
+echo $ECHO_N "checking for unixodbc in -lSQLAllocEnv... $ECHO_C" >&6
+if test "${ac_cv_lib_SQLAllocEnv_unixodbc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSQLAllocEnv  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 

-int main() {
-SQLAllocEnv()
-; return 0; }
-EOF
-if { (eval echo configure:15959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_SQLAllocEnv="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-test "$ac_cv_search_SQLAllocEnv" = "no" && for i in iodbc unixodbc odbc ; do
-LIBS="-l$i  $ac_func_search_save_LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 15970 "configure"
-#include "confdefs.h"

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char SQLAllocEnv();
+   builtin and then its argument prototype would still apply.  */
+char unixodbc ();
+int
+main ()
+{
+unixodbc ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_SQLAllocEnv_unixodbc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_SQLAllocEnv_unixodbc=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_unixodbc" >&5
+echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_unixodbc" >&6
+if test $ac_cv_lib_SQLAllocEnv_unixodbc = yes; then
+  ODBC_LINK=" -lunixodbc"
+else
+
+                    echo "$as_me:$LINENO: checking for odbc in -lSQLAllocEnv" >&5
+echo $ECHO_N "checking for odbc in -lSQLAllocEnv... $ECHO_C" >&6
+if test "${ac_cv_lib_SQLAllocEnv_odbc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSQLAllocEnv  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 

-int main() {
-SQLAllocEnv()
-; return 0; }
-EOF
-if { (eval echo configure:15981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_SQLAllocEnv="-l$i"
-break
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char odbc ();
+int
+main ()
+{
+odbc ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_SQLAllocEnv_odbc=yes

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_SQLAllocEnv_odbc=no

 fi
 fi

-rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_odbc" >&5
+echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_odbc" >&6
+if test $ac_cv_lib_SQLAllocEnv_odbc = yes; then
+  ODBC_LINK=" -lodbc"
+fi
+
+

 fi
 
 fi
 

-echo "$ac_t""$ac_cv_search_SQLAllocEnv" 1>&6
-if test "$ac_cv_search_SQLAllocEnv" != "no"; then
-  test "$ac_cv_search_SQLAllocEnv" = "none required" || LIBS="$ac_cv_search_SQLAllocEnv $LIBS"
-  
-else :
-   
-                wxUSE_ODBC=builtin; 
-                echo "configure: warning:  can't find system Odbc library falling back to builtin " 1>&2
-             
+

 fi
 fi

+

         fi
         fi

-                if test "$wxUSE_ODBC" != "sys" ; then
-            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+        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
+        else
+                        wxUSE_ODBC=sys

         fi
         fi

+    fi
+    if test "$wxUSE_ODBC" != "no" ; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ODBC 1
+_ACEOF
+
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"

 
 

+                WXODBCFLAG="-D_IODBC_"

     fi
     fi

-    

 fi
 
 if test "$wxUSE_REGEX" = "builtin" ; then
 fi
 
 if test "$wxUSE_REGEX" = "builtin" ; then


@@ -16017,46 +24904,179 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
 fi
 
 
 fi
 
 

+USE_OPENGL=0

 if test "$wxUSE_OPENGL" = "yes"; then
     if 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
 if test "$wxUSE_OPENGL" = "yes"; then
     if 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

-        ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:16029: checking for GL/gl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16034 "configure"
-#include "confdefs.h"
+
+
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE /usr/include;
+  do
+    if test -f "$ac_dir/GL/gl.h"; then
+      ac_find_includes=$ac_dir
+      break
+    fi
+  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 "$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="$CPPFLAGS$ac_path_to_include"
+        fi
+
+        if test "${ac_cv_header_GL_gl_h+set}" = set; then
+  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
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking GL/gl.h usability" >&5
+echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default

 #include <GL/gl.h>
 #include <GL/gl.h>

-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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/gl.h presence" >&5
+echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <GL/gl.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for GL/gl.h" >&5
+echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
+if test "${ac_cv_header_GL_gl_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_GL_gl_h=$ac_header_preproc

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
+echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
+if test $ac_cv_header_GL_gl_h = yes; then
+

                 found_gl=0
 
                 found_gl=0
 

-                echo $ac_n "checking for -lGL""... $ac_c" 1>&6
-echo "configure:16059: checking for -lGL" >&5
-                
+                echo "$as_me:$LINENO: checking for -lGL" >&5
+echo $ECHO_N "checking for -lGL... $ECHO_C" >&6
+

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do


@@ -16069,7 +25089,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
   done
 
                 if test "$ac_find_libraries" != "" ; then
   done
 
                 if test "$ac_find_libraries" != "" ; then

-                    
+

   echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -16082,7 +25102,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
                         LDFLAGS_GL="$ac_path_to_link"
                     fi
 
                         LDFLAGS_GL="$ac_path_to_link"
                     fi
 

-                                                                                
+

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do


@@ -16095,7 +25115,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
   done
 
                     if test "$ac_find_libraries" != "" ; then
   done
 
                     if test "$ac_find_libraries" != "" ; then

-                        
+

   echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -16111,15 +25131,17 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
                         found_gl=1
                         OPENGL_LIBS="-lGL -lGLU"
 
                         found_gl=1
                         OPENGL_LIBS="-lGL -lGLU"

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

                     fi
                 fi
 
                     fi
                 fi
 

-                if "$found_gl" != 1; then
-                    echo "$ac_t""no" 1>&6
-                    echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
-echo "configure:16122: checking for -lMesaGL" >&5
-                    
+                if test "$found_gl" != 1; then
+                    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+                    echo "$as_me:$LINENO: checking for -lMesaGL" >&5
+echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6
+

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB /usr/lib;
   do


@@ -16132,7 +25154,7 @@ for ac_dir in $SEARCH_LIB /usr/lib;
   done
 
                     if test "$ac_find_libraries" != "" ; then
   done
 
                     if test "$ac_find_libraries" != "" ; then

-                        
+

   echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -16143,32 +25165,36 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
                         OPENGL_LIBS="-lMesaGL -lMesaGLU"
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
                         OPENGL_LIBS="-lMesaGL -lMesaGLU"

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

                     else
                     else

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

                     fi
                 fi
                     fi
                 fi

-            
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
 
 fi
 
 

+

         if test "x$OPENGL_LIBS" = "x"; then
         if test "x$OPENGL_LIBS" = "x"; then

-                                                { echo "configure: error: OpenGL libraries not available" 1>&2; exit 1; }
+                                                { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5
+echo "$as_me: error: OpenGL libraries not available" >&2;}
+   { (exit 1); exit 1; }; }

         fi
     fi
 
     if test "$wxUSE_OPENGL" = "yes"; then
         fi
     fi
 
     if test "$wxUSE_OPENGL" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        USE_OPENGL=1
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_OPENGL 1
 #define wxUSE_OPENGL 1

-EOF
+_ACEOF

 
 

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_GLCANVAS 1
 #define wxUSE_GLCANVAS 1

-EOF
+_ACEOF

 
 

-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"

     fi
 fi
 
     fi
 fi
 


@@ -16188,13 +25214,18 @@ if test "$wxUSE_UNICODE" = "yes"; then
 fi
 
 lib_debug_suffix=
 fi
 
 lib_debug_suffix=

-BUILD=release
+DEBUG_FLAG=0

 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d

-    BUILD=debug
+    DEBUG_FLAG=1
+fi
+
+DEBUG_INFO=0
+if test "$wxUSE_DEBUG_INFO" = "yes"; then
+    DEBUG_INFO=1

 fi
 
 fi
 

-WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`

 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"


@@ -16202,11 +25233,13 @@ TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_su
 if test "$cross_compiling" = "yes"; then
     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
     TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
 if test "$cross_compiling" = "yes"; then
     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
     TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"

+    HOST_SUFFIX="-${host_alias}"

 fi
 
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
 fi
 
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"

-WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
+WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}"
+WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"

 
 WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
 WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
 
 WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
 WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"


@@ -16218,22 +25251,12 @@ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
 
 case "${host}" in
     *-*-cygwin* | *-*-mingw32* )
 
 case "${host}" in
     *-*-cygwin* | *-*-mingw32* )

-
-                        
-        
-        if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then
-            WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
-            WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
-            WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
-            WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
-        else
-            WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
-            WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
-        fi
+        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
+        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"

         ;;
 
     *-*-darwin* )
         ;;
 
     *-*-darwin* )

-                
+

         WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
         WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
 
         WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
         WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
 


@@ -16267,7 +25290,8 @@ if test "$wxUSE_SHARED" = "yes"; then
       *-pc-os2_emx | *-pc-os2-emx | \
       *-pc-msdosdjgpp )
                 wxUSE_SHARED=no
       *-pc-os2_emx | *-pc-os2-emx | \
       *-pc-msdosdjgpp )
                 wxUSE_SHARED=no

-        echo "configure: warning: Host system doesn't support shared libraries, disabling" 1>&2
+        { 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;}

       ;;
     esac
 fi
       ;;
     esac
 fi


@@ -16276,272 +25300,155 @@ SHARED=0
 if test "$wxUSE_SHARED" = "yes"; then
     SHARED=1
 
 if test "$wxUSE_SHARED" = "yes"; then
     SHARED=1
 

-        if test "$wxUSE_OPENGL" = "yes"; then
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
-    else
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
-    fi
-
-        if test "$GCC" = "yes"; then
-                PIC_FLAG="-fPIC"
-    fi
-

 
 

-        

   found_versioning=no
 
   found_versioning=no
 

-                        
-    if test $found_versioning = no ; then
-      echo $ac_n "checking if the linker accepts --version-script""... $ac_c" 1>&6
-echo "configure:16299: checking if the linker accepts --version-script" >&5
-if eval "test \"`echo '$''{'wx_cv_version_script'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        echo "VER_1 { *; };" >conftest.sym
-        echo "int main() { return 0; }" >conftest.cpp
-  
-        if { ac_try='
-                $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-                -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
-          if test -s conftest.stderr ; then
-              wx_cv_version_script=no
-          else
-              wx_cv_version_script=yes
-          fi
-        else
-          wx_cv_version_script=no
-        fi
-        rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
-      
-fi
-
-echo "$ac_t""$wx_cv_version_script" 1>&6
-      if test $wx_cv_version_script = yes ; then
-        LDFLAGS_VERSIONING="-Wl,--version-script,\$(top_builddir)/version-script"
-      fi
-  fi
-
-
-        SHARED_LD="${CXX} -shared -o"
-
-    case "${host}" in
-      *-hp-hpux* )
-                if test "$GCC" = "yes"; then
-                        SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
-        else
-                        LDFLAGS="$LDFLAGS -L/usr/lib"
-
-            SHARED_LD="${CXX} -b -o"
-            PIC_FLAG="+Z"
-        fi
-
-                if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
-        else
-            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
-        fi
-      ;;
-
-      *-*-linux* | *-*-gnu* )
-        if test "$GCC" != "yes"; then
-            echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:16353: checking for Intel compiler" >&5
-if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-                cat > conftest.$ac_ext <<EOF
-#line 16359 "configure"
-#include "confdefs.h"
-
-int main() {
-
-                        #ifndef __INTEL_COMPILER
-                        #error Not icc
-                        #endif
-                    
-; return 0; }
-EOF
-if { (eval echo configure:16370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  wx_cv_prog_icc=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_prog_icc=no
-                
-fi
-rm -f conftest*
-            
-fi
-
-echo "$ac_t""$wx_cv_prog_icc" 1>&6
-            if test "$wx_cv_prog_icc" = "yes"; then
-                PIC_FLAG="-KPIC"
-            fi
-        fi
-
-        if test "$wxUSE_SONAME" = "yes" ; then
-            SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
-                        WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
-        fi
-        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
-      ;;
-
-      *-*-solaris2* )
-        if test "$GCC" = yes ; then
-                                    CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
-
-                                    saveLdflags="$LDFLAGS"
-            LDFLAGS="$saveLdflags -Wl,-rpath,/"
-            echo $ac_n "checking if the linker accepts -rpath""... $ac_c" 1>&6
-echo "configure:16405: checking if the linker accepts -rpath" >&5
-            cat > conftest.$ac_ext <<EOF
-#line 16407 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:16414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-                    echo "$ac_t""yes" 1>&6
-                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)/lib"
-                
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    echo "$ac_t""no" 1>&6
-                    echo $ac_n "checking if the linker accepts -R""... $ac_c" 1>&6
-echo "configure:16427: checking if the linker accepts -R" >&5
-                    LDFLAGS="$saveLdflags -Wl,-R,/"
-                    cat > conftest.$ac_ext <<EOF
-#line 16430 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:16437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-                             echo "$ac_t""yes" 1>&6
-                             SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)/lib"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                            echo "$ac_t""no" 1>&6
-                        
-fi
-rm -f conftest*                    
-                
-fi
-rm -f conftest*
-            LDFLAGS="$saveLdflags"
-        else
-            SHARED_LD="${CXX} -G -o"
-            PIC_FLAG="-KPIC"
-            SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
-            SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
-            SAMPLES_RPATH_FLAG="-R\$(top_builddir)/lib"
-        fi
-      ;;
-
-      *-*-darwin* )
-                        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
-        CFLAGS="$CFLAGS -fno-common"
-        CXXFLAGS="$CXXFLAGS -fno-common"
-                                        SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
-        PIC_FLAG="-dynamic -fPIC"
-                                SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
-        SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
-      ;;

 
 

-      *-*-aix* )
-                if test "$GCC" != "yes"; then
-                                    # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
-set dummy makeC++SharedLib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16479: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&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
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
-fi
-fi
-AIX_CXX_LD="$ac_cv_prog_AIX_CXX_LD"
-if test -n "$AIX_CXX_LD"; then
-  echo "$ac_t""$AIX_CXX_LD" 1>&6
+    if test $found_versioning = no ; 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

 else
 else

-  echo "$ac_t""no" 1>&6
-fi

 
 

+        echo "VER_1 { *; };" >conftest.sym
+        echo "int main() { return 0; }" >conftest.cpp

 
 

-            SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+        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 $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } ; then
+          if test -s conftest.stderr ; then
+              wx_cv_version_script=no
+          else
+              wx_cv_version_script=yes
+          fi
+        else
+          wx_cv_version_script=no

         fi
         fi

+        rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_version_script" >&5
+echo "${ECHO_T}$wx_cv_version_script" >&6
+      if test $wx_cv_version_script = yes ; then
+        LDFLAGS_VERSIONING="-Wl,--version-script,\$(top_builddir)version-script"
+      fi
+  fi
+
+
+    case "${host}" in
+      *-*-linux* | *-*-gnu* )
+        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"

       ;;
 
       ;;
 

-      *-*-cygwin* | *-*-mingw32* )
-        WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
+      *-*-solaris2* )
+        if test "$GCC" = yes ; then
+                                    CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
+
+                                    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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
-        TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
+
+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
+                    LDFLAGS="$saveLdflags -Wl,-R,/"
+                    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-        PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

 
 

-                WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+                             echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                             SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

-        if test "$wxUSE_OPENGL" = "yes"; then
-            LIBS="${LIBS} ${OPENGL_LIBS}"
-        fi
-      ;;

 
 

-      *-*-beos* )
-                        SHARED_LD="${LD} -shared -o"
-      ;;
+                            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6

 
 

-      *-*-irix* )
-                if test "$GCC" != "yes"; then
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+            LDFLAGS="$saveLdflags"
+        else
+            SHARED_LD="${CXX} -G -o"

             PIC_FLAG="-KPIC"
             PIC_FLAG="-KPIC"

+            SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"

         fi
       ;;
         fi
       ;;

-
-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
-      *-*-sunos4* | \
-      *-*-osf* | \
-      *-*-dgux5* | \
-      *-*-sysv5* )
-              ;;
-
-      *)
-        { echo "configure: error: unknown system type $host." 1>&2; exit 1; }

     esac
 
         if test "x$WX_TARGET_LIBRARY" = "x"; then
     esac
 
         if test "x$WX_TARGET_LIBRARY" = "x"; then


@@ -16585,97 +25492,115 @@ MACRESCOMP="@#"
 MACSETFILE="@#"
 MACRESWXCONFIG="#"
 if test "$wxUSE_MAC" = 1; then
 MACSETFILE="@#"
 MACRESWXCONFIG="#"
 if test "$wxUSE_MAC" = 1; then

-        LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+        LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"

     WX_ALL="${WX_ALL} ${LIBWXMACRES}"
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2
     WX_ALL="${WX_ALL} ${LIBWXMACRES}"
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16595: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RESCOMP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$RESCOMP"; then
   ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
 else
 else
   if test -n "$RESCOMP"; then
   ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RESCOMP="Rez"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RESCOMP="Rez"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
 fi
 fi
   test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
 fi
 fi

-RESCOMP="$ac_cv_prog_RESCOMP"
+RESCOMP=$ac_cv_prog_RESCOMP

 if test -n "$RESCOMP"; then
 if test -n "$RESCOMP"; then

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

 else
 else

-  echo "$ac_t""no" 1>&6
+  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
 fi
 
     # Extract the first word of "DeRez", so it can be a program name with args.
 set dummy DeRez; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16625: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_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
 else
   if test -n "$DEREZ"; then
   ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DEREZ="DeRez"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DEREZ="DeRez"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
 fi
 fi
   test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
 fi
 fi

-DEREZ="$ac_cv_prog_DEREZ"
+DEREZ=$ac_cv_prog_DEREZ

 if test -n "$DEREZ"; then
 if test -n "$DEREZ"; then

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

 else
 else

-  echo "$ac_t""no" 1>&6
+  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
 fi
 
     # Extract the first word of "SetFile", so it can be a program name with args.
 set dummy SetFile; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16655: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_SETFILE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$SETFILE"; then
   ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
 else
 else
   if test -n "$SETFILE"; then
   ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_SETFILE="SetFile"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_SETFILE="SetFile"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
 fi
 fi
   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
 fi
 fi

-SETFILE="$ac_cv_prog_SETFILE"
+SETFILE=$ac_cv_prog_SETFILE

 if test -n "$SETFILE"; then
 if test -n "$SETFILE"; then

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

 else
 else

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

 fi
 
     MACOSX_BUNDLE="bundle"
 fi
 
     MACOSX_BUNDLE="bundle"


@@ -16685,92 +25610,110 @@ fi
 elif test "$wxUSE_COCOA" = 1; then
     # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2
 elif test "$wxUSE_COCOA" = 1; then
     # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16690: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RESCOMP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$RESCOMP"; then
   ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
 else
 else
   if test -n "$RESCOMP"; then
   ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RESCOMP="Rez"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RESCOMP="Rez"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
 fi
 fi
   test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
 fi
 fi

-RESCOMP="$ac_cv_prog_RESCOMP"
+RESCOMP=$ac_cv_prog_RESCOMP

 if test -n "$RESCOMP"; then
 if test -n "$RESCOMP"; then

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

 else
 else

-  echo "$ac_t""no" 1>&6
+  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
 fi
 
     # Extract the first word of "DeRez", so it can be a program name with args.
 set dummy DeRez; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16720: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_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
 else
   if test -n "$DEREZ"; then
   ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DEREZ="DeRez"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DEREZ="DeRez"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
 fi
 fi
   test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
 fi
 fi

-DEREZ="$ac_cv_prog_DEREZ"
+DEREZ=$ac_cv_prog_DEREZ

 if test -n "$DEREZ"; then
 if test -n "$DEREZ"; then

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

 else
 else

-  echo "$ac_t""no" 1>&6
+  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
 fi
 
     # Extract the first word of "SetFile", so it can be a program name with args.
 set dummy SetFile; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16750: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_SETFILE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$SETFILE"; then
   ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
 else
 else
   if test -n "$SETFILE"; then
   ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_SETFILE="SetFile"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_SETFILE="SetFile"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
 fi
 fi
   test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
 fi
 fi

-SETFILE="$ac_cv_prog_SETFILE"
+SETFILE=$ac_cv_prog_SETFILE

 if test -n "$SETFILE"; then
 if test -n "$SETFILE"; then

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

 else
 else

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

 fi
 
     MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
 fi
 
     MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"


@@ -16783,853 +25726,1089 @@ else
 fi
 
 
 fi
 
 

-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:16788: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16793 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
+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
 else

-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 16818 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((mode_t *) 0)
+  return 0;
+if (sizeof (mode_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_mode_t=yes

 else
 else

-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

-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 <<EOF
-#line 16836 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
+ac_cv_type_mode_t=no

 fi
 fi

-rm -f conftest*
-
+rm -f conftest.$ac_objext conftest.$ac_ext

 fi
 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 "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16857 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:16868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+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
   :
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi

 
 

-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
+cat >>confdefs.h <<_ACEOF
+#define mode_t int
+_ACEOF

 
 fi
 
 
 fi
 

-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:16892: checking for mode_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+if test "${ac_cv_type_off_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 16897 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_mode_t=yes
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((off_t *) 0)
+  return 0;
+if (sizeof (off_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_off_t=yes

 else
 else

-  rm -rf conftest*
-  ac_cv_type_mode_t=no
-fi
-rm -f conftest*
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

+ac_cv_type_off_t=no

 fi
 fi

-echo "$ac_t""$ac_cv_type_mode_t" 1>&6
-if test $ac_cv_type_mode_t = no; then
-  cat >> confdefs.h <<\EOF
-#define mode_t int
-EOF
-
+rm -f conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:16925: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16930 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
+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
 else

-  rm -rf conftest*
-  ac_cv_type_off_t=no
-fi
-rm -f conftest*

 
 

-fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<_ACEOF

 #define off_t long
 #define off_t long

-EOF
+_ACEOF

 
 fi
 
 
 fi
 

-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:16958: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+if test "${ac_cv_type_pid_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 16963 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((pid_t *) 0)
+  return 0;
+if (sizeof (pid_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_pid_t=yes
 else
   ac_cv_type_pid_t=yes
 else

-  rm -rf conftest*
-  ac_cv_type_pid_t=no
-fi
-rm -f conftest*
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

+ac_cv_type_pid_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext

 fi
 fi

-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
-  cat >> confdefs.h <<\EOF
+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

 #define pid_t int
 #define pid_t int

-EOF
+_ACEOF

 
 fi
 
 
 fi
 

-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:16991: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+if test "${ac_cv_type_size_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 16996 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((size_t *) 0)
+  return 0;
+if (sizeof (size_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   ac_cv_type_size_t=yes
 else
   ac_cv_type_size_t=yes
 else

-  rm -rf conftest*
-  ac_cv_type_size_t=no
-fi
-rm -f conftest*
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5

 
 

+ac_cv_type_size_t=no

 fi
 fi

-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
+rm -f 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
 #define size_t unsigned

-EOF
+_ACEOF

 
 fi
 
 
 fi
 

-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:17024: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+if test "${ac_cv_type_uid_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 17029 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

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

-EOF
+
+_ACEOF

 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

-  egrep "uid_t" >/dev/null 2>&1; then
-  rm -rf conftest*
+  $EGREP "uid_t" >/dev/null 2>&1; then

   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=yes
 else

-  rm -rf conftest*

   ac_cv_type_uid_t=no
 fi
 rm -f conftest*
 
 fi
   ac_cv_type_uid_t=no
 fi
 rm -f conftest*
 
 fi

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

 if test $ac_cv_type_uid_t = no; then
 if test $ac_cv_type_uid_t = no; then

-  cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF

 #define uid_t int
 #define uid_t int

-EOF
+_ACEOF

 
 

-  cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF

 #define gid_t int
 #define gid_t int

-EOF
+_ACEOF

 
 fi
 
 
 
 
 fi
 
 
 

-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
-echo "configure:17067: checking if size_t is unsigned int" >&5
-if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-                            cat > conftest.$ac_ext <<EOF
-#line 17073 "configure"
-#include "confdefs.h"
+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
+else
+
+                            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <stddef.h>
 #include <stddef.h>

-int main() {
+int
+main ()
+{

 
             return 0; }
 
             struct Foo { void foo(size_t); void foo(unsigned int); };
 
             int bar() {
 
             return 0; }
 
             struct Foo { void foo(size_t); void foo(unsigned int); };
 
             int bar() {

-        
-; return 0; }
-EOF
-if { (eval echo configure:17086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_size_t_is_uint=no
 else
   wx_cv_size_t_is_uint=no
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_size_t_is_uint=yes
-    
-fi
-rm -f conftest*
-    
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_size_t_is_uint=yes

 
 fi
 
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext
+

 
 

-echo "$ac_t""$wx_cv_size_t_is_uint" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_size_t_is_uint" >&5
+echo "${ECHO_T}$wx_cv_size_t_is_uint" >&6

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

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxSIZE_T_IS_UINT 1
 #define wxSIZE_T_IS_UINT 1

-EOF
+_ACEOF

 
 else
 
 else

-    echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:17110: checking if size_t is unsigned long" >&5
-if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:$LINENO: checking if size_t is unsigned long" >&5
+echo $ECHO_N "checking if size_t is unsigned long... $ECHO_C" >&6
+if test "${wx_cv_size_t_is_ulong+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 17115 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <stddef.h>
 #include <stddef.h>

-int main() {
+int
+main ()
+{

 
                 return 0; }
 
                 struct Foo { void foo(size_t); void foo(unsigned long); };
 
                 int bar() {
 
                 return 0; }
 
                 struct Foo { void foo(size_t); void foo(unsigned long); };
 
                 int bar() {

-            
-; return 0; }
-EOF
-if { (eval echo configure:17128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_size_t_is_ulong=no
   wx_cv_size_t_is_ulong=no

-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_size_t_is_ulong=yes
-        
-fi
-rm -f conftest*
-    
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_size_t_is_ulong=yes
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_size_t_is_ulong" >&5
+echo "${ECHO_T}$wx_cv_size_t_is_ulong" >&6

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

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxSIZE_T_IS_ULONG 1
 #define wxSIZE_T_IS_ULONG 1

-EOF
+_ACEOF

 
     fi
 fi
 
 ac_ext=c
 
     fi
 fi
 
 ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:17162: checking for pw_gecos in struct passwd" >&5
-if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for pw_gecos in struct passwd" >&5
+echo $ECHO_N "checking for pw_gecos in struct passwd... $ECHO_C" >&6
+if test "${wx_cv_struct_pw_gecos+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-        cat > conftest.$ac_ext <<EOF
-#line 17168 "configure"
-#include "confdefs.h"
+
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <pwd.h>
 #include <pwd.h>

-int main() {
+int
+main ()
+{

 
                 char *p;
                 struct passwd *pw;
                 p = pw->pw_gecos;
 
                 char *p;
                 struct passwd *pw;
                 p = pw->pw_gecos;

-             
-; return 0; }
-EOF
-if { (eval echo configure:17179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                 wx_cv_struct_pw_gecos=yes
                 wx_cv_struct_pw_gecos=yes

-             
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

                 wx_cv_struct_pw_gecos=no
                 wx_cv_struct_pw_gecos=no

-             
-        
-fi
-rm -f conftest*
-    
+

 
 fi
 
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_struct_pw_gecos" >&5
+echo "${ECHO_T}$wx_cv_struct_pw_gecos" >&6

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

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define HAVE_PW_GECOS 1
 #define HAVE_PW_GECOS 1

-EOF
+_ACEOF

 
 fi
 
 
 if test "$wx_cv_sizeof_wchar_t" != "0"; then
 
 fi
 
 
 if test "$wx_cv_sizeof_wchar_t" != "0"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_WCHAR_T 1
 #define wxUSE_WCHAR_T 1

-EOF
+_ACEOF

 
 
         WCSLEN_FOUND=0
     WCHAR_LINK=
 
 
         WCSLEN_FOUND=0
     WCHAR_LINK=

-    for ac_func in wcslen
+
+for ac_func in wcslen

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17219: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17224 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:17247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  WCSLEN_FOUND=1
  WCSLEN_FOUND=1

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
     if test "$WCSLEN_FOUND" = 0; then
         if test "$TOOLKIT" = "MSW"; then
 fi
 done
 
 
     if test "$WCSLEN_FOUND" = 0; then
         if test "$TOOLKIT" = "MSW"; then

-            echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
-echo "configure:17275: checking for wcslen in -lmsvcrt" >&5
-ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+            echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5
+echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6
+if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lmsvcrt  $LIBS"
 LIBS="-lmsvcrt  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 17283 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char wcslen();
-
-int main() {
-wcslen()
-; return 0; }
-EOF
-if { (eval echo configure:17294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char wcslen ();
+int
+main ()
+{
+wcslen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_msvcrt_wcslen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_msvcrt_wcslen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_wcslen" >&5
+echo "${ECHO_T}$ac_cv_lib_msvcrt_wcslen" >&6
+if test $ac_cv_lib_msvcrt_wcslen = yes; then

   WCHAR_OK=1
   WCHAR_OK=1

-else
-  echo "$ac_t""no" 1>&6

 fi
 
         else
 fi
 
         else

-            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:17316: checking for wcslen in -lw" >&5
-ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+            echo "$as_me:$LINENO: checking for wcslen in -lw" >&5
+echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6
+if test "${ac_cv_lib_w_wcslen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lw  $LIBS"
 LIBS="-lw  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 17324 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char wcslen();
-
-int main() {
-wcslen()
-; return 0; }
-EOF
-if { (eval echo configure:17335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+   builtin and then its argument prototype would still apply.  */
+char wcslen ();
+int
+main ()
+{
+wcslen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_w_wcslen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_w_wcslen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_w_wcslen" >&5
+echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6
+if test $ac_cv_lib_w_wcslen = yes; then

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  

                             WCHAR_LINK=" -lw"
                             WCSLEN_FOUND=1
                             WCHAR_LINK=" -lw"
                             WCSLEN_FOUND=1

-                        
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
         fi
     fi
 
     if test "$WCSLEN_FOUND" = 1; then
 fi
 
         fi
     fi
 
     if test "$WCSLEN_FOUND" = 1; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define HAVE_WCSLEN 1
 #define HAVE_WCSLEN 1

-EOF
+_ACEOF

 
     fi
 
 
     fi
 

-            for ac_func in wcsrtombs
+
+for ac_func in wcsrtombs

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17371: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17376 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:17399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 else
 fi
 done
 
 else

-    echo "configure: warning: Wide character support is unavailable" 1>&2
+    { echo "$as_me:$LINENO: WARNING: Wide character support is unavailable" >&5
+echo "$as_me: WARNING: Wide character support is unavailable" >&2;}

 fi
 
 
 fi
 
 

-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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_func in vsnprintf
 do
 
 
 for ac_func in vsnprintf
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17439: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17444 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 /* We use char because int might match the return type of a gcc2
 #endif
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:17470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 if test "$ac_cv_func_vsnprintf" = "yes"; then
 fi
 done
 
 
 if test "$ac_cv_func_vsnprintf" = "yes"; then

-        echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6
-echo "configure:17497: checking for vsnprintf declaration" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsnprintf_decl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5
+echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6
+if test "${wx_cv_func_vsnprintf_decl+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-            cat > conftest.$ac_ext <<EOF
-#line 17503 "configure"
-#include "confdefs.h"
+
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                     #include <stdio.h>
                     #include <stdarg.h>
 
                     #include <stdio.h>
                     #include <stdarg.h>

-                
-int main() {
+
+int
+main ()
+{

 
                     char *buf;
                     va_list ap;
                     vsnprintf(buf, 10u, "%s", ap);
 
                     char *buf;
                     va_list ap;
                     vsnprintf(buf, 10u, "%s", ap);

-                
-; return 0; }
-EOF
-if { (eval echo configure:17517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_vsnprintf_decl=yes
 else
   wx_cv_func_vsnprintf_decl=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_func_vsnprintf_decl=no
-            
-fi
-rm -f conftest*
-        
-    
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_func_vsnprintf_decl=no
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext
+

 
 

-echo "$ac_t""$wx_cv_func_vsnprintf_decl" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_vsnprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_vsnprintf_decl" >&6

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

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define HAVE_VSNPRINTF_DECL 1
 #define HAVE_VSNPRINTF_DECL 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "$wxUSE_UNICODE" = yes; then
 
     fi
 fi
 
 if test "$wxUSE_UNICODE" = yes; then

-        for ac_func in fputwc wprintf vswprintf
+
+
+
+for ac_func in fputwc wprintf vswprintf

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17546: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17551 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 /* We use char because int might match the return type of a gcc2
 #endif
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:17577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 fi
 done
 
 

-                echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6
-echo "configure:17603: checking for _vsnwprintf" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 17605 "configure"
-#include "confdefs.h"
+                echo "$as_me:$LINENO: checking for _vsnwprintf" >&5
+echo $ECHO_N "checking for _vsnwprintf... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <wchar.h>
 #include <wchar.h>

-int main() {
+int
+main ()
+{

 &_vsnwprintf;
 &_vsnwprintf;

-; return 0; }
-EOF
-if { (eval echo configure:17612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-                    cat >> confdefs.h <<\EOF
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                    cat >>confdefs.h <<\_ACEOF

 #define HAVE__VSNWPRINTF 1
 #define HAVE__VSNWPRINTF 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  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
 fi

-rm -f conftest*;
+rm -f conftest.$ac_objext conftest.$ac_ext;

 fi
 
 ac_ext=c
 fi
 
 ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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

 
 
 
 
 
 


@@ -17638,96 +26817,139 @@ if test "$TOOLKIT" != "MSW"; then
 
 
 
 
 
 

-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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

 
 
 
 

-    
-  # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+
+
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.

 if test "${with_libiconv_prefix+set}" = set; then
   withval="$with_libiconv_prefix"
 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
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
     done
     for dir in `echo "$withval" | tr : ' '`; do
       if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
     done

-   
-fi

 
 

+fi;

 
 

-  echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:17664: checking for iconv" >&5
-if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
+

     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no

-    cat > conftest.$ac_ext <<EOF
-#line 17672 "configure"
-#include "confdefs.h"
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <stdlib.h>
 #include <iconv.h>
 #include <stdlib.h>
 #include <iconv.h>

-int main() {
+int
+main ()
+{

 iconv_t cd = iconv_open("","");
        iconv(cd,NULL,NULL,NULL,NULL);
        iconv_close(cd);
 iconv_t cd = iconv_open("","");
        iconv(cd,NULL,NULL,NULL,NULL);
        iconv_close(cd);

-; return 0; }
-EOF
-if { (eval echo configure:17682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   am_cv_func_iconv=yes
 else
   am_cv_func_iconv=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+

 fi
 fi

-rm -f conftest*
+rm -f 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 <<EOF
-#line 17694 "configure"
-#include "confdefs.h"
+      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <stdlib.h>
 #include <iconv.h>
 #include <stdlib.h>
 #include <iconv.h>

-int main() {
+int
+main ()
+{

 iconv_t cd = iconv_open("","");
          iconv(cd,NULL,NULL,NULL,NULL);
          iconv_close(cd);
 iconv_t cd = iconv_open("","");
          iconv(cd,NULL,NULL,NULL,NULL);
          iconv_close(cd);

-; return 0; }
-EOF
-if { (eval echo configure:17704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

       LIBS="$am_save_LIBS"
     fi
       LIBS="$am_save_LIBS"
     fi

-  
-fi

 
 

-echo "$ac_t""$am_cv_func_iconv" 1>&6
+fi
+echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6

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

-    cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF

 #define HAVE_ICONV 1
 #define HAVE_ICONV 1

-EOF
+_ACEOF

 
 

-    echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6
-echo "configure:17725: checking if iconv needs const" >&5
-if eval "test \"`echo '$''{'wx_cv_func_iconv_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:$LINENO: checking if iconv needs const" >&5
+echo $ECHO_N "checking if iconv needs const... $ECHO_C" >&6
+if test "${wx_cv_func_iconv_const+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 17730 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 #include <stdlib.h>
 #include <iconv.h>
 
 #include <stdlib.h>
 #include <iconv.h>


@@ -17740,241 +26962,336 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
 #else
 size_t iconv();
 #endif
 #else
 size_t iconv();
 #endif

-        
-int main() {

 
 

-; return 0; }
-EOF
-if { (eval echo configure:17749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_iconv_const="no"
 else
   wx_cv_func_iconv_const="no"
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_func_iconv_const="yes"
-      
-fi
-rm -f conftest*
-    
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_func_iconv_const="yes"
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_func_iconv_const" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_iconv_const" >&5
+echo "${ECHO_T}$wx_cv_func_iconv_const" >&6

 
     iconv_const=
     if test "x$wx_cv_func_iconv_const" = "xyes"; then
         iconv_const="const"
     fi
 
 
     iconv_const=
     if test "x$wx_cv_func_iconv_const" = "xyes"; then
         iconv_const="const"
     fi
 

-    cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF

 #define ICONV_CONST $iconv_const
 #define ICONV_CONST $iconv_const

-EOF
+_ACEOF

 
   fi
   LIBICONV=
   if test "$am_cv_lib_iconv" = yes; then
     LIBICONV="-liconv"
   fi
 
   fi
   LIBICONV=
   if test "$am_cv_lib_iconv" = yes; then
     LIBICONV="-liconv"
   fi

-  
+

 
 LIBS="$LIBICONV $LIBS"
 ac_ext=c
 
 LIBS="$LIBICONV $LIBS"
 ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
 
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then

-    for ac_func in sigaction
+
+for ac_func in sigaction

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17794: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17799 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:17822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
     if test "$ac_cv_func_sigaction" = "no"; then
 fi
 done
 
 
     if test "$ac_cv_func_sigaction" = "no"; then

-        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2
+        { 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;}

         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

-      
-      ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+      ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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 $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:17863: checking for sa_handler type" >&5
-if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for sa_handler type" >&5
+echo $ECHO_N "checking for sa_handler type... $ECHO_C" >&6
+if test "${wx_cv_type_sa_handler+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-        cat > conftest.$ac_ext <<EOF
-#line 17869 "configure"
-#include "confdefs.h"
+
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <signal.h>
 #include <signal.h>

-int main() {
+int
+main ()
+{

 
                         extern void testSigHandler(int);
 
                         struct sigaction sa;
                         sa.sa_handler = testSigHandler;
 
                         extern void testSigHandler(int);
 
                         struct sigaction sa;
                         sa.sa_handler = testSigHandler;

-                     
-; return 0; }
-EOF
-if { (eval echo configure:17881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                         wx_cv_type_sa_handler=int
                         wx_cv_type_sa_handler=int

-                     
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

                         wx_cv_type_sa_handler=void
                         wx_cv_type_sa_handler=void

-                     
-fi
-rm -f conftest*
-      
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_type_sa_handler" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_type_sa_handler" >&5
+echo "${ECHO_T}$wx_cv_type_sa_handler" >&6

 
       ac_ext=c
 
       ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 >> confdefs.h <<EOF
+      cat >>confdefs.h <<_ACEOF

 #define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
 #define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler

-EOF
+_ACEOF

 
     fi
 fi
 
 
     fi
 fi
 

+
+

 for ac_func in mkstemp mktemp
 do
 for ac_func in mkstemp mktemp
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17918: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 17923 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:17946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  break
  break

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 fi
 done
 
 

-echo $ac_n "checking for statfs""... $ac_c" 1>&6
-echo "configure:17972: checking for statfs" >&5
-if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for statfs" >&5
+echo $ECHO_N "checking for statfs... $ECHO_C" >&6
+if test "${wx_cv_func_statfs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 17977 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
              #if defined(__BSD__)
                #include <sys/param.h>
 
              #if defined(__BSD__)
                #include <sys/param.h>


@@ -17982,8 +27299,10 @@ else
              #else
                #include <sys/vfs.h>
              #endif
              #else
                #include <sys/vfs.h>
              #endif

-        
-int main() {
+
+int
+main ()
+{

 
              long l;
              struct statfs fs;
 
              long l;
              struct statfs fs;


@@ -17991,92 +27310,128 @@ int main() {
              l = fs.f_bsize;
              l += fs.f_blocks;
              l += fs.f_bavail;
              l = fs.f_bsize;
              l += fs.f_blocks;
              l += fs.f_bavail;

-        
-; return 0; }
-EOF
-if { (eval echo configure:17998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

              wx_cv_func_statfs=yes
              wx_cv_func_statfs=yes

-        
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

              wx_cv_func_statfs=no
              wx_cv_func_statfs=no

-        
-    
-fi
-rm -f conftest*
+

 
 fi
 
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_func_statfs" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_statfs" >&5
+echo "${ECHO_T}$wx_cv_func_statfs" >&6

 
 if test "$wx_cv_func_statfs" = "yes"; then
     wx_cv_type_statvfs_t="struct statfs"
 
 if test "$wx_cv_func_statfs" = "yes"; then
     wx_cv_type_statvfs_t="struct statfs"

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define HAVE_STATFS 1
 #define HAVE_STATFS 1

-EOF
+_ACEOF

 
 else
 
 else

-    echo $ac_n "checking for statvfs""... $ac_c" 1>&6
-echo "configure:18026: checking for statvfs" >&5
-if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:$LINENO: checking for statvfs" >&5
+echo $ECHO_N "checking for statvfs... $ECHO_C" >&6
+if test "${wx_cv_func_statvfs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 18031 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                 #include <stddef.h>
                 #include <sys/statvfs.h>
 
                 #include <stddef.h>
                 #include <sys/statvfs.h>

-            
-int main() {
+
+int
+main ()
+{

 
                 statvfs("/", NULL);
 
                 statvfs("/", NULL);

-            
-; return 0; }
-EOF
-if { (eval echo configure:18043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_statvfs=yes
 else
   wx_cv_func_statvfs=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_func_statvfs=no
-        
-fi
-rm -f conftest*
-    
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_func_statvfs=no
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_func_statvfs" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_statvfs" >&5
+echo "${ECHO_T}$wx_cv_func_statvfs" >&6

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

-                                                                
-        ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+
+        ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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 $ac_n "checking for statvfs argument type""... $ac_c" 1>&6
-echo "configure:18070: checking for statvfs argument type" >&5
-if eval "test \"`echo '$''{'wx_cv_type_statvfs_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        echo "$as_me:$LINENO: checking for statvfs argument type" >&5
+echo $ECHO_N "checking for statvfs argument type... $ECHO_C" >&6
+if test "${wx_cv_type_statvfs_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftest.$ac_ext <<EOF
-#line 18075 "configure"
-#include "confdefs.h"
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                     #include <sys/statvfs.h>
 
                     #include <sys/statvfs.h>

-                
-int main() {
+
+int
+main ()
+{

 
                     long l;
                     statvfs_t fs;
 
                     long l;
                     statvfs_t fs;


@@ -18084,24 +27439,42 @@ int main() {
                     l = fs.f_bsize;
                     l += fs.f_blocks;
                     l += fs.f_bavail;
                     l = fs.f_bsize;
                     l += fs.f_blocks;
                     l += fs.f_bavail;

-                
-; return 0; }
-EOF
-if { (eval echo configure:18091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_statvfs_t=statvfs_t
 else
   wx_cv_type_statvfs_t=statvfs_t
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    cat > conftest.$ac_ext <<EOF
-#line 18100 "configure"
-#include "confdefs.h"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+                    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                             #include <sys/statvfs.h>
 
                             #include <sys/statvfs.h>

-                        
-int main() {
+
+int
+main ()
+{

 
                             long l;
                             struct statvfs fs;
 
                             long l;
                             struct statvfs fs;


@@ -18109,41 +27482,52 @@ int main() {
                             l = fs.f_bsize;
                             l += fs.f_blocks;
                             l += fs.f_bavail;
                             l = fs.f_bsize;
                             l += fs.f_blocks;
                             l += fs.f_bavail;

-                        
-; return 0; }
-EOF
-if { (eval echo configure:18116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_statvfs_t="struct statvfs"
 else
   wx_cv_type_statvfs_t="struct statvfs"
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_type_statvfs_t="unknown"
-                    
-fi
-rm -f conftest*
-                
-            
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_type_statvfs_t="unknown"
+

 fi
 fi

-rm -f conftest*
-        
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_type_statvfs_t" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_type_statvfs_t" >&5
+echo "${ECHO_T}$wx_cv_type_statvfs_t" >&6

 
         ac_ext=c
 
         ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$wx_cv_type_statvfs_t" != "unknown"; then
 
 
         if test "$wx_cv_type_statvfs_t" != "unknown"; then

-            cat >> confdefs.h <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define HAVE_STATVFS 1
 #define HAVE_STATVFS 1

-EOF
+_ACEOF

 
         fi
     else
 
         fi
     else


@@ -18152,803 +27536,1167 @@ EOF
 fi
 
 if test "$wx_cv_type_statvfs_t" != "unknown"; then
 fi
 
 if test "$wx_cv_type_statvfs_t" != "unknown"; then

-    cat >> confdefs.h <<EOF
+    cat >>confdefs.h <<_ACEOF

 #define WX_STATFS_T $wx_cv_type_statvfs_t
 #define WX_STATFS_T $wx_cv_type_statvfs_t

-EOF
+_ACEOF

 
 else
 
 else

-    echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+    { 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
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then

-    for ac_func in fcntl flock
+
+
+for ac_func in fcntl flock

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18168: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18173 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  break
  break

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
     if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
 fi
 done
 
 
     if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then

-        echo "configure: warning: wxSingleInstanceChecker not available" 1>&2
+        { echo "$as_me:$LINENO: WARNING: wxSingleInstanceChecker not available" >&5
+echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;}

         wxUSE_SNGLINST_CHECKER=no
     fi
 fi
 
         wxUSE_SNGLINST_CHECKER=no
     fi
 fi
 

+

 for ac_func in timegm
 do
 for ac_func in timegm
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18230: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18235 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 fi
 done
 
 

+
+

 for ac_func in putenv setenv
 do
 for ac_func in putenv setenv
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18286: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18291 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  break
  break

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then
 fi
 done
 
 
 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then

-            cat >> confdefs.h <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define HAVE_SLEEP 1
 #define HAVE_SLEEP 1

-EOF
+_ACEOF

 
     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 <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define HAVE_USLEEP 1
 #define HAVE_USLEEP 1

-EOF
+_ACEOF

 
     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
+
+for ac_func in nanosleep

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18361: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18366 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ cat >>confdefs.h <<\_ACEOF

 #define HAVE_NANOSLEEP 1
 #define HAVE_NANOSLEEP 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:18414: checking for nanosleep in -lposix4" >&5
-ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+            echo "$as_me:$LINENO: checking for nanosleep in -lposix4" >&5
+echo $ECHO_N "checking for nanosleep in -lposix4... $ECHO_C" >&6
+if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lposix4  $LIBS"
 LIBS="-lposix4  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 18422 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char nanosleep();
-
-int main() {
-nanosleep()
-; return 0; }
-EOF
-if { (eval echo configure:18433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                    cat >> confdefs.h <<\EOF
+   builtin and then its argument prototype would still apply.  */
+char nanosleep ();
+int
+main ()
+{
+nanosleep ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_posix4_nanosleep=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_posix4_nanosleep=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_nanosleep" >&5
+echo "${ECHO_T}$ac_cv_lib_posix4_nanosleep" >&6
+if test $ac_cv_lib_posix4_nanosleep = yes; then
+
+                    cat >>confdefs.h <<\_ACEOF

 #define HAVE_NANOSLEEP 1
 #define HAVE_NANOSLEEP 1

-EOF
+_ACEOF

 
                     POSIX4_LINK=" -lposix4"
 
                     POSIX4_LINK=" -lposix4"

-                
+

 else
 else

-  echo "$ac_t""no" 1>&6

 
 

-                    for ac_func in usleep
+
+for ac_func in usleep

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18461: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18466 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ cat >>confdefs.h <<\_ACEOF

 #define HAVE_USLEEP 1
 #define HAVE_USLEEP 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "$ac_t""no" 1>&6
-echo "configure: warning: wxSleep() function will not work" 1>&2
-                    
+  { echo "$as_me:$LINENO: WARNING: wxSleep() function will not work" >&5
+echo "$as_me: WARNING: wxSleep() function will not work" >&2;}
+

 fi
 done
 
 fi
 done
 

-                
-            
+
+

 fi
 
 fi
 

-        
-    
+
+

 fi
 done
 
 fi
 
 fi
 done
 
 fi
 

+
+

 for ac_func in uname gethostname
 do
 for ac_func in uname gethostname
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18532: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18537 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  break
  break

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 
 fi
 done
 
 
 

-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+
+ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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_func in strtok_r
 do
 
 
 for ac_func in strtok_r
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18597: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18602 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"

+{

 #endif
 /* We use char because int might match the return type of a gcc2
 #endif
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 ac_ext=c
 fi
 done
 
 
 ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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

 
 
 INET_LINK=
 
 
 INET_LINK=

+

 for ac_func in inet_addr
 do
 for ac_func in inet_addr
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18665: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18670 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ cat >>confdefs.h <<\_ACEOF

 #define HAVE_INET_ADDR 1
 #define HAVE_INET_ADDR 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:18718: checking for inet_addr in -lnsl" >&5
-ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+        echo "$as_me:$LINENO: checking for inet_addr in -lnsl" >&5
+echo $ECHO_N "checking for inet_addr in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lnsl  $LIBS"
 LIBS="-lnsl  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 18726 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char inet_addr();
-
-int main() {
-inet_addr()
-; return 0; }
-EOF
-if { (eval echo configure:18737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char inet_addr ();
+int
+main ()
+{
+inet_addr ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_nsl_inet_addr=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nsl_inet_addr=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_addr" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_inet_addr" >&6
+if test $ac_cv_lib_nsl_inet_addr = yes; then

   INET_LINK="nsl"
 else
   INET_LINK="nsl"
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:18756: checking for inet_addr in -lresolv" >&5
-ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking for inet_addr in -lresolv" >&5
+echo $ECHO_N "checking for inet_addr in -lresolv... $ECHO_C" >&6
+if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lresolv  $LIBS"
 LIBS="-lresolv  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 18764 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char inet_addr();
-
-int main() {
-inet_addr()
-; return 0; }
-EOF
-if { (eval echo configure:18775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char inet_addr ();
+int
+main ()
+{
+inet_addr ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_resolv_inet_addr=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_resolv_inet_addr=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_addr" >&5
+echo "${ECHO_T}$ac_cv_lib_resolv_inet_addr" >&6
+if test $ac_cv_lib_resolv_inet_addr = yes; then

   INET_LINK="resolv"
 else
   INET_LINK="resolv"
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6
-echo "configure:18794: checking for inet_addr in -lsocket" >&5
-ac_lib_var=`echo socket'_'inet_addr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking for inet_addr in -lsocket" >&5
+echo $ECHO_N "checking for inet_addr in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_inet_addr+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lsocket  $LIBS"
 LIBS="-lsocket  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 18802 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char inet_addr();
+   builtin and then its argument prototype would still apply.  */
+char inet_addr ();
+int
+main ()
+{
+inet_addr ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_inet_addr=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_inet_addr=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_inet_addr" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_inet_addr" >&6
+if test $ac_cv_lib_socket_inet_addr = yes; then
+  INET_LINK="socket"

 
 

-int main() {
-inet_addr()
-; return 0; }
-EOF
-if { (eval echo configure:18813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"

 fi
 fi

-rm -f conftest*
-LIBS="$ac_save_LIBS"

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  INET_LINK="socket"
-                
-else
-  echo "$ac_t""no" 1>&6
-fi

 
 

-            

 fi
 
 fi
 

-        
+

 fi
 
 fi
 

-    
+

 
 fi
 done
 
 
 
 fi
 done
 
 

+

 for ac_func in inet_aton
 do
 for ac_func in inet_aton
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18849: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 18854 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:18877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ cat >>confdefs.h <<\_ACEOF

 #define HAVE_INET_ATON 1
 #define HAVE_INET_ATON 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "$ac_t""no" 1>&6
-            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:18902: checking for inet_aton in -l$INET_LINK" >&5
-ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+                        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 eval "test \"\${$as_ac_Lib+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-l$INET_LINK  $LIBS"
 LIBS="-l$INET_LINK  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 18910 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char inet_aton();
-
-int main() {
-inet_aton()
-; return 0; }
-EOF
-if { (eval echo configure:18921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+   builtin and then its argument prototype would still apply.  */
+char inet_aton ();
+int
+main ()
+{
+inet_aton ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Lib=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Lib=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+  cat >>confdefs.h <<\_ACEOF

 #define HAVE_INET_ATON 1
 #define HAVE_INET_ATON 1

-EOF
+_ACEOF

 
 

-else
-  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-        
+

 fi
 done
 
 
 if test "x$INET_LINK" != "x"; then
 fi
 done
 
 
 if test "x$INET_LINK" != "x"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define HAVE_INET_ADDR 1
 #define HAVE_INET_ADDR 1

-EOF
+_ACEOF

 
     INET_LINK=" -l$INET_LINK"
 fi
 
     INET_LINK=" -l$INET_LINK"
 fi


@@ -18956,47 +28704,264 @@ fi
 fi
 
 
 fi
 
 

-cat > confcache <<\EOF
+
+EXTRALIBS_ESD=
+echo "$as_me:$LINENO: checking for esd_close in -lesd" >&5
+echo $ECHO_N "checking for esd_close in -lesd... $ECHO_C" >&6
+if test "${ac_cv_lib_esd_esd_close+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lesd  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char esd_close ();
+int
+main ()
+{
+esd_close ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_esd_esd_close=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_esd_esd_close=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_close" >&5
+echo "${ECHO_T}$ac_cv_lib_esd_esd_close" >&6
+if test $ac_cv_lib_esd_esd_close = yes; then
+
+
+for ac_header in esd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+    EXTRALIBS_ESD="-lesd"
+
+fi
+
+done
+
+
+fi
+
+
+
+
+
+cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure

-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.

 #
 #

-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.

 #
 #

-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+

 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.

-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else

   if test -w $cache_file; then
   if test -w $cache_file; then

-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file

   else
     echo "not updating unwritable cache $cache_file"
   fi
   else
     echo "not updating unwritable cache $cache_file"
   fi


@@ -19004,24 +28969,24 @@ fi
 rm -f confcache
 
 
 rm -f confcache
 
 

-

 CPP_MT_FLAG=
 if test "$TOOLKIT" != "MSW"; then
 
 CPP_MT_FLAG=
 if test "$TOOLKIT" != "MSW"; then
 

-                            
+

     THREADS_LINK=
     THREADS_CFLAGS=
 
     if test "$wxUSE_THREADS" = "yes" ; then
         if test "$USE_BEOS" = 1; then
     THREADS_LINK=
     THREADS_CFLAGS=
 
     if test "$wxUSE_THREADS" = "yes" ; then
         if test "$USE_BEOS" = 1; then

-            echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&2
+            { 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;}

             wxUSE_THREADS="no"
         fi
     fi
 
     if test "$wxUSE_THREADS" = "yes" ; then
             wxUSE_THREADS="no"
         fi
     fi
 
     if test "$wxUSE_THREADS" = "yes" ; then

-                                                        
-        
+
+

                                 THREAD_OPTS="-pthread"
         case "${host}" in
           *-*-solaris2* | *-*-sunos4* )
                                 THREAD_OPTS="-pthread"
         case "${host}" in
           *-*-solaris2* | *-*-sunos4* )


@@ -19065,19 +29030,19 @@ if test "$TOOLKIT" != "MSW"; then
         for flag in $THREAD_OPTS; do
             case $flag in
                 none)
         for flag in $THREAD_OPTS; do
             case $flag in
                 none)

-                    echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
-echo "configure:19070: checking whether pthreads work without any flags" >&5
+                    echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
+echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6

                     ;;
 
                 -*)
                     ;;
 
                 -*)

-                    echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
-echo "configure:19075: checking whether pthreads work with $flag" >&5
+                    echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
+echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6

                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)
                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)

-                    echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
-echo "configure:19081: checking for the pthreads library -l$flag" >&5
+                    echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
+echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6

                     THREADS_LINK="-l$flag"
                     ;;
               esac
                     THREADS_LINK="-l$flag"
                     ;;
               esac


@@ -19087,27 +29052,47 @@ echo "configure:19081: checking for the pthreads library -l$flag" >&5
               LIBS="$THREADS_LINK $LIBS"
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 
               LIBS="$THREADS_LINK $LIBS"
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 

-              cat > conftest.$ac_ext <<EOF
-#line 19092 "configure"
-#include "confdefs.h"
+              cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <pthread.h>
 #include <pthread.h>

-int main() {
+int
+main ()
+{

 pthread_create(0,0,0,0);
 pthread_create(0,0,0,0);

-; return 0; }
-EOF
-if { (eval echo configure:19099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   THREADS_OK=yes
 else
   THREADS_OK=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 
 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 

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

               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi
               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi


@@ -19118,13 +29103,14 @@ rm -f conftest*
 
       if test "x$THREADS_OK" != "xyes"; then
           wxUSE_THREADS=no
 
       if test "x$THREADS_OK" != "xyes"; then
           wxUSE_THREADS=no

-          echo "configure: warning: No thread support on this system... disabled" 1>&2
+          { 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;}

       else
                               LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
           LIBS="$THREADS_LINK $LIBS"
 
       else
                               LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
           LIBS="$THREADS_LINK $LIBS"
 

-          echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
-echo "configure:19128: checking if more special flags are required for pthreads" >&5
+          echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
+echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6

           flag=no
           case "${host}" in
             *-aix*)
           flag=no
           case "${host}" in
             *-aix*)


@@ -19144,7 +29130,8 @@ echo "configure:19128: checking if more special flags are required for pthreads"
                 flag="-D_REENTRANT"
                 ;;
           esac
                 flag="-D_REENTRANT"
                 ;;
           esac

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

           if test "x$flag" != xno; then
               THREADS_CFLAGS="$THREADS_CFLAGS $flag"
           fi
           if test "x$flag" != xno; then
               THREADS_CFLAGS="$THREADS_CFLAGS $flag"
           fi


@@ -19157,585 +29144,954 @@ echo "configure:19128: checking if more special flags are required for pthreads"
     fi
 
         if test "$wxUSE_THREADS" = "yes" ; then
     fi
 
         if test "$wxUSE_THREADS" = "yes" ; then

-      for ac_func in thr_setconcurrency
+
+for ac_func in thr_setconcurrency

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19164: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19169 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:19192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 fi
 done
 
 

-      for ac_hdr in sched.h
+
+for ac_header in sched.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:19221: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19226 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:19231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

+

 done
 
       if test "$ac_cv_header_sched_h" = "yes"; then
 done
 
       if test "$ac_cv_header_sched_h" = "yes"; then

-          echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
-echo "configure:19259: checking for sched_yield" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19264 "configure"
-#include "confdefs.h"
+          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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char sched_yield(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char sched_yield();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char sched_yield ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_sched_yield) || defined (__stub___sched_yield)
 choke me
 #else
 /* 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
 #else

-sched_yield();
+char (*f) () = sched_yield;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:19287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sched_yield=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sched_yield=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sched_yield`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != sched_yield;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_sched_yield=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_sched_yield=no
+fi
+rm -f conftest.$ac_objext 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
 #define HAVE_SCHED_YIELD 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "$ac_t""no" 1>&6

 
 

-                echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:19309: checking for sched_yield in -lposix4" >&5
-ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5
+echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6
+if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lposix4  $LIBS"
 LIBS="-lposix4  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 19317 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char sched_yield();
-
-int main() {
-sched_yield()
-; return 0; }
-EOF
-if { (eval echo configure:19328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+   builtin and then its argument prototype would still apply.  */
+char sched_yield ();
+int
+main ()
+{
+sched_yield ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_posix4_sched_yield=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_posix4_sched_yield=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5
+echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6
+if test $ac_cv_lib_posix4_sched_yield = yes; then
+  cat >>confdefs.h <<\_ACEOF

 #define HAVE_SCHED_YIELD 1
 #define HAVE_SCHED_YIELD 1

-EOF
+_ACEOF

  POSIX4_LINK=" -lposix4"
 else
  POSIX4_LINK=" -lposix4"
 else

-  echo "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Yield will not work properly" 1>&2
-                
+  { 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
 
       fi
 
                                           HAVE_PRIOR_FUNCS=0
 fi
 
       fi
 
                                           HAVE_PRIOR_FUNCS=0

-      echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6
-echo "configure:19361: checking for pthread_attr_getschedpolicy" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getschedpolicy'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19366 "configure"
-#include "confdefs.h"
+      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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char pthread_attr_getschedpolicy(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_getschedpolicy();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char pthread_attr_getschedpolicy ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_pthread_attr_getschedpolicy) || defined (__stub___pthread_attr_getschedpolicy)
 choke me
 #else
 /* 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
 #else

-pthread_attr_getschedpolicy();
+char (*f) () = pthread_attr_getschedpolicy;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:19389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_getschedpolicy=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_getschedpolicy=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_getschedpolicy`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for pthread_attr_setschedparam""... $ac_c" 1>&6
-echo "configure:19404: checking for pthread_attr_setschedparam" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedparam'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19409 "configure"
-#include "confdefs.h"
+int
+main ()
+{
+return f != pthread_attr_getschedpolicy;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_pthread_attr_getschedpolicy=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_pthread_attr_getschedpolicy=no
+fi
+rm -f conftest.$ac_objext 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char pthread_attr_setschedparam(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setschedparam();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char pthread_attr_setschedparam ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_pthread_attr_setschedparam) || defined (__stub___pthread_attr_setschedparam)
 choke me
 #else
 /* 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
 #else

-pthread_attr_setschedparam();
+char (*f) () = pthread_attr_setschedparam;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:19432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setschedparam=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_attr_setschedparam=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedparam`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for sched_get_priority_max""... $ac_c" 1>&6
-echo "configure:19447: checking for sched_get_priority_max" >&5
-if eval "test \"`echo '$''{'ac_cv_func_sched_get_priority_max'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19452 "configure"
-#include "confdefs.h"
+int
+main ()
+{
+return f != pthread_attr_setschedparam;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_pthread_attr_setschedparam=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_pthread_attr_setschedparam=no
+fi
+rm -f conftest.$ac_objext 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char sched_get_priority_max(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char sched_get_priority_max();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char sched_get_priority_max ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_sched_get_priority_max) || defined (__stub___sched_get_priority_max)
 choke me
 #else
 /* 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
 #else

-sched_get_priority_max();
+char (*f) () = sched_get_priority_max;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:19475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_sched_get_priority_max=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_sched_get_priority_max=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'sched_get_priority_max`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+int
+main ()
+{
+return f != sched_get_priority_max;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_sched_get_priority_max=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_sched_get_priority_max=no
+fi
+rm -f conftest.$ac_objext 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
   HAVE_PRIOR_FUNCS=1
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:19493: checking for sched_get_priority_max in -lposix4" >&5
-ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking for sched_get_priority_max in -lposix4" >&5
+echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6
+if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lposix4  $LIBS"
 LIBS="-lposix4  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 19501 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char sched_get_priority_max();
-
-int main() {
-sched_get_priority_max()
-; return 0; }
-EOF
-if { (eval echo configure:19512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+   builtin and then its argument prototype would still apply.  */
+char sched_get_priority_max ();
+int
+main ()
+{
+sched_get_priority_max ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_posix4_sched_get_priority_max=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_posix4_sched_get_priority_max=no
+fi
+rm -f conftest.$ac_objext 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

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  

                                 HAVE_PRIOR_FUNCS=1
                                 POSIX4_LINK=" -lposix4"
                                 HAVE_PRIOR_FUNCS=1
                                 POSIX4_LINK=" -lposix4"

-                             
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
 fi
 

-                       
+

 fi
 
 fi
 

-                     
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
 fi
 

-                   
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
 
       if test "$HAVE_PRIOR_FUNCS" = 1; then
 fi
 
 
       if test "$HAVE_PRIOR_FUNCS" = 1; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1

-EOF
+_ACEOF

 
       else
 
       else

-        echo "configure: warning: Setting thread priority will not work" 1>&2
+        { echo "$as_me:$LINENO: WARNING: Setting thread priority will not work" >&5
+echo "$as_me: WARNING: Setting thread priority will not work" >&2;}

       fi
 
       fi
 

-      echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6
-echo "configure:19559: checking for pthread_cancel" >&5
-if eval "test \"`echo '$''{'ac_cv_func_pthread_cancel'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 19564 "configure"
-#include "confdefs.h"
+      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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char pthread_cancel(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char pthread_cancel();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char pthread_cancel ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_pthread_cancel) || defined (__stub___pthread_cancel)
 choke me
 #else
 /* 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
 #else

-pthread_cancel();
+char (*f) () = pthread_cancel;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:19587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_cancel=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_pthread_cancel=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'pthread_cancel`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != pthread_cancel;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_pthread_cancel=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_pthread_cancel=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cancel" >&5
+echo "${ECHO_T}$ac_cv_func_pthread_cancel" >&6
+if test $ac_cv_func_pthread_cancel = yes; then
+  cat >>confdefs.h <<\_ACEOF

 #define HAVE_PTHREAD_CANCEL 1
 #define HAVE_PTHREAD_CANCEL 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
+  { echo "$as_me:$LINENO: WARNING: wxThread::Kill() will not work properly" >&5
+echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;}

 fi
 
 
 fi
 
 

-      echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:19612: checking for pthread_cleanup_push/pop" >&5
-if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+      echo "$as_me:$LINENO: checking for pthread_cleanup_push/pop" >&5
+echo $ECHO_N "checking for pthread_cleanup_push/pop... $ECHO_C" >&6
+if test "${wx_cv_func_pthread_cleanup_push+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-        cat > conftest.$ac_ext <<EOF
-#line 19618 "configure"
-#include "confdefs.h"
+
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <pthread.h>
 #include <pthread.h>

-int main() {
+int
+main ()
+{

 
                         pthread_cleanup_push(NULL, NULL);
                         pthread_cleanup_pop(0);
 
                         pthread_cleanup_push(NULL, NULL);
                         pthread_cleanup_pop(0);

-                     
-; return 0; }
-EOF
-if { (eval echo configure:19628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                         wx_cv_func_pthread_cleanup_push=yes
                         wx_cv_func_pthread_cleanup_push=yes

-                     
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

                         wx_cv_func_pthread_cleanup_push=no
                         wx_cv_func_pthread_cleanup_push=no

-                     
-fi
-rm -f conftest*
-      
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup_push" >&5
+echo "${ECHO_T}$wx_cv_func_pthread_cleanup_push" >&6

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

-          cat >> confdefs.h <<\EOF
+          cat >>confdefs.h <<\_ACEOF

 #define HAVE_THREAD_CLEANUP_FUNCTIONS 1
 #define HAVE_THREAD_CLEANUP_FUNCTIONS 1

-EOF
+_ACEOF

 
       fi
 
 
       fi
 

-                                                
-      echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
-echo "configure:19656: checking for pthread_mutexattr_t" >&5
-if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+      echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5
+echo $ECHO_N "checking for pthread_mutexattr_t... $ECHO_C" >&6
+if test "${wx_cv_type_pthread_mutexattr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-        cat > conftest.$ac_ext <<EOF
-#line 19662 "configure"
-#include "confdefs.h"
+
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <pthread.h>
 #include <pthread.h>

-int main() {
+int
+main ()
+{

 
                pthread_mutexattr_t attr;
                pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 
                pthread_mutexattr_t attr;
                pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);

-            
-; return 0; }
-EOF
-if { (eval echo configure:19672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                wx_cv_type_pthread_mutexattr_t=yes
                wx_cv_type_pthread_mutexattr_t=yes

-            
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  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
-rm -f conftest*
-      
+
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_type_pthread_mutexattr_t" >&5
+echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6

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

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define HAVE_PTHREAD_MUTEXATTR_T 1
 #define HAVE_PTHREAD_MUTEXATTR_T 1

-EOF
+_ACEOF

 
       else
 
       else

-                echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
-echo "configure:19699: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
-if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-            cat > conftest.$ac_ext <<EOF
-#line 19705 "configure"
-#include "confdefs.h"
+                echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6
+if test "${wx_cv_type_pthread_rec_mutex_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <pthread.h>
 #include <pthread.h>

-int main() {
+int
+main ()
+{

 
                     pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
 
                     pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;

-                
-; return 0; }
-EOF
-if { (eval echo configure:19714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                     wx_cv_type_pthread_rec_mutex_init=yes
                     wx_cv_type_pthread_rec_mutex_init=yes

-                
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

                     wx_cv_type_pthread_rec_mutex_init=no
                     wx_cv_type_pthread_rec_mutex_init=no

-                
-            
-fi
-rm -f conftest*
-        
+
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6
+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

         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 <<\EOF
+          cat >>confdefs.h <<\_ACEOF

 #define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
 #define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1

-EOF
+_ACEOF

 
         else
 
         else

-                    echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
+                    { 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;}

         fi
       fi
     fi
         fi
       fi
     fi


@@ -19744,38 +30100,56 @@ else
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
         *-*-mingw32* )
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
         *-*-mingw32* )

-                        echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6
-echo "configure:19749: checking if compiler supports -mthreads" >&5
-if eval "test \"`echo '$''{'wx_cv_cflags_mthread'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                        echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
+echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6
+if test "${wx_cv_cflags_mthread+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
+

                     CFLAGS_OLD="$CFLAGS"
                     CFLAGS="$CFLAGS -mthreads"
                     CFLAGS_OLD="$CFLAGS"
                     CFLAGS="$CFLAGS -mthreads"

-                    cat > conftest.$ac_ext <<EOF
-#line 19757 "configure"
-#include "confdefs.h"
-
-int main() {
+                    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
 

-; return 0; }
-EOF
-if { (eval echo configure:19764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_cflags_mthread=yes
 else
   wx_cv_cflags_mthread=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_cflags_mthread=no
-                    
-fi
-rm -f conftest*
-                
-            
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_cflags_mthread=no
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext
+

 
 

-echo "$ac_t""$wx_cv_cflags_mthread" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_cflags_mthread" >&5
+echo "${ECHO_T}$wx_cv_cflags_mthread" >&6

 
             if test "$wx_cv_cflags_mthread" = "yes"; then
                                 CXXFLAGS="$CXXFLAGS -mthreads"
 
             if test "$wx_cv_cflags_mthread" = "yes"; then
                                 CXXFLAGS="$CXXFLAGS -mthreads"


@@ -19790,44 +30164,46 @@ echo "$ac_t""$wx_cv_cflags_mthread" 1>&6
 fi
 
 if test "$wxUSE_THREADS" = "yes"; then
 fi
 
 if test "$wxUSE_THREADS" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_THREADS 1
 #define wxUSE_THREADS 1

-EOF
+_ACEOF

 
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then
 
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then

-    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:19803: checking if -D_REENTRANT is needed" >&5
+    echo "$as_me:$LINENO: checking if -D_REENTRANT is needed" >&5
+echo $ECHO_N "checking if -D_REENTRANT is needed... $ECHO_C" >&6

     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"

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

     else
     else

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

     fi
   fi
 fi
 
 if test "$WXGTK20" = 1 ; then
     fi
   fi
 fi
 
 if test "$WXGTK20" = 1 ; then

-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<_ACEOF

 #define __WXGTK20__ $WXGTK20
 #define __WXGTK20__ $WXGTK20

-EOF
+_ACEOF

 
   WXGTK12=1
 fi
 
 if test "$WXGTK12" = 1 ; then
 
   WXGTK12=1
 fi
 
 if test "$WXGTK12" = 1 ; then

-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<_ACEOF

 #define __WXGTK12__ $WXGTK12
 #define __WXGTK12__ $WXGTK12

-EOF
+_ACEOF

 
 fi
 
 if test "$WXGTK127" = 1 ; then
 
 fi
 
 if test "$WXGTK127" = 1 ; then

-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<_ACEOF

 #define __WXGTK127__ $WXGTK127
 #define __WXGTK127__ $WXGTK127

-EOF
+_ACEOF

 
 fi
 
 
 fi
 


@@ -19844,9 +30220,9 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
 fi
 
 if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
 fi
 
 if test "$wxUSE_DEBUG_FLAG" = "yes" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define WXDEBUG 1
 #define WXDEBUG 1

-EOF
+_ACEOF

 
     WXDEBUG_DEFINE="-D__WXDEBUG__"
 else
 
     WXDEBUG_DEFINE="-D__WXDEBUG__"
 else


@@ -19856,17 +30232,17 @@ else
 fi
 
 if test "$wxUSE_MEM_TRACING" = "yes" ; then
 fi
 
 if test "$wxUSE_MEM_TRACING" = "yes" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_MEMORY_TRACING 1
 #define wxUSE_MEMORY_TRACING 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1

-EOF
+_ACEOF

 
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DEBUG_NEW_ALWAYS 1
 #define wxUSE_DEBUG_NEW_ALWAYS 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi


@@ -19892,12 +30268,6 @@ if test "$GCC" = "yes" ; then
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi

-    if test "$USE_WIN32" = 1 ; then
-        # I'm not even really sure what this was ever added to solve,
-        # but someone added it for mingw native builds, so I guess
-        # they had a reason, right??
-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
-    fi

 
                                                 case "${host}" in
       powerpc*-*-aix* )
 
                                                 case "${host}" in
       powerpc*-*-aix* )


@@ -19930,190 +30300,192 @@ fi
 
 
 if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
 
 
 if test "$WXWIN_COMPATIBILITY_2" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define WXWIN_COMPATIBILITY_2 1
 #define WXWIN_COMPATIBILITY_2 1

-EOF
+_ACEOF

 
 
     WXWIN_COMPATIBILITY_2_2="yes"
 fi
 
 if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
 
 
     WXWIN_COMPATIBILITY_2_2="yes"
 fi
 
 if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define WXWIN_COMPATIBILITY_2_2 1
 #define WXWIN_COMPATIBILITY_2_2 1

-EOF
+_ACEOF

 
 
     WXWIN_COMPATIBILITY_2_4="yes"
 fi
 
 if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
 
 
     WXWIN_COMPATIBILITY_2_4="yes"
 fi
 
 if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define WXWIN_COMPATIBILITY_2_4 1
 #define WXWIN_COMPATIBILITY_2_4 1

-EOF
+_ACEOF

 
 fi
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
 fi
 
 
 if test "$wxUSE_GUI" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_GUI 1
 #define wxUSE_GUI 1

-EOF
+_ACEOF

 
 
                       else
 
 
                       else

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_NOGUI 1
 #define wxUSE_NOGUI 1

-EOF
+_ACEOF

 
 fi
 
 
 if test "$wxUSE_UNIX" = "yes"; then
 
 fi
 
 
 if test "$wxUSE_UNIX" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_UNIX 1
 #define wxUSE_UNIX 1

-EOF
+_ACEOF

 
 fi
 
 
 
 fi
 
 

+if test "$wxUSE_STL" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STL 1
+_ACEOF
+
+fi
+

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

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_APPLE_IEEE 1
 #define wxUSE_APPLE_IEEE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_TIMER" = "yes"; then
 
 fi
 
 if test "$wxUSE_TIMER" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TIMER 1
 #define wxUSE_TIMER 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_WAVE" = "yes"; then
 
 fi
 
 if test "$wxUSE_WAVE" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_WAVE 1
 #define wxUSE_WAVE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
 
 fi
 
 if test "$wxUSE_CMDLINE_PARSER" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CMDLINE_PARSER 1
 #define wxUSE_CMDLINE_PARSER 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_STOPWATCH" = "yes"; then
 
 fi
 
 if test "$wxUSE_STOPWATCH" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STOPWATCH 1
 #define wxUSE_STOPWATCH 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then
 
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DATETIME 1
 #define wxUSE_DATETIME 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_FILE" = "yes"; then
 
 fi
 
 if test "$wxUSE_FILE" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FILE 1
 #define wxUSE_FILE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_FFILE" = "yes"; then
 
 fi
 
 if test "$wxUSE_FFILE" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FFILE 1
 #define wxUSE_FFILE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_FILESYSTEM" = "yes"; then
 
 fi
 
 if test "$wxUSE_FILESYSTEM" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FILESYSTEM 1
 #define wxUSE_FILESYSTEM 1

-EOF
-
-fi
-
-if test "$wxUSE_FS_INET" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_FS_INET 1
-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_FS_ZIP" = "yes"; then
 
 fi
 
 if test "$wxUSE_FS_ZIP" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FS_ZIP 1
 #define wxUSE_FS_ZIP 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
 
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ZIPSTREAM 1
 #define wxUSE_ZIPSTREAM 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
 
 fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ON_FATAL_EXCEPTION 1
 #define wxUSE_ON_FATAL_EXCEPTION 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
 
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SNGLINST_CHECKER 1
 #define wxUSE_SNGLINST_CHECKER 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_BUSYINFO" = "yes"; then
 
 fi
 
 if test "$wxUSE_BUSYINFO" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_BUSYINFO 1
 #define wxUSE_BUSYINFO 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then
 
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STD_IOSTREAM 1
 #define wxUSE_STD_IOSTREAM 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_TEXTBUFFER" = "yes"; then
 
 fi
 
 if test "$wxUSE_TEXTBUFFER" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TEXTBUFFER 1
 #define wxUSE_TEXTBUFFER 1

-EOF
+_ACEOF

 
 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 "configure: warning: wxTextFile requires wxFile and wxTextBuffer... disabled" 1>&2
+    { echo "$as_me:$LINENO: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5
+echo "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;}

   else
   else

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TEXTFILE 1
 #define wxUSE_TEXTFILE 1

-EOF
+_ACEOF

 
   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 "configure: warning: wxConfig requires wxTextFile... disabled" 1>&2
+    { echo "$as_me:$LINENO: WARNING: wxConfig requires wxTextFile... disabled" >&5
+echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;}

   else
   else

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CONFIG 1
 #define wxUSE_CONFIG 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
   fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
   fi


@@ -20121,11 +30493,12 @@ 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 "configure: warning: I18n code requires wxFile... disabled" 1>&2
+    { echo "$as_me:$LINENO: WARNING: I18n code requires wxFile... disabled" >&5
+echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}

   else
   else

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_INTL 1
 #define wxUSE_INTL 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
     GUIDIST="$GUIDIST INTL_DIST"
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
     GUIDIST="$GUIDIST INTL_DIST"


@@ -20133,465 +30506,662 @@ EOF
 fi
 
 if test "$wxUSE_LOG" = "yes"; then
 fi
 
 if test "$wxUSE_LOG" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LOG 1
 #define wxUSE_LOG 1

-EOF
+_ACEOF

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

-      cat >> confdefs.h <<\EOF
+      cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LOGGUI 1
 #define wxUSE_LOGGUI 1

-EOF
+_ACEOF

 
     fi
 
     if test "$wxUSE_LOGWINDOW" = "yes"; then
 
     fi
 
     if test "$wxUSE_LOGWINDOW" = "yes"; then

-      cat >> confdefs.h <<\EOF
+      cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LOGWINDOW 1
 #define wxUSE_LOGWINDOW 1

-EOF
+_ACEOF

 
     fi
 
     if test "$wxUSE_LOGDIALOG" = "yes"; then
 
     fi
 
     if test "$wxUSE_LOGDIALOG" = "yes"; then

-      cat >> confdefs.h <<\EOF
+      cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LOG_DIALOG 1
 #define wxUSE_LOG_DIALOG 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
 
     fi
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LONGLONG 1
 #define wxUSE_LONGLONG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_GEOMETRY" = "yes"; then
 
 fi
 
 if test "$wxUSE_GEOMETRY" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_GEOMETRY 1
 #define wxUSE_GEOMETRY 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
 
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DIALUP_MANAGER 1
 #define wxUSE_DIALUP_MANAGER 1

-EOF
+_ACEOF

 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STREAMS 1
 #define wxUSE_STREAMS 1

-EOF
+_ACEOF

 
 fi
 
 
 if test "$wxUSE_DATETIME" = "yes"; then
 
 fi
 
 
 if test "$wxUSE_DATETIME" = "yes"; then

-        for ac_func in strptime
+
+for ac_func in strptime

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20198: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20203 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:20226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
 fi
 done
 
 

-            echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:20252: checking for timezone variable in <time.h>" >&5
-if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+            echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
+echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6
+if test "${wx_cv_var_timezone+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-                        cat > conftest.$ac_ext <<EOF
-#line 20258 "configure"
-#include "confdefs.h"
+
+                        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                                 #include <time.h>
 
                                 #include <time.h>

-                            
-int main() {
+
+int
+main ()
+{

 
                                 int tz;
                                 tz = timezone;
 
                                 int tz;
                                 tz = timezone;

-                            
-; return 0; }
-EOF
-if { (eval echo configure:20270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                                 wx_cv_var_timezone=timezone
                                 wx_cv_var_timezone=timezone

-                            
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                                cat > conftest.$ac_ext <<EOF
-#line 20281 "configure"
-#include "confdefs.h"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+                                cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                                         #include <time.h>
 
                                         #include <time.h>

-                                    
-int main() {
+
+int
+main ()
+{

 
                                         int tz;
                                         tz = _timezone;
 
                                         int tz;
                                         tz = _timezone;

-                                    
-; return 0; }
-EOF
-if { (eval echo configure:20293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                                         wx_cv_var_timezone=_timezone
                                         wx_cv_var_timezone=_timezone

-                                    
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                                        cat > conftest.$ac_ext <<EOF
-#line 20304 "configure"
-#include "confdefs.h"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+                                        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                                                 #include <time.h>
 
                                                 #include <time.h>

-                                            
-int main() {
+
+int
+main ()
+{

 
                                                 int tz;
                                                 tz = __timezone;
 
                                                 int tz;
                                                 tz = __timezone;

-                                            
-; return 0; }
-EOF
-if { (eval echo configure:20316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                                                 wx_cv_var_timezone=__timezone
                                                 wx_cv_var_timezone=__timezone

-                                            
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  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 "configure: warning: no timezone variable" 1>&2
+                                                    { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5
+echo "$as_me: WARNING: no timezone variable" >&2;}

                                                 fi
                                                 fi

-                                            
-                                        
-fi
-rm -f conftest*
-                                    
-                                
+
+

 fi
 fi

-rm -f conftest*
-                            
-                        
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+

 fi
 fi

-rm -f conftest*
-                   
-    
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext
+

 
 

-echo "$ac_t""$wx_cv_var_timezone" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5
+echo "${ECHO_T}$wx_cv_var_timezone" >&6

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

-        cat >> confdefs.h <<EOF
+        cat >>confdefs.h <<_ACEOF

 #define WX_TIMEZONE $wx_cv_var_timezone
 #define WX_TIMEZONE $wx_cv_var_timezone

-EOF
+_ACEOF

 
     fi
 
 
     fi
 

-        for ac_func in localtime
+
+for ac_func in localtime

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20357: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20362 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:20385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

 
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
     if test "$ac_cv_func_localtime" = "yes"; then
 fi
 done
 
 
     if test "$ac_cv_func_localtime" = "yes"; then

-        echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:20412: checking for tm_gmtoff in struct tm" >&5
-if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
+if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-            cat > conftest.$ac_ext <<EOF
-#line 20418 "configure"
-#include "confdefs.h"
+
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                     #include <time.h>
 
                     #include <time.h>

-                
-int main() {
+
+int
+main ()
+{

 
                     struct tm tm;
                     tm.tm_gmtoff++;
 
                     struct tm tm;
                     tm.tm_gmtoff++;

-                
-; return 0; }
-EOF
-if { (eval echo configure:20430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+

                     wx_cv_struct_tm_has_gmtoff=yes
                     wx_cv_struct_tm_has_gmtoff=yes

-                
+

 else
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_struct_tm_has_gmtoff=no
-            
-fi
-rm -f conftest*
-        
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_struct_tm_has_gmtoff=no
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
+echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6

     fi
 
     if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
     fi
 
     if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define WX_GMTOFF_IN_TM 1
 #define WX_GMTOFF_IN_TM 1

-EOF
+_ACEOF

 
     fi
 
 
     fi
 

-            for ac_func in gettimeofday ftime
+
+
+for ac_func in gettimeofday ftime

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20459: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20464 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:20487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  break
  break

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
 fi
 done
 
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then

-        echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:20514: checking whether gettimeofday takes two arguments" >&5
-if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-                        
-            ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+        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
+
+
+
+            ac_ext=cc

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+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 <<EOF
-#line 20529 "configure"
-#include "confdefs.h"
+            cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                     #include <sys/time.h>
                     #include <unistd.h>
 
                     #include <sys/time.h>
                     #include <unistd.h>

-                
-int main() {
+
+int
+main ()
+{

 
                     struct timeval tv;
                     gettimeofday(&tv, NULL);
 
                     struct timeval tv;
                     gettimeofday(&tv, NULL);

-                
-; return 0; }
-EOF
-if { (eval echo configure:20542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_gettimeofday_has_2_args=yes
 else
   wx_cv_func_gettimeofday_has_2_args=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 20550 "configure"
-#include "confdefs.h"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
                         #include <sys/time.h>
                         #include <unistd.h>
 
                         #include <sys/time.h>
                         #include <unistd.h>

-                    
-int main() {
+
+int
+main ()
+{

 
                         struct timeval tv;
                         gettimeofday(&tv);
 
                         struct timeval tv;
                         gettimeofday(&tv);

-                    
-; return 0; }
-EOF
-if { (eval echo configure:20563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_func_gettimeofday_has_2_args=no
 else
   wx_cv_func_gettimeofday_has_2_args=no
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                        echo "configure: warning: failed to determine number of gettimeofday() arguments" 1>&2
+  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
                         wx_cv_func_gettimeofday_has_2_args=unknown

-                    
-                
+
+

 fi
 fi

-rm -f conftest*
-            
+rm -f conftest.$ac_objext conftest.$ac_ext
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

             ac_ext=c
             ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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 "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6
+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
 
         if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then

-            cat >> confdefs.h <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define WX_GETTIMEOFDAY_NO_TZ 1
 #define WX_GETTIMEOFDAY_NO_TZ 1

-EOF
+_ACEOF

 
         fi
     fi
 
         fi
     fi


@@ -20602,107 +31172,162 @@ fi
 
 if test "$wxUSE_SOCKETS" = "yes"; then
     if test "$wxUSE_MGL" = "1"; then
 
 if test "$wxUSE_SOCKETS" = "yes"; then
     if test "$wxUSE_MGL" = "1"; then

-        echo "configure: warning: wxSocket not yet supported under MGL... disabled" 1>&2
+        { 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
+    if test "$wxUSE_COCOA" = "1"; then
+        { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under Cocoa... disabled" >&5
+echo "$as_me: WARNING: wxSocket not yet supported under Cocoa... disabled" >&2;}

         wxUSE_SOCKETS="no"
     fi
 fi
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         if test "$TOOLKIT" != "MSW"; then
         wxUSE_SOCKETS="no"
     fi
 fi
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         if test "$TOOLKIT" != "MSW"; then

-                echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:20614: checking for socket" >&5
-if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20619 "configure"
-#include "confdefs.h"
+                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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char socket(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char socket();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char socket ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_socket) || defined (__stub___socket)
 choke me
 #else
 /* 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
 #else

-socket();
+char (*f) () = socket;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:20642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_socket=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_socket=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+int
+main ()
+{
+return f != socket;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_socket=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_socket=no
+fi
+rm -f conftest.$ac_objext 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 "$ac_t""no" 1>&6
-echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:20660: checking for socket in -lsocket" >&5
-ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_socket+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lsocket  $LIBS"
 LIBS="-lsocket  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 20668 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char socket();
-
-int main() {
-socket()
-; return 0; }
-EOF
-if { (eval echo configure:20679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+   builtin and then its argument prototype would still apply.  */
+char socket ();
+int
+main ()
+{
+socket ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_socket=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_socket=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
+if test $ac_cv_lib_socket_socket = 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 "$ac_t""no" 1>&6

 
 

-                    echo "configure: warning: socket library not found - sockets will be disabled" 1>&2
+                    { 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;}

                     wxUSE_SOCKETS=no
                     wxUSE_SOCKETS=no

-                
-            
+
+

 fi
 
 fi
 

-        
+

 fi
 
     fi
 fi
 
     fi


@@ -20710,188 +31335,400 @@ fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then

-                echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:20715: checking what is the type of the third argument of getsockname" >&5
-if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+                echo "$as_me:$LINENO: checking what is the type of the third argument of getsockname" >&5
+echo $ECHO_N "checking what is the type of the third argument of getsockname... $ECHO_C" >&6
+if test "${wx_cv_type_getsockname3+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-                cat > conftest.$ac_ext <<EOF
-#line 20721 "configure"
-#include "confdefs.h"
+
+                cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

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

-                    
-int main() {
+
+int
+main ()
+{

 
                         socklen_t len;
                         getsockname(0, 0, &len);
 
                         socklen_t len;
                         getsockname(0, 0, &len);

-                    
-; return 0; }
-EOF
-if { (eval echo configure:20734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockname3=socklen_t
 else
   wx_cv_type_getsockname3=socklen_t
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+

                                                                                                                                                                         CFLAGS_OLD="$CFLAGS"
                         if test "$GCC" = yes ; then
                             CFLAGS="$CFLAGS -Werror"
                         fi
 
                                                                                                                                                                         CFLAGS_OLD="$CFLAGS"
                         if test "$GCC" = yes ; then
                             CFLAGS="$CFLAGS -Werror"
                         fi
 

-                        cat > conftest.$ac_ext <<EOF
-#line 20748 "configure"
-#include "confdefs.h"
+                        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

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

-                            
-int main() {
+
+int
+main ()
+{

 
                                 size_t len;
                                 getsockname(0, 0, &len);
 
                                 size_t len;
                                 getsockname(0, 0, &len);

-                            
-; return 0; }
-EOF
-if { (eval echo configure:20761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockname3=size_t
 else
   wx_cv_type_getsockname3=size_t
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 20769 "configure"
-#include "confdefs.h"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

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

-                                
-int main() {
+
+int
+main ()
+{

 
                                     int len;
                                     getsockname(0, 0, &len);
 
                                     int len;
                                     getsockname(0, 0, &len);

-                                
-; return 0; }
-EOF
-if { (eval echo configure:20782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   wx_cv_type_getsockname3=int
 else
   wx_cv_type_getsockname3=int
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_type_getsockname3=unknown
-                            
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_type_getsockname3=unknown
+

 fi
 fi

-rm -f conftest*
-                        
+rm -f conftest.$ac_objext conftest.$ac_ext
+

 fi
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

 
                         CFLAGS="$CFLAGS_OLD"
 
                         CFLAGS="$CFLAGS_OLD"

-                    
-                
-fi
-rm -f conftest*
-            
+
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$wx_cv_type_getsockname3" 1>&6
+fi
+echo "$as_me:$LINENO: result: $wx_cv_type_getsockname3" >&5
+echo "${ECHO_T}$wx_cv_type_getsockname3" >&6

 
         if test "$wx_cv_type_getsockname3" = "unknown"; then
             wxUSE_SOCKETS=no
 
         if test "$wx_cv_type_getsockname3" = "unknown"; then
             wxUSE_SOCKETS=no

-            echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2
+            { 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;}

         else
         else

-            cat >> confdefs.h <<EOF
+            cat >>confdefs.h <<_ACEOF

 #define SOCKLEN_T $wx_cv_type_getsockname3
 #define SOCKLEN_T $wx_cv_type_getsockname3

-EOF
+_ACEOF

 
         fi
     fi
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
 
         fi
     fi
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SOCKETS 1
 #define wxUSE_SOCKETS 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
 fi
 
 
     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;}
+        wxUSE_PROTOCOL=no
+    fi
+fi
+
+if test "$wxUSE_PROTOCOL" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL 1
+_ACEOF
+
+
+    if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_HTTP 1
+_ACEOF
+
+    fi
+    if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_FTP 1
+_ACEOF
+
+    fi
+    if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_FILE 1
+_ACEOF
+
+    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;}
+        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;}
+        wxUSE_URL=no
+    fi
+    if test "$wxUSE_URL" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_URL 1
+_ACEOF
+
+    fi
+fi
+
+if test "$wxUSE_FS_INET" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FS_INET 1
+_ACEOF
+
+fi
+

 
 if test "$wxUSE_GUI" = "yes"; then
 
     if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
 
 if test "$wxUSE_GUI" = "yes"; then
 
     if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then

-        echo "configure: warning: Joystick not yet supported under Mac OS X... disabled" 1>&2
-        wxUSE_JOYSTICK=no
-     fi
-    if test "$TOOLKIT" = "MOTIF"; then
-        echo "configure: warning: Joystick not yet supported under Motif... disabled" 1>&2
-        wxUSE_JOYSTICK=no
-     fi
-    if test "$TOOLKIT" = "X11"; then
-        echo "configure: warning: Joystick not yet supported under X11... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5
+echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;}

         wxUSE_JOYSTICK=no
      fi
 
         wxUSE_JOYSTICK=no
      fi
 

-        if test "$TOOLKIT" != "MSW"; then
+         if test "$TOOLKIT" != "MSW"; then

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

-                        for ac_hdr in linux/joystick.h
+
+for ac_header in linux/joystick.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:20849: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20854 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:20859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

+

 done
 
             if test "$ac_cv_header_linux_joystick_h" != "yes"; then
                 wxUSE_JOYSTICK=no
 done
 
             if test "$ac_cv_header_linux_joystick_h" != "yes"; then
                 wxUSE_JOYSTICK=no

-                echo "configure: warning: Joystick not supported by this system... disabled" 1>&2
+                { 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;}

             fi
         fi
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then
             fi
         fi
     fi
 
     if test "$wxUSE_JOYSTICK" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_JOYSTICK 1
 #define wxUSE_JOYSTICK 1

-EOF
+_ACEOF

 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
     fi
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
     fi


@@ -20906,320 +31743,467 @@ if test "$TOOLKIT" != "MSW"; then
         if test "$USE_DARWIN" = 1; then
                         HAVE_DL_FUNCS=1
         else
         if test "$USE_DARWIN" = 1; then
                         HAVE_DL_FUNCS=1
         else

-                                                for ac_func in dlopen
+
+for ac_func in dlopen

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:20913: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 20918 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:20941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-                cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+                cat >>confdefs.h <<\_ACEOF

 #define HAVE_DLOPEN 1
 #define HAVE_DLOPEN 1

-EOF
+_ACEOF

 
                 HAVE_DL_FUNCS=1
 
                 HAVE_DL_FUNCS=1

-            
+

 else
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:20969: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+                echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-ldl  $LIBS"
 LIBS="-ldl  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 20977 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:20988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                                cat >> confdefs.h <<\EOF
+   builtin and then its argument prototype would still apply.  */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlopen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+
+                                cat >>confdefs.h <<\_ACEOF

 #define HAVE_DLOPEN 1
 #define HAVE_DLOPEN 1

-EOF
+_ACEOF

 
                                 HAVE_DL_FUNCS=1
                                 DL_LINK=" -ldl$DL_LINK"
 
                                 HAVE_DL_FUNCS=1
                                 DL_LINK=" -ldl$DL_LINK"

-                            
+

 else
 else

-  echo "$ac_t""no" 1>&6

 
 

-                                for ac_func in shl_load
+
+for ac_func in shl_load

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:21017: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21022 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:21045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-                                                cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+                                                cat >>confdefs.h <<\_ACEOF

 #define HAVE_SHL_LOAD 1
 #define HAVE_SHL_LOAD 1

-EOF
+_ACEOF

 
                                                 HAVE_SHL_FUNCS=1
 
                                                 HAVE_SHL_FUNCS=1

-                                              
+

 else
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:21073: checking for dld in -lshl_load" >&5
-ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+                                                echo "$as_me:$LINENO: checking for dld in -lshl_load" >&5
+echo $ECHO_N "checking for dld in -lshl_load... $ECHO_C" >&6
+if test "${ac_cv_lib_shl_load_dld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lshl_load  $LIBS"
 LIBS="-lshl_load  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 21081 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char dld();
-
-int main() {
-dld()
-; return 0; }
-EOF
-if { (eval echo configure:21092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+   builtin and then its argument prototype would still apply.  */
+char dld ();
+int
+main ()
+{
+dld ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_shl_load_dld=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_shl_load_dld=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_shl_load_dld" >&5
+echo "${ECHO_T}$ac_cv_lib_shl_load_dld" >&6
+if test $ac_cv_lib_shl_load_dld = yes; then

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  

                                                                 HAVE_SHL_FUNCS=1
                                                                 DL_LINK=" -ldld$DL_LINK"
                                                                 HAVE_SHL_FUNCS=1
                                                                 DL_LINK=" -ldld$DL_LINK"

-                                                             
-else
-  echo "$ac_t""no" 1>&6
+

 fi
 
 fi
 

-                                              
+

 fi
 done
 
 fi
 done
 

-                            
+

 fi
 
 fi
 

-            
+

 fi
 done
 
 
                 if test "$HAVE_DL_FUNCS" = 1; then
 fi
 done
 
 
                 if test "$HAVE_DL_FUNCS" = 1; then

-            for ac_func in dlerror
+
+for ac_func in dlerror

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:21131: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21136 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:21159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ cat >>confdefs.h <<\_ACEOF

 #define HAVE_DLERROR 1
 #define HAVE_DLERROR 1

-EOF
+_ACEOF

 
 else
 
 else

-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:21184: checking for dlerror in -ldl" >&5
-ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
+echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlerror+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-ldl  $LIBS"
 LIBS="-ldl  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 21192 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char dlerror();
-
-int main() {
-dlerror()
-; return 0; }
-EOF
-if { (eval echo configure:21203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+   builtin and then its argument prototype would still apply.  */
+char dlerror ();
+int
+main ()
+{
+dlerror ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dl_dlerror=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlerror=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlerror" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlerror" >&6
+if test $ac_cv_lib_dl_dlerror = yes; then
+  cat >>confdefs.h <<\_ACEOF

 #define HAVE_DLERROR 1
 #define HAVE_DLERROR 1

-EOF
+_ACEOF

 
 

-else
-  echo "$ac_t""no" 1>&6

 fi
 
 fi
 fi
 
 fi


@@ -21231,11 +32215,13 @@ done
         if test "$HAVE_DL_FUNCS" = 0; then
             if test "$HAVE_SHL_FUNCS" = 0; then
               if test "$USE_UNIX" = 1; then
         if test "$HAVE_DL_FUNCS" = 0; then
             if test "$HAVE_SHL_FUNCS" = 0; then
               if test "$USE_UNIX" = 1; then

-                  echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2
+                  { 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;}

                   wxUSE_DYNAMIC_LOADER=no
                   wxUSE_DYNLIB_CLASS=no
               else
                   wxUSE_DYNAMIC_LOADER=no
                   wxUSE_DYNLIB_CLASS=no
               else

-                  echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
+                  { 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;}

               fi
             fi
         fi
               fi
             fi
         fi


@@ -21243,29 +32229,30 @@ done
 fi
 
 if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
 fi
 
 if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DYNAMIC_LOADER 1
 #define wxUSE_DYNAMIC_LOADER 1

-EOF
+_ACEOF

 
 

-elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-    cat >> confdefs.h <<\EOF
+fi
+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DYNLIB_CLASS 1
 #define wxUSE_DYNLIB_CLASS 1

-EOF
+_ACEOF

 
 fi
 
 
 if test "$wxUSE_FONTMAP" = "yes" ; then
 
 fi
 
 
 if test "$wxUSE_FONTMAP" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FONTMAP 1
 #define wxUSE_FONTMAP 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_UNICODE" = "yes" ; then
 
 fi
 
 if test "$wxUSE_UNICODE" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_UNICODE 1
 #define wxUSE_UNICODE 1

-EOF
+_ACEOF

 
 
   if test "$wxUSE_MSW" != 1; then
 
 
   if test "$wxUSE_MSW" != 1; then


@@ -21273,105 +32260,120 @@ EOF
   fi
 
   if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
   fi
 
   if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then

-        echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6
-echo "configure:21278: checking for main in -lunicows" >&5
-ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+        echo "$as_me:$LINENO: checking for main in -lunicows" >&5
+echo $ECHO_N "checking for main in -lunicows... $ECHO_C" >&6
+if test "${ac_cv_lib_unicows_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS

 LIBS="-lunicows  $LIBS"
 LIBS="-lunicows  $LIBS"

-cat > conftest.$ac_ext <<EOF
-#line 21286 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 
 

-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:21293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"

 
 

-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                cat >> confdefs.h <<\EOF
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_unicows_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_unicows_main=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_unicows_main" >&5
+echo "${ECHO_T}$ac_cv_lib_unicows_main" >&6
+if test $ac_cv_lib_unicows_main = yes; then
+
+                cat >>confdefs.h <<\_ACEOF

 #define wxUSE_UNICODE_MSLU 1
 #define wxUSE_UNICODE_MSLU 1

-EOF
+_ACEOF
+

 
 

-            

 else
 else

-  echo "$ac_t""no" 1>&6

 
 

-                echo "configure: warning: Compiler doesn't support MSLU (libunicows.a), disabled.
-                             Applications will only run on Windows NT/2000/XP!" 1>&2
+                { echo "$as_me:$LINENO: WARNING: Compiler doesn't support MSLU (libunicows.a), disabled.
+                             Applications will only run on Windows NT/2000/XP!" >&5
+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
                 wxUSE_UNICODE_MSLU=no

-            
+

 fi
 
     fi
 fi
 
 if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
 fi
 
     fi
 fi
 
 if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_EXPERIMENTAL_PRINTF 1
 #define wxUSE_EXPERIMENTAL_PRINTF 1

-EOF
+_ACEOF

 
 fi
 
 
 if test "$wxUSE_POSTSCRIPT" = "yes" ; then
 
 fi
 
 
 if test "$wxUSE_POSTSCRIPT" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_POSTSCRIPT 1
 #define wxUSE_POSTSCRIPT 1

-EOF
+_ACEOF

 
 fi
 
 
 fi
 

-cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\_ACEOF

 #define wxUSE_AFM_FOR_POSTSCRIPT 1
 #define wxUSE_AFM_FOR_POSTSCRIPT 1

-EOF
+_ACEOF

 
 
 
 

-cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\_ACEOF

 #define wxUSE_NORMALIZED_PS_FONTS 1
 #define wxUSE_NORMALIZED_PS_FONTS 1

-EOF
+_ACEOF

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

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CONSTRAINTS 1
 #define wxUSE_CONSTRAINTS 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then

-
-
-   if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-       cat >> confdefs.h <<\EOF
+   cat >>confdefs.h <<\_ACEOF

 #define wxUSE_MDI_ARCHITECTURE 1
 #define wxUSE_MDI_ARCHITECTURE 1

-EOF
+_ACEOF

 
 

-       SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
-   fi
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"

 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
     if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
     if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then


@@ -21380,29 +32382,30 @@ EOF
 fi
 
 if test "$wxUSE_HELP" = "yes"; then
 fi
 
 if test "$wxUSE_HELP" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_HELP 1
 #define wxUSE_HELP 1

-EOF
+_ACEOF

 
     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 <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_MS_HTML_HELP 1
 #define wxUSE_MS_HTML_HELP 1

-EOF
+_ACEOF

 
       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 <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_WXHTML_HELP 1
 #define wxUSE_WXHTML_HELP 1

-EOF
+_ACEOF

 
       else
 
       else

-        echo "configure: warning: Cannot use wxHTML-based help without wxHTML so it won't be compiled" 1>&2
+        { 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;}

         wxUSE_WXHTML_HELP=no
       fi
     fi
         wxUSE_WXHTML_HELP=no
       fi
     fi


@@ -21410,18 +32413,21 @@ fi
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then

-        echo "configure: warning: Printing support cannot be used without constraints so it won't be compiled without it" 1>&2
+        { 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
     else

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_PRINTING_ARCHITECTURE 1
 #define wxUSE_PRINTING_ARCHITECTURE 1

-EOF
+_ACEOF

 
     fi
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
 if test "$wxUSE_PROLOGIO" = "yes" -o  "$wxUSE_RESOURCES" = "yes"; then
 
     fi
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
 if test "$wxUSE_PROLOGIO" = "yes" -o  "$wxUSE_RESOURCES" = "yes"; then

-    { echo "configure: error: wxExpr and old-style resources are now available in contrib only" 1>&2; exit 1; }
+    { { echo "$as_me:$LINENO: error: wxExpr and old-style resources are now available in contrib only" >&5
+echo "$as_me: error: wxExpr and old-style resources are now available in contrib only" >&2;}
+   { (exit 1); exit 1; }; }

 fi
 
 
 fi
 
 


@@ -21429,102 +32435,224 @@ if test "$wxUSE_MSW" = 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

-    for ac_hdr in ole2.h
+
+for ac_header in ole2.h

 do
 do

-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:21437: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 21442 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:21447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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
+#line $LINENO "configure"
+/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f 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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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 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 preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  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: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.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 eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=$ac_header_preproc"

 fi
 fi

-rm -f conftest*
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 fi

+

 done
 
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then
 done
 
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then

-            
-            ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross

 
 
 
 

-            echo $ac_n "checking if g++ requires -fvtable-thunks""... $ac_c" 1>&6
-echo "configure:21486: checking if g++ requires -fvtable-thunks" >&5
-            cat > conftest.$ac_ext <<EOF
-#line 21488 "configure"
-#include "confdefs.h"
+            ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+            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
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 #include <windows.h>
                             #include <ole2.h>
 #include <windows.h>
                             #include <ole2.h>

-int main() {
+int
+main ()
+{

 
 

-; return 0; }
-EOF
-if { (eval echo configure:21496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6

                             CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
 fi
                             CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
 fi

-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext

             ac_ext=c
             ac_ext=c

-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CPP $CPPFLAGS'
 ac_cpp='$CPP $CPPFLAGS'

-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+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

 
             ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
             LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
 
             ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
             LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"

-            cat >> confdefs.h <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define wxUSE_OLE 1
 #define wxUSE_OLE 1

-EOF
+_ACEOF

 
 
         fi
 
 
 
         fi
 

-                cat >> confdefs.h <<\EOF
+                cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DATAOBJ 1
 #define wxUSE_DATAOBJ 1

-EOF
+_ACEOF

 
     else
 
     else

-        echo "configure: warning: Some features disabled because OLE headers not found" 1>&2
+        { 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;}

 
         wxUSE_CLIPBOARD=no
         wxUSE_DRAG_AND_DROP=no
 
         wxUSE_CLIPBOARD=no
         wxUSE_DRAG_AND_DROP=no


@@ -21533,44 +32661,46 @@ EOF
     fi
 
     if test "$wxUSE_METAFILE" = "yes"; then
     fi
 
     if test "$wxUSE_METAFILE" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_METAFILE 1
 #define wxUSE_METAFILE 1

-EOF
+_ACEOF

 
 
 
 

-                cat >> confdefs.h <<\EOF
+                cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ENH_METAFILE 1
 #define wxUSE_ENH_METAFILE 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then
 
     fi
 fi
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then

-        echo "configure: warning: wxWindows IPC classes require sockets... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: wxWindows IPC classes require sockets... disabled" >&5
+echo "$as_me: WARNING: wxWindows IPC classes require sockets... disabled" >&2;}

     fi
 
     fi
 

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_IPC 1
 #define wxUSE_IPC 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     if test "$wxUSE_MGL" = 1; then
 
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     if test "$wxUSE_MGL" = 1; then

-        echo "configure: warning: Clipboard not yet supported under MGL... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under MGL... disabled" >&5
+echo "$as_me: WARNING: Clipboard not yet supported under MGL... 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 <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CLIPBOARD 1
 #define wxUSE_CLIPBOARD 1

-EOF
+_ACEOF

 
 
 
 

-                cat >> confdefs.h <<\EOF
+                cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DATAOBJ 1
 #define wxUSE_DATAOBJ 1

-EOF
+_ACEOF

 
     fi
 fi
 
     fi
 fi


@@ -21578,30 +32708,34 @@ fi
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
     if test "$wxUSE_GTK" = 1; then
         if test "$WXGTK12" != 1; then
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
     if test "$wxUSE_GTK" = 1; then
         if test "$WXGTK12" != 1; then

-            echo "configure: warning: Drag and drop is only supported under GTK+ 1.2... disabled" 1>&2
+            { 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; then
             wxUSE_DRAG_AND_DROP=no
         fi
     fi
 
     if test "$wxUSE_MOTIF" = 1; then

-        echo "configure: warning: Drag and drop not yet supported under Motif... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under Motif... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under Motif... disabled" >&2;}

         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_X11" = 1; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_X11" = 1; then

-        echo "configure: warning: Drag and drop not yet supported under X11... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under X11... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under X11... disabled" >&2;}

         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_MGL" = 1; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_MGL" = 1; then

-        echo "configure: warning: Drag and drop not yet supported under MGL... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under MGL... disabled" >&5
+echo "$as_me: WARNING: Drag and drop not yet supported under MGL... 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 <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DRAG_AND_DROP 1
 #define wxUSE_DRAG_AND_DROP 1

-EOF
+_ACEOF

 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
     fi
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
     fi


@@ -21609,9 +32743,9 @@ EOF
 fi
 
 if test "$wxUSE_SPLINES" = "yes" ; then
 fi
 
 if test "$wxUSE_SPLINES" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SPLINES 1
 #define wxUSE_SPLINES 1

-EOF
+_ACEOF

 
 fi
 
 
 fi
 


@@ -21622,137 +32756,138 @@ if test "$wxUSE_CONTROLS" = "yes"; then
 fi
 
 if test "$wxUSE_ACCEL" = "yes"; then
 fi
 
 if test "$wxUSE_ACCEL" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ACCEL 1
 #define wxUSE_ACCEL 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BUTTON" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BUTTON" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_BUTTON 1
 #define wxUSE_BUTTON 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BMPBUTTON" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_BMPBUTTON" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_BMPBUTTON 1
 #define wxUSE_BMPBUTTON 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CALCTRL" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CALCTRL" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CALENDARCTRL 1
 #define wxUSE_CALENDARCTRL 1

-EOF
+_ACEOF

 
   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 <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CARET 1
 #define wxUSE_CARET 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
 if test "$wxUSE_COMBOBOX" = "yes"; then
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
 if test "$wxUSE_COMBOBOX" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_COMBOBOX 1
 #define wxUSE_COMBOBOX 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHOICE" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHOICE" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CHOICE 1
 #define wxUSE_CHOICE 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKBOX" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKBOX" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CHECKBOX 1
 #define wxUSE_CHECKBOX 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHECKLISTBOX 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
 if test "$wxUSE_DISPLAY" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DISPLAY 1
 #define wxUSE_DISPLAY 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
 fi
 
 if test "$wxUSE_GAUGE" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
 fi
 
 if test "$wxUSE_GAUGE" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_GAUGE 1
 #define wxUSE_GAUGE 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_GRID" = "yes"; then
 
   USES_CONTROLS=1
 fi
 
 if test "$wxUSE_GRID" = "yes"; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_GRID 1
 #define wxUSE_GRID 1

-EOF
+_ACEOF

 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
 if test "$wxUSE_IMAGLIST" = "yes"; then
 
   USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
 if test "$wxUSE_IMAGLIST" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_IMAGLIST 1
 #define wxUSE_IMAGLIST 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_LISTBOX" = "yes"; then
 
 fi
 
 if test "$wxUSE_LISTBOX" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LISTBOX 1
 #define wxUSE_LISTBOX 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_LISTCTRL 1
 #define wxUSE_LISTCTRL 1

-EOF
+_ACEOF

 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
     else
 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
     else

-        echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
+        { 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;}

     fi
 fi
 
 if test "$wxUSE_NOTEBOOK" = "yes"; then
     fi
 fi
 
 if test "$wxUSE_NOTEBOOK" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_NOTEBOOK 1
 #define wxUSE_NOTEBOOK 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"


@@ -21760,106 +32895,106 @@ fi
 
 
 if test "$wxUSE_RADIOBOX" = "yes"; then
 
 
 if test "$wxUSE_RADIOBOX" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_RADIOBOX 1
 #define wxUSE_RADIOBOX 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_RADIOBTN 1
 #define wxUSE_RADIOBTN 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SASH" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SASH" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SASH 1
 #define wxUSE_SASH 1

-EOF
+_ACEOF

 
     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 <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SCROLLBAR 1
 #define wxUSE_SCROLLBAR 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
 if test "$wxUSE_SLIDER" = "yes"; then
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
 if test "$wxUSE_SLIDER" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SLIDER 1
 #define wxUSE_SLIDER 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SPINBTN 1
 #define wxUSE_SPINBTN 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINCTRL" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINCTRL" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SPINCTRL 1
 #define wxUSE_SPINCTRL 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SPLITTER 1
 #define wxUSE_SPLITTER 1

-EOF
+_ACEOF

 
     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 <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STATBMP 1
 #define wxUSE_STATBMP 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STATBOX 1
 #define wxUSE_STATBOX 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATTEXT" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATTEXT" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STATTEXT 1
 #define wxUSE_STATTEXT 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STATLINE 1
 #define wxUSE_STATLINE 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATUSBAR" = "yes"; then
 
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATUSBAR" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STATUSBAR 1
 #define wxUSE_STATUSBAR 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 
 
     USES_CONTROLS=1
 


@@ -21867,17 +33002,17 @@ EOF
 fi
 
 if test "$wxUSE_TABDIALOG" = "yes"; then
 fi
 
 if test "$wxUSE_TABDIALOG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TAB_DIALOG 1
 #define wxUSE_TAB_DIALOG 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
 if test "$wxUSE_TEXTCTRL" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
 if test "$wxUSE_TEXTCTRL" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TEXTCTRL 1
 #define wxUSE_TEXTCTRL 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"


@@ -21885,36 +33020,38 @@ fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then

-        echo "configure: warning: Toggle button not yet supported under Mac OS X... disabled" 1>&2
+        { 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;}

         wxUSE_TOGGLEBTN=no
     fi
     if test "$wxUSE_UNIVERSAL" = "yes"; then
         wxUSE_TOGGLEBTN=no
     fi
     if test "$wxUSE_UNIVERSAL" = "yes"; then

-        echo "configure: warning: Toggle button not yet supported under wxUniversal... disabled" 1>&2
+        { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&5
+echo "$as_me: WARNING: Toggle button not yet supported under wxUniversal... 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 <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TOGGLEBTN 1
 #define wxUSE_TOGGLEBTN 1

-EOF
+_ACEOF

 
         USES_CONTROLS=1
     fi
 fi
 
 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
 
         USES_CONTROLS=1
     fi
 fi
 
 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TOOLBAR_SIMPLE 1
 #define wxUSE_TOOLBAR_SIMPLE 1

-EOF
+_ACEOF

 
     wxUSE_TOOLBAR="yes"
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then
 
     wxUSE_TOOLBAR="yes"
     USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR 1

-EOF
+_ACEOF

 
     USES_CONTROLS=1
 
 
     USES_CONTROLS=1
 


@@ -21923,9 +33060,9 @@ EOF
     fi
 
     if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
     fi
 
     if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TOOLBAR_NATIVE 1
 #define wxUSE_TOOLBAR_NATIVE 1

-EOF
+_ACEOF

 
         USES_CONTROLS=1
     fi
 
         USES_CONTROLS=1
     fi


@@ -21935,14 +33072,16 @@ 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 "configure: warning: wxTooltip not supported yet under Motif... disabled" 1>&2
+        { 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;}

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

-            echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2
+            { 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;}

         else
         else

-            cat >> confdefs.h <<\EOF
+            cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TOOLTIPS 1
 #define wxUSE_TOOLTIPS 1

-EOF
+_ACEOF

 
         fi
     fi
 
         fi
     fi


@@ -21950,30 +33089,34 @@ fi
 
 if test "$wxUSE_TREECTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then
 
 if test "$wxUSE_TREECTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TREECTRL 1
 #define wxUSE_TREECTRL 1

-EOF
+_ACEOF

 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else
 
         USES_CONTROLS=1
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else

-        echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
+        { 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;}

     fi
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
     fi
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then

-        echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
+        { 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;}

     else
         if test "$wxUSE_MOTIF" = 1; then
     else
         if test "$wxUSE_MOTIF" = 1; then

-            echo "configure: warning: wxPopupWindow not yet supported under Motif... disabled" 1>&2
+            { echo "$as_me:$LINENO: WARNING: wxPopupWindow not yet supported under Motif... disabled" >&5
+echo "$as_me: WARNING: wxPopupWindow not yet supported under Motif... disabled" >&2;}

         else
             if test "$wxUSE_PM" = 1; then
         else
             if test "$wxUSE_PM" = 1; then

-                echo "configure: warning: wxPopupWindow not yet supported under PM... disabled" 1>&2
+                { 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;}

             else
             else

-                cat >> confdefs.h <<\EOF
+                cat >>confdefs.h <<\_ACEOF

 #define wxUSE_POPUPWIN 1
 #define wxUSE_POPUPWIN 1

-EOF
+_ACEOF

 
 
                 USES_CONTROLS=1
 
 
                 USES_CONTROLS=1


@@ -21984,196 +33127,154 @@ 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 "configure: warning: wxTipWindow not yet supported under PM... disabled" 1>&2
+        { 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;}

     else
     else

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TIPWINDOW 1
 #define wxUSE_TIPWINDOW 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "$USES_CONTROLS" = 1; then
 
     fi
 fi
 
 if test "$USES_CONTROLS" = 1; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CONTROLS 1
 #define wxUSE_CONTROLS 1

-EOF
+_ACEOF

 
 fi
 
 
 
 if test "$wxUSE_DRAGIMAGE" = "yes"; then
 
 fi
 
 
 
 if test "$wxUSE_DRAGIMAGE" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DRAGIMAGE 1
 #define wxUSE_DRAGIMAGE 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 
 if test "$wxUSE_ACCESSIBILITY" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 
 if test "$wxUSE_ACCESSIBILITY" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ACCESSIBILITY 1
 #define wxUSE_ACCESSIBILITY 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
 fi
 
 if test "$wxUSE_MENUS" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
 fi
 
 if test "$wxUSE_MENUS" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_MENUS 1
 #define wxUSE_MENUS 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
 fi
 
 if test "$wxUSE_METAFILE" = "yes"; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
 fi
 
 if test "$wxUSE_METAFILE" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_METAFILE 1
 #define wxUSE_METAFILE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_MIMETYPE" = "yes"; then
 
 fi
 
 if test "$wxUSE_MIMETYPE" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_MIMETYPE 1
 #define wxUSE_MIMETYPE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
 
 fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SYSTEM_OPTIONS 1
 #define wxUSE_SYSTEM_OPTIONS 1

-EOF
+_ACEOF

 
 

-if test "$TOOLKIT" = "MSW"; then
+if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
+        "$TOOLKIT" = "MOTIF"; then

     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
 fi
 
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
 fi
 
 fi
 

-if test "$wxUSE_PROTOCOL" = "yes"; then
-    if test "$wxUSE_SOCKETS" != "yes"; then
-        echo "configure: warning: Protocol classes require sockets... disabled" 1>&2
-        wxUSE_PROTOCOL=no
-    fi
-
-    if test "$wxUSE_PROTOCOL" = "yes"; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_PROTOCOL 1
-EOF
-
-
-        if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
-            cat >> confdefs.h <<\EOF
-#define wxUSE_PROTOCOL_HTTP 1
-EOF
-
-        fi
-        if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
-            cat >> confdefs.h <<\EOF
-#define wxUSE_PROTOCOL_FTP 1
-EOF
-
-        fi
-        if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
-            cat >> confdefs.h <<\EOF
-#define wxUSE_PROTOCOL_FILE 1
-EOF
-
-        fi
-    fi
-fi
-
-if test "$wxUSE_URL" = "yes"; then
-    if test "$wxUSE_PROTOCOL" != "yes"; then
-        echo "configure: warning: wxURL class requires wxProtocol... disabled" 1>&2
-        wxUSE_URL=no
-    fi
-    if test "$wxUSE_URL" = "yes"; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_URL 1
-EOF
-
-    fi
-fi
-

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

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_MINIFRAME 1
 #define wxUSE_MINIFRAME 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 

+USE_HTML=0

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

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_HTML 1
 #define wxUSE_HTML 1

-EOF
+_ACEOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html 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"

 fi
 
 if test "$wxUSE_VALIDATORS" = "yes"; then
 fi
 
 if test "$wxUSE_VALIDATORS" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_VALIDATORS 1
 #define wxUSE_VALIDATORS 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
 if test "$wxUSE_PALETTE" = "yes" ; then
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
 if test "$wxUSE_PALETTE" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_PALETTE 1
 #define wxUSE_PALETTE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_IMAGE" = "yes" ; then
 
 fi
 
 if test "$wxUSE_IMAGE" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_IMAGE 1
 #define wxUSE_IMAGE 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_GIF" = "yes" ; then
 
 fi
 
 if test "$wxUSE_GIF" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_GIF 1
 #define wxUSE_GIF 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_PCX" = "yes" ; then
 
 fi
 
 if test "$wxUSE_PCX" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_PCX 1
 #define wxUSE_PCX 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_IFF" = "yes" ; then
 
 fi
 
 if test "$wxUSE_IFF" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_IFF 1
 #define wxUSE_IFF 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_PNM" = "yes" ; then
 
 fi
 
 if test "$wxUSE_PNM" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_PNM 1
 #define wxUSE_PNM 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_XPM" = "yes" ; then
 
 fi
 
 if test "$wxUSE_XPM" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_XPM 1
 #define wxUSE_XPM 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_ICO_CUR" = "yes" ; then
 
 fi
 
 if test "$wxUSE_ICO_CUR" = "yes" ; then

-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ICO_CUR 1
 #define wxUSE_ICO_CUR 1

-EOF
+_ACEOF

 
 fi
 
 
 fi
 


@@ -22183,105 +33284,108 @@ fi
 
 
 if test "$wxUSE_CHOICEDLG" = "yes"; then
 
 
 if test "$wxUSE_CHOICEDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_CHOICEDLG 1
 #define wxUSE_CHOICEDLG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_COLOURDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_COLOURDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_COLOURDLG 1
 #define wxUSE_COLOURDLG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_FILEDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_FILEDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FILEDLG 1
 #define wxUSE_FILEDLG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_FINDREPLDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_FINDREPLDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FINDREPLDLG 1
 #define wxUSE_FINDREPLDLG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_FONTDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_FONTDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_FONTDLG 1
 #define wxUSE_FONTDLG 1

-EOF
+_ACEOF

 
 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 "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
+        { 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;}

     else
     else

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_DIRDLG 1
 #define wxUSE_DIRDLG 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "$wxUSE_MSGDLG" = "yes"; then
 
     fi
 fi
 
 if test "$wxUSE_MSGDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_MSGDLG 1
 #define wxUSE_MSGDLG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_NUMBERDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_NUMBERDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_NUMBERDLG 1
 #define wxUSE_NUMBERDLG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_PROGRESSDLG" = "yes"; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then
 
 fi
 
 if test "$wxUSE_PROGRESSDLG" = "yes"; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then

-       echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
+       { 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
     else

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_PROGRESSDLG 1
 #define wxUSE_PROGRESSDLG 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "$wxUSE_SPLASH" = "yes"; then
 
     fi
 fi
 
 if test "$wxUSE_SPLASH" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_SPLASH 1
 #define wxUSE_SPLASH 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_STARTUP_TIPS" = "yes"; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then
 
 fi
 
 if test "$wxUSE_STARTUP_TIPS" = "yes"; then
     if test "$wxUSE_CONSTRAINTS" != "yes"; then

-       echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
+       { 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
     else

-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\_ACEOF

 #define wxUSE_STARTUP_TIPS 1
 #define wxUSE_STARTUP_TIPS 1

-EOF
+_ACEOF

 
     fi
 fi
 
 if test "$wxUSE_TEXTDLG" = "yes"; then
 
     fi
 fi
 
 if test "$wxUSE_TEXTDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_TEXTDLG 1
 #define wxUSE_TEXTDLG 1

-EOF
+_ACEOF

 
 fi
 
 if test "$wxUSE_WIZARDDLG" = "yes"; then
 
 fi
 
 if test "$wxUSE_WIZARDDLG" = "yes"; then

-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_WIZARDDLG 1
 #define wxUSE_WIZARDDLG 1

-EOF
+_ACEOF

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
 fi


@@ -22294,9 +33398,9 @@ else
     OSINFO="\"$OSINFO\""
 fi
 
     OSINFO="\"$OSINFO\""
 fi
 

-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<_ACEOF

 #define WXWIN_OS_DESCRIPTION $OSINFO
 #define WXWIN_OS_DESCRIPTION $OSINFO

-EOF
+_ACEOF

 
 
 
 
 
 


@@ -22306,12 +33410,32 @@ else
     wxPREFIX=$ac_default_prefix
 fi
 
     wxPREFIX=$ac_default_prefix
 fi
 

-cat >> confdefs.h <<EOF
-#define wxINSTALL_PREFIX "$wxPREFIX"
-EOF
+cat >>confdefs.h <<_ACEOF
+#define wxINSTALL_PREFIX "$wxPREFIX"
+_ACEOF
+
+
+top_builddir_wxconfig=`pwd`
+
+
+
+CORE_BASE_LIBS="net base"
+CORE_GUI_LIBS="adv core"
+
+if test "$wxUSE_XML" = "yes" ; then
+    CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+fi
+if test "$wxUSE_ODBC" != "no" ; then
+    CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
+    CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
+fi
+if test "$wxUSE_HTML" = "yes" ; then
+    CORE_GUI_LIBS="html $CORE_GUI_LIBS"
+fi
+
+

 
 
 
 

-top_builddir=`pwd`

 
 
 
 
 
 


@@ -22328,270 +33452,448 @@ LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
 
 have_cos=0
 have_floor=0
 
 have_cos=0
 have_floor=0

+

 for ac_func in cos
 do
 for ac_func in cos
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22335: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22340 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:22363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  have_cos=1
  have_cos=1

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

+

 for ac_func in floor
 do
 for ac_func in floor
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22390: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22395 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:22418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  have_floor=1
  have_floor=1

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6
-echo "configure:22443: checking if floating point functions link without -lm" >&5
+echo "$as_me:$LINENO: checking if floating point functions link without -lm" >&5
+echo $ECHO_N "checking if floating point functions link without -lm... $ECHO_C" >&6

 if test "$have_cos" = 1 -a "$have_floor" = 1; then
 if test "$have_cos" = 1 -a "$have_floor" = 1; then

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

 else
 else

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

     LIBS="$LIBS -lm"
     # use different functions to avoid configure caching
     have_sin=0
     have_ceil=0
     LIBS="$LIBS -lm"
     # use different functions to avoid configure caching
     have_sin=0
     have_ceil=0

-    for ac_func in sin
+
+for ac_func in sin

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22455: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22460 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:22483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  have_sin=1
  have_sin=1

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-    for ac_func in ceil
+
+for ac_func in ceil

 do
 do

-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:22510: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 22515 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */

 /* System header to define __stub macros and hopefully few prototypes,
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
+    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

 /* Override any gcc2 internal prototype to avoid an error.  */
 /* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /* We use char because int might match the return type of a gcc2
 /* We use char because int might match the return type of a gcc2

-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();

 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else

-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-; return 0; }
-EOF
-if { (eval echo configure:22538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF

  have_ceil=1
  have_ceil=1

-else
-  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-    echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6
-echo "configure:22563: checking if floating point functions link with -lm" >&5
+    echo "$as_me:$LINENO: checking if floating point functions link with -lm" >&5
+echo $ECHO_N "checking if floating point functions link with -lm... $ECHO_C" >&6

     if test "$have_sin" = 1 -a "$have_ceil" = 1; then
     if test "$have_sin" = 1 -a "$have_ceil" = 1; then

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

     else
     else

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

         # not sure we should warn the user, crash, etc.
     fi
 fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
         # not sure we should warn the user, crash, etc.
     fi
 fi
 
 if test "$wxUSE_GUI" = "yes"; then
 

-    LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"

 
 

-        

             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \

-                     minimal propsize rotate shaped widgets"
+                     minimal propsize rotate shaped widgets render"
+
+    if test "$wxUSE_MONOLITHIC" != "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
+    fi

 else
     SAMPLES_SUBDIRS="console"
 fi
 
 
 else
     SAMPLES_SUBDIRS="console"
 fi
 
 

-INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \
+INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \

 -I\${top_srcdir}/include \
 $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
 $TOOLKIT_INCLUDE"
 
 -I\${top_srcdir}/include \
 $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
 $TOOLKIT_INCLUDE"
 

+if test "$GXX" = yes ; then
+        CXXWARNINGS="-Wall"
+        fi
+
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
+
+CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
+CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
+
+
+LIBS=`echo $LIBS | sed 's/ \+/ /g'`
+EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
+EXTRALIBS_XML="$EXPAT_LINK"
+EXTRALIBS_ODBC="$ODBC_LINK"
+if test "$wxUSE_GUI" = "yes"; then
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
+fi
+if test "$wxUSE_OPENGL" = "yes"; then
+    EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
+fi
+
+LDFLAGS="$LDFLAGS $PROFILE"
+

 if test "$wxUSE_GTK" = 1; then
     WXCONFIG_INCLUDE=
 else
     WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
 fi
 
 if test "$wxUSE_GTK" = 1; then
     WXCONFIG_INCLUDE=
 else
     WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
 fi
 

+WXCONFIG_EXTRALIBS="$LIBS"
+
+if test "$wxUSE_REGEX" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty regex"
+fi
+if test "$wxUSE_EXPAT" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty expat"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+if test "$wxUSE_LIBTIFF" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+fi
+if test "$wxUSE_LIBJPEG" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+fi
+if test "$wxUSE_LIBPNG" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty png"
+fi
+if test "$wxUSE_ZLIB" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty zlib"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+
+for i in $wxconfig_3rdparty ; do
+    WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${HOST_SUFFIX}"
+done
+
+

 if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
     WXUNIV=1
 else
 if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
     WXUNIV=1
 else


@@ -22605,9 +33907,34 @@ fi
 
 
 
 
 
 

-EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"

 
 

-MONOLITHIC=1
+if test $wxUSE_MONOLITHIC = "yes" ; then
+    MONOLITHIC=1
+else
+    MONOLITHIC=0
+fi
+
+if test $wxUSE_ODBC != "no" ; then
+    USE_ODBC=1
+else
+    USE_ODBC=0
+fi
+
+if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
+    OFFICIAL_BUILD=1
+else
+    OFFICIAL_BUILD=0
+fi
+
+
+
+
+
+
+
+
+
+

 
 
 
 
 
 


@@ -22621,36 +33948,87 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]`
 
 
 
 
 
 

+

     if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
     if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then

-        
-    # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:22630: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+    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
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

 fi
 fi
 fi
 fi

-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB

 if test -n "$RANLIB"; then
 if test -n "$RANLIB"; then

-  echo "$ac_t""$RANLIB" 1>&6
+  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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  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
+
+  RANLIB=$ac_ct_RANLIB

 else
 else

-  echo "$ac_t""no" 1>&6
+  RANLIB="$ac_cv_prog_RANLIB"

 fi
 
     # Find a good install program.  We prefer a C program (faster),
 fi
 
     # Find a good install program.  We prefer a C program (faster),


@@ -22660,176 +34038,193 @@ fi
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/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"
 # ./install, which can be erroneously created by make from ./install.sh.
 # 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"
 # ./install, which can be erroneously created by make from ./install.sh.

-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:22669: checking for a BSD compatible install" >&5
+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 -z "$INSTALL"; then

-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS=        }"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/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
-        if test -f $ac_dir/$ac_prog; then
-         if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         else
-           ac_cv_path_install="$ac_dir/$ac_prog -c"
-           break 2
-         fi
-       fi
+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/* | \
+  /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 $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          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="$ac_save_IFS"
+    done
+    ;;
+esac
+done
+

 
 fi
   if test "${ac_cv_path_install+set}" = set; then
 
 fi
   if test "${ac_cv_path_install+set}" = set; then

-    INSTALL="$ac_cv_path_install"
+    INSTALL=$ac_cv_path_install

   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.
   else
     # As a last resort, use the slow shell script.  We don't cache a
     # path for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the path is relative.

-    INSTALL="$ac_install_sh"
+    INSTALL=$ac_install_sh

   fi
 fi
   fi
 fi

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

 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
 
 # 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_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'

 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 

-    echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:22722: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
+    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
 else

-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6

 fi
 
 
 fi
 
 

-    echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:22744: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+    echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\_ACEOF

 all:
 all:

-       @echo 'ac_maketemp="${MAKE}"'
-EOF
+       @echo 'ac_maketemp="$(MAKE)"'
+_ACEOF

 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.

-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`

 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi
 if test -n "$ac_maketemp"; then
   eval ac_cv_prog_make_${ac_make}_set=yes
 else
   eval ac_cv_prog_make_${ac_make}_set=no
 fi

-rm -f conftestmake
+rm -f conftest.make

 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then

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

   SET_MAKE=
 else
   SET_MAKE=
 else

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

   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 

-    
-    
+
+

     if test "$build" != "$host" ; then
         AR=$host_alias-ar
         STRIP=$host_alias-strip
     else
         # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
     if test "$build" != "$host" ; then
         AR=$host_alias-ar
         STRIP=$host_alias-strip
     else
         # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:22779: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="ar"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
 fi
 fi
   test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
 fi
 fi

-AR="$ac_cv_prog_AR"
+AR=$ac_cv_prog_AR

 if test -n "$AR"; then
 if test -n "$AR"; then

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

 else
 else

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

 fi
 
         # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 fi
 
         # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:22809: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="strip"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true"
 fi
 fi
   test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true"
 fi
 fi

-STRIP="$ac_cv_prog_STRIP"
+STRIP=$ac_cv_prog_STRIP

 if test -n "$STRIP"; then
 if test -n "$STRIP"; then

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

 else
 else

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

 fi
 
     fi
 fi
 
     fi


@@ -22841,41 +34236,48 @@ fi
         *)  INSTALL_DIR="$INSTALL -d"
             ;;
     esac
         *)  INSTALL_DIR="$INSTALL -d"
             ;;
     esac

-    
+
+
+    LDFLAGS_GUI=
+    case ${host} in
+        *-*-cygwin* | *-*-mingw32* )
+        LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows"
+    esac
+

 
     fi
 
     fi

-    
-        echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
-echo "configure:22850: checking if make is GNU make" >&5
-if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+
+        echo "$as_me:$LINENO: checking if make is GNU make" >&5
+echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6
+if test "${bakefile_cv_prog_makeisgnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
+

         if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
                 egrep -s GNU > /dev/null); then
             bakefile_cv_prog_makeisgnu="yes"
         else
             bakefile_cv_prog_makeisgnu="no"
         fi
         if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
                 egrep -s GNU > /dev/null); then
             bakefile_cv_prog_makeisgnu="yes"
         else
             bakefile_cv_prog_makeisgnu="no"
         fi

-    
-fi

 
 

-echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
+fi
+echo "$as_me:$LINENO: result: $bakefile_cv_prog_makeisgnu" >&5
+echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6

 
     if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
         IF_GNU_MAKE=""
     else
         IF_GNU_MAKE="#"
     fi
 
     if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
         IF_GNU_MAKE=""
     else
         IF_GNU_MAKE="#"
     fi

-    

 
 

-    
+
+

     PLATFORM_UNIX=0
     PLATFORM_WIN32=0
     PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOSX=0
     PLATFORM_UNIX=0
     PLATFORM_WIN32=0
     PLATFORM_MSDOS=0
     PLATFORM_MAC=0
     PLATFORM_MACOSX=0

-    
+

     case "${host}" in
         *-*-cygwin* | *-*-mingw32* )
             PLATFORM_WIN32=1
     case "${host}" in
         *-*-cygwin* | *-*-mingw32* )
             PLATFORM_WIN32=1


@@ -22892,26 +34294,31 @@ echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
         ;;
     esac
 
         ;;
     esac
 

-    
-    
-    
-    
-    

 
 

-    
+
+
+
+
+
+

     SO_SUFFIX="so"
     SO_SUFFIX="so"

+    SO_SUFFIX_MODULE="so"

     EXEEXT=""
     DLLPREFIX=lib
     EXEEXT=""
     DLLPREFIX=lib

-    
+    DLLPREFIX_MODULE=
+

     case "${host}" in
         *-hp-hpux* )
             SO_SUFFIX="sl"
     case "${host}" in
         *-hp-hpux* )
             SO_SUFFIX="sl"

+            SO_SUFFIX_MODULE="sl"

         ;;
         *-*-aix* )
                                                                         SO_SUFFIX="a"
         ;;
         *-*-aix* )
                                                                         SO_SUFFIX="a"

+            SO_SUFFIX_MODULE="a"

         ;;
         *-*-cygwin* | *-*-mingw32* )
             SO_SUFFIX="dll"
         ;;
         *-*-cygwin* | *-*-mingw32* )
             SO_SUFFIX="dll"

+            SO_SUFFIX_MODULE="dll"

             EXEEXT=".exe"
             DLLPREFIX=""
         ;;
             EXEEXT=".exe"
             DLLPREFIX=""
         ;;


@@ -22921,14 +34328,17 @@ echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
         ;;
         powerpc-*-darwin* )
             SO_SUFFIX="dylib"
         ;;
         powerpc-*-darwin* )
             SO_SUFFIX="dylib"

+            SO_SUFFIX_MODULE="bundle"

         ;;
     esac
 
         ;;
     esac
 

-    
-    
-    

 
 

-    
+
+
+
+
+
+

         SHARED_LD_CC="\$(CC) -shared -o"
     SHARED_LD_CXX="\$(CXX) -shared -o"
 
         SHARED_LD_CC="\$(CC) -shared -o"
     SHARED_LD_CXX="\$(CXX) -shared -o"
 


@@ -22952,39 +34362,57 @@ echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&6
 
       *-*-linux* )
         if test "x$GCC" != "xyes"; then
 
       *-*-linux* )
         if test "x$GCC" != "xyes"; then

-            echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:22957: checking for Intel compiler" >&5
-if eval "test \"`echo '$''{'bakefile_cv_prog_icc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+            echo "$as_me:$LINENO: checking for Intel compiler" >&5
+echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6
+if test "${bakefile_cv_prog_icc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
 else

-  
-                cat > conftest.$ac_ext <<EOF
-#line 22963 "configure"
-#include "confdefs.h"

 
 

-int main() {
+                cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{

 
                         #ifndef __INTEL_COMPILER
                         #error Not icc
                         #endif
 
                         #ifndef __INTEL_COMPILER
                         #error Not icc
                         #endif

-                    
-; return 0; }
-EOF
-if { (eval echo configure:22974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then

   bakefile_cv_prog_icc=yes
 else
   bakefile_cv_prog_icc=yes
 else

-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bakefile_cv_prog_icc=no
-                
-fi
-rm -f conftest*
-            
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+bakefile_cv_prog_icc=no
+

 fi
 fi

+rm -f conftest.$ac_objext conftest.$ac_ext

 
 

-echo "$ac_t""$bakefile_cv_prog_icc" 1>&6
+fi
+echo "$as_me:$LINENO: result: $bakefile_cv_prog_icc" >&5
+echo "${ECHO_T}$bakefile_cv_prog_icc" >&6

             if test "$bakefile_cv_prog_icc" = "yes"; then
                 PIC_FLAG="-KPIC"
             fi
             if test "$bakefile_cv_prog_icc" = "yes"; then
                 PIC_FLAG="-KPIC"
             fi


@@ -23002,8 +34430,8 @@ echo "$ac_t""$bakefile_cv_prog_icc" 1>&6
       *-*-darwin* )
                         CFLAGS="$CFLAGS -fno-common"
         CXXFLAGS="$CXXFLAGS -fno-common"
       *-*-darwin* )
                         CFLAGS="$CFLAGS -fno-common"
         CXXFLAGS="$CXXFLAGS -fno-common"

-        
-                                        
+
+

         cat <<EOF >shared-ld-sh
 #!/bin/sh
 #-----------------------------------------------------------------------------
         cat <<EOF >shared-ld-sh
 #!/bin/sh
 #-----------------------------------------------------------------------------


@@ -23017,6 +34445,7 @@ echo "$ac_t""$bakefile_cv_prog_icc" 1>&6
 verbose=0
 args=""
 objects=""
 verbose=0
 args=""
 objects=""

+linking_flag="-dynamiclib"

 
 while test \${#} -gt 0; do
     case \${1} in
 
 while test \${#} -gt 0; do
     case \${1} in


@@ -23036,8 +34465,8 @@ while test \${#} -gt 0; do
         args="\${args} \${1}"
         ;;
 
         args="\${args} \${1}"
         ;;
 

-       -dynamiclib)
-        # skip these options
+       -dynamiclib|-bundle)
+        linking_flag="\${1}"

         ;;
 
        -*)
         ;;
 
        -*)


@@ -23045,7 +34474,7 @@ while test \${#} -gt 0; do
         exit 1
         ;;
 
         exit 1
         ;;
 

-        *.o | *.a)
+        *.o | *.a | *.dylib)

         # collect object files
         objects="\${objects} \${1}"
         ;;
         # collect object files
         objects="\${objects} \${1}"
         ;;


@@ -23075,9 +34504,9 @@ fi
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then

-    echo "cc -dynamiclib master.\$\$.o \${args}"
+    echo "cc \${linking_flag} master.\$\$.o \${args}"

 fi
 fi

-c++ -dynamiclib master.\$\$.o \${args}
+c++ \${linking_flag} master.\$\$.o \${args}

 status=\$?
 if test \${status} != 0; then
     exit \${status}
 status=\$?
 if test \${status} != 0; then
     exit \${status}


@@ -23092,8 +34521,10 @@ exit 0
 EOF
         chmod +x shared-ld-sh
 
 EOF
         chmod +x shared-ld-sh
 

-        SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
+        SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
+        SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"

         SHARED_LD_CXX="$SHARED_LD_CC"
         SHARED_LD_CXX="$SHARED_LD_CC"

+        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"

         PIC_FLAG="-dynamic -fPIC"
                                       ;;
 
         PIC_FLAG="-dynamic -fPIC"
                                       ;;
 


@@ -23101,32 +34532,38 @@ EOF
                 if test "x$GCC" != "xyes"; then
                                     # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
 set dummy makeC++SharedLib; ac_word=$2
                 if test "x$GCC" != "xyes"; then
                                     # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
 set dummy makeC++SharedLib; ac_word=$2

-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:23106: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6

 else
   if test -n "$AIX_CXX_LD"; then
   ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test.
 else
 else
   if test -n "$AIX_CXX_LD"; then
   ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test.
 else

-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+

   test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
 fi
 fi
   test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
 fi
 fi

-AIX_CXX_LD="$ac_cv_prog_AIX_CXX_LD"
+AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD

 if test -n "$AIX_CXX_LD"; then
 if test -n "$AIX_CXX_LD"; then

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

 else
 else

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

 fi
 
                         SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
 fi
 
                         SHARED_LD_CC="$AIX_CC_LD -p 0 -o"


@@ -23144,11 +34581,11 @@ fi
             PIC_FLAG="-KPIC"
         fi
       ;;
             PIC_FLAG="-KPIC"
         fi
       ;;

-      
+

       *-*-cygwin* | *-*-mingw32* )
         PIC_FLAG=""
       ;;
       *-*-cygwin* | *-*-mingw32* )
         PIC_FLAG=""
       ;;

-      
+

       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \


@@ -23157,14 +34594,25 @@ fi
               ;;
 
       *)
               ;;
 
       *)

-        { echo "configure: error: unknown system type $host." 1>&2; exit 1; }
+        { { echo "$as_me:$LINENO: error: unknown system type $host." >&5
+echo "$as_me: error: unknown system type $host." >&2;}
+   { (exit 1); exit 1; }; }

     esac
 
     esac
 

-    
-    
-    
+    if test "x$SHARED_LD_MODULE_CC" = "x" ; then
+        SHARED_LD_MODULE_CC="$SHARED_LD_CC"
+    fi
+    if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
+        SHARED_LD_MODULE_CXX="$SHARED_LD_CXX"
+    fi
+
+
+
+
+
+
+

 
 

-    

     USE_SOVERSION=0
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0
     USE_SOVERSION=0
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0


@@ -23172,351 +34620,671 @@ fi
     USE_MACVERSION=0
     SONAME_FLAG=
 
     USE_MACVERSION=0
     SONAME_FLAG=
 

-    case "${host}" in
-      *-*-linux* )
-        SONAME_FLAG="-Wl,-soname,"
-        USE_SOVERSION=1
-        USE_SOVERLINUX=1
-        USE_SOSYMLINKS=1
-      ;;
+    case "${host}" in
+      *-*-linux* )
+        SONAME_FLAG="-Wl,-soname,"
+        USE_SOVERSION=1
+        USE_SOVERLINUX=1
+        USE_SOSYMLINKS=1
+      ;;
+
+      *-*-solaris2* )
+        SONAME_FLAG="-h "
+        USE_SOVERSION=1
+        USE_SOVERSOLARIS=1
+        USE_SOSYMLINKS=1
+      ;;
+
+      *-*-darwin* )
+        USE_MACVERSION=1
+        USE_SOVERSION=1
+        USE_SOSYMLINKS=1
+      ;;
+    esac
+
+
+
+
+
+
+
+
+
+    echo "$as_me:$LINENO: checking for dependency tracking method" >&5
+echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6
+    DEPS_TRACKING=0
+
+    if test "x$GCC" = "xyes"; then
+        DEPSMODE=gcc
+        DEPS_TRACKING=1
+        case "${host}" in
+            powerpc-*-darwin* )
+                                                DEPSFLAG_GCC="-no-cpp-precomp -MMD"
+            ;;
+            * )
+                DEPSFLAG_GCC="-MMD"
+            ;;
+        esac
+        echo "$as_me:$LINENO: result: gcc" >&5
+echo "${ECHO_T}gcc" >&6
+    else
+        echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
+    fi
+
+    if test $DEPS_TRACKING = 1 ; then
+        cat <<EOF >bk-deps
+#!/bin/sh
+
+# This script is part of Bakefile (http://bakefile.sf.net) 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
+DEPSDIR=.deps
+DEPSFLAG_GCC="$DEPSFLAG_GCC"
+
+mkdir -p \$DEPSDIR
+
+if test \$DEPSMODE = gcc ; then
+    \${*} \${DEPSFLAG_GCC}
+    status=\${?}
+    if test \${status} != 0 ; then
+        exit \${status}
+    fi
+    # move created file to the location we want it in:
+    while test \${#} -gt 0; do
+        case "\${1}" in
+            -o )
+                shift
+                objfile=\${1}
+            ;;
+            -* )
+            ;;
+            * )
+                srcfile=\${1}
+            ;;
+        esac
+        shift
+    done
+    depfile=\`basename \$srcfile | sed -e 's/\..*$/.d/g'\`
+    depobjname=\`echo \$depfile |sed -e 's/\.d/.o/g'\`
+    if test -f \$depfile ; then
+        sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
+        rm -f \$depfile
+    else
+        depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
+        if test -f \$depfile ; then
+            sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
+            rm -f \$depfile
+        fi
+    fi
+    exit 0
+else
+    \${*}
+    exit \${?}
+fi
+EOF
+        chmod +x bk-deps
+    fi
+
+
+
+
+    RESCOMP=
+    SETFILE=
+
+    case ${host} in
+        *-*-cygwin* | *-*-mingw32* )
+                        if test "$build" != "$host" ; then
+                RESCOMP=$host_alias-windres
+            else
+                # 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_RESCOMP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$RESCOMP"; then
+  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RESCOMP="windres"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="windres"
+fi
+fi
+RESCOMP=$ac_cv_prog_RESCOMP
+if test -n "$RESCOMP"; then
+  echo "$as_me:$LINENO: result: $RESCOMP" >&5
+echo "${ECHO_T}$RESCOMP" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+            fi
+         ;;
+
+      *-*-darwin* )
+            # 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_RESCOMP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$RESCOMP"; then
+  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RESCOMP="Rez"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
+fi
+fi
+RESCOMP=$ac_cv_prog_RESCOMP
+if test -n "$RESCOMP"; then
+  echo "$as_me:$LINENO: result: $RESCOMP" >&5
+echo "${ECHO_T}$RESCOMP" >&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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_SETFILE="SetFile"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  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
+
+        ;;
+    esac
+
+
+
+
+
+
+
+    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_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_DEBUG_FLAG_1="#"
+    if test "x$DEBUG_FLAG" = "x1" ; then
+        COND_DEBUG_FLAG_1=""
+    fi
+
+    COND_DEBUG_INFO_0="#"
+    if test "x$DEBUG_INFO" = "x0" ; then
+        COND_DEBUG_INFO_0=""
+    fi
+
+    COND_DEBUG_INFO_1="#"
+    if test "x$DEBUG_INFO" = "x1" ; then
+        COND_DEBUG_INFO_1=""
+    fi
+
+    COND_DEPS_TRACKING_0="#"
+    if test "x$DEPS_TRACKING" = "x0" ; then
+        COND_DEPS_TRACKING_0=""
+    fi
+
+    COND_DEPS_TRACKING_1="#"
+    if test "x$DEPS_TRACKING" = "x1" ; then
+        COND_DEPS_TRACKING_1=""
+    fi
+
+    COND_MONOLITHIC_0="#"
+    if test "x$MONOLITHIC" = "x0" ; then
+        COND_MONOLITHIC_0=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_0="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
+        COND_MONOLITHIC_0_SHARED_0=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_GUI_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_HTML_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1=""
+    fi
+
+    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_GUI_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_HTML_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
+    fi
+
+    COND_MONOLITHIC_1="#"
+    if test "x$MONOLITHIC" = "x1" ; then
+        COND_MONOLITHIC_1=""
+    fi
+
+    COND_MONOLITHIC_1_SHARED_0="#"
+    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
+        COND_MONOLITHIC_1_SHARED_0=""
+    fi
+
+    COND_MONOLITHIC_1_SHARED_1="#"
+    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
+        COND_MONOLITHIC_1_SHARED_1=""
+    fi
+
+    COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
+    fi
+
+    COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
+    fi
+
+    COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
+    if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
+        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
+    fi
+
+    COND_PLATFORM_MACOSX_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" ; then
+        COND_PLATFORM_MACOSX_1=""
+    fi
+
+    COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
+    fi
+
+    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
+    fi
+
+    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
+    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=""
+    fi
+
+    COND_PLATFORM_UNIX_0="#"
+    if test "x$PLATFORM_UNIX" = "x0" ; then
+        COND_PLATFORM_UNIX_0=""
+    fi
+
+    COND_PLATFORM_UNIX_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" ; then
+        COND_PLATFORM_UNIX_1=""
+    fi
+
+    COND_PLATFORM_WIN32_0="#"
+    if test "x$PLATFORM_WIN32" = "x0" ; then
+        COND_PLATFORM_WIN32_0=""
+    fi
+
+    COND_PLATFORM_WIN32_1="#"
+    if test "x$PLATFORM_WIN32" = "x1" ; then
+        COND_PLATFORM_WIN32_1=""
+    fi
+
+    COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
+    if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
+    fi
+
+    COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
+    if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
+    fi
+
+    COND_TOOLKIT_COCOA="#"
+    if test "x$TOOLKIT" = "xCOCOA" ; then
+        COND_TOOLKIT_COCOA=""
+    fi
+
+    COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
+    fi
+
+    COND_TOOLKIT_GTK="#"
+    if test "x$TOOLKIT" = "xGTK" ; then
+        COND_TOOLKIT_GTK=""
+    fi
+
+    COND_TOOLKIT_GTK_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_GTK_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0=""
+    fi
+
+    COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1=""
+    fi
+
+    COND_TOOLKIT_MAC="#"
+    if test "x$TOOLKIT" = "xMAC" ; then
+        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

 
 

-      *-*-solaris2* )
-        SONAME_FLAG="-h "
-        USE_SOVERSION=1
-        USE_SOVERSOLARIS=1
-        USE_SOSYMLINKS=1
-      ;;
+    COND_TOOLKIT_MGL="#"
+    if test "x$TOOLKIT" = "xMGL" ; then
+        COND_TOOLKIT_MGL=""
+    fi

 
 

-      *-*-darwin* )
-        USE_MACVERSION=1
-        USE_SOVERSION=1
-        USE_SOSYMLINKS=1
-      ;;      
-    esac
+    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_MGL_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1=""
+    fi

 
 

-    
-    DEPS_TYPE=no
-    if test "x$GCC" = "xyes"; then
-        DEPS_TYPE=gcc
+    COND_TOOLKIT_MOTIF="#"
+    if test "x$TOOLKIT" = "xMOTIF" ; then
+        COND_TOOLKIT_MOTIF=""

     fi
     fi

-    
-    

 
 

-    
-    RESCOMP=
-    SETFILE=
+    COND_TOOLKIT_MOTIF_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1=""
+    fi

 
 

-    case ${host} in 
-        *-*-cygwin* | *-*-mingw32* )
-                        if test "$build" != "$host" ; then
-                RESCOMP=$host_alias-windres
-            else
-                # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:23225: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RESCOMP"; then
-  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RESCOMP="windres"
-      break
+    COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""

     fi
     fi

-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="windres"
-fi
-fi
-RESCOMP="$ac_cv_prog_RESCOMP"
-if test -n "$RESCOMP"; then
-  echo "$ac_t""$RESCOMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi

 
 

-            fi
-         ;;
- 
-      *-*-darwin* )
-            # Extract the first word of "Rez", so it can be a program name with args.
-set dummy Rez; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:23259: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RESCOMP"; then
-  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RESCOMP="Rez"
-      break
+    COND_TOOLKIT_MSW="#"
+    if test "x$TOOLKIT" = "xMSW" ; then
+        COND_TOOLKIT_MSW=""

     fi
     fi

-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
-fi
-fi
-RESCOMP="$ac_cv_prog_RESCOMP"
-if test -n "$RESCOMP"; then
-  echo "$ac_t""$RESCOMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi

 
 

-            # Extract the first word of "SetFile", so it can be a program name with args.
-set dummy SetFile; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:23289: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$SETFILE"; then
-  ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_SETFILE="SetFile"
-      break
+    COND_TOOLKIT_MSW_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1=""

     fi
     fi

-  done
-  IFS="$ac_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 "$ac_t""$SETFILE" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi

 
 

-        ;;
-    esac
+    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
+    fi

 
 

-    
-    
+    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1=""
+    fi

 
 

+    COND_TOOLKIT_OS2="#"
+    if test "x$TOOLKIT" = "xOS2" ; then
+        COND_TOOLKIT_OS2=""
+    fi

 
 

-    
-    
-    COND_WXUSE_ZLIBBUILTIN="#"
-    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_WXUSE_ZLIBBUILTIN=
+    COND_TOOLKIT_OS2_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OS2_USE_GUI_1=""

     fi
     fi

-    
-    COND_UNICODE1="#"
-    if test "x$UNICODE" = "x1" ; then
-        COND_UNICODE1=
+
+    COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""

     fi
     fi

-    
-    COND_BUILDDEBUG="#"
-    if test "x$BUILD" = "xdebug" ; then
-        COND_BUILDDEBUG=
+
+    COND_TOOLKIT_X11="#"
+    if test "x$TOOLKIT" = "xX11" ; then
+        COND_TOOLKIT_X11=""

     fi
     fi

-    
-    COND_WXUSE_REGEXBUILTIN="#"
-    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_WXUSE_REGEXBUILTIN=
+
+    COND_TOOLKIT_X11_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_X11_USE_GUI_1=""

     fi
     fi

-    
-    COND_USE_SOSYMLINKS1="#"
-    if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS1=
+
+    COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""

     fi
     fi

-    
-    COND_WXUSE_LIBJPEGBUILTIN="#"
-    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEGBUILTIN=
+
+    COND_UNICODE_1="#"
+    if test "x$UNICODE" = "x1" ; then
+        COND_UNICODE_1=""

     fi
     fi

-    
-    COND_WXUSE_LIBPNGBUILTIN="#"
-    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNGBUILTIN=
+
+    COND_USE_GUI_0="#"
+    if test "x$USE_GUI" = "x0" ; then
+        COND_USE_GUI_0=""

     fi
     fi

-    
-    COND_WXUSE_ODBCBUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBCBUILTIN=
+
+    COND_USE_GUI_1="#"
+    if test "x$USE_GUI" = "x1" ; then
+        COND_USE_GUI_1=""

     fi
     fi

-    
-    COND_TOOLKITGTK="#"
-    if test "x$TOOLKIT" = "xGTK" ; then
-        COND_TOOLKITGTK=
+
+    COND_USE_GUI_1_WXUNIV_0="#"
+    if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_USE_GUI_1_WXUNIV_0=""

     fi
     fi

-    
-    COND_TOOLKITMOTIF="#"
-    if test "x$TOOLKIT" = "xMOTIF" ; then
-        COND_TOOLKITMOTIF=
+
+    COND_USE_GUI_1_WXUNIV_1="#"
+    if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_USE_GUI_1_WXUNIV_1=""

     fi
     fi

-    
-    COND_TOOLKITMSW="#"
-    if test "x$TOOLKIT" = "xMSW" ; then
-        COND_TOOLKITMSW=
+
+    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
     fi

-    
-    COND_TOOLKITMAC="#"
-    if test "x$TOOLKIT" = "xMAC" ; then
-        COND_TOOLKITMAC=
+
+    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
     fi

-    
-    COND_TOOLKITCOCOA="#"
-    if test "x$TOOLKIT" = "xCOCOA" ; then
-        COND_TOOLKITCOCOA=
+
+    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
     fi

-    
-    COND_TOOLKITOS2="#"
-    if test "x$TOOLKIT" = "xOS2" ; then
-        COND_TOOLKITOS2=
+
+    COND_USE_SOSYMLINKS_1="#"
+    if test "x$USE_SOSYMLINKS" = "x1" ; then
+        COND_USE_SOSYMLINKS_1=""

     fi
     fi

-    
-    COND_TOOLKITX11="#"
-    if test "x$TOOLKIT" = "xX11" ; then
-        COND_TOOLKITX11=
+
+    COND_USE_SOVERLINUX_1="#"
+    if test "x$USE_SOVERLINUX" = "x1" ; then
+        COND_USE_SOVERLINUX_1=""

     fi
     fi

-    
-    COND_TOOLKITMGL="#"
-    if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKITMGL=
+
+    COND_USE_SOVERSION_0="#"
+    if test "x$USE_SOVERSION" = "x0" ; then
+        COND_USE_SOVERSION_0=""
+    fi
+
+    COND_USE_SOVERSOLARIS_1="#"
+    if test "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSOLARIS_1=""

     fi
     fi

-    
-    COND_WXUNIV1="#"
+
+    COND_WXUNIV_1="#"

     if test "x$WXUNIV" = "x1" ; then
     if test "x$WXUNIV" = "x1" ; then

-        COND_WXUNIV1=
-    fi
-    
-    COND_SHARED0_MONOLITHIC1="#"
-    if test "x$SHARED" = "x0" -a \
-            "x$MONOLITHIC" = "x1" ; then
-        COND_SHARED0_MONOLITHIC1=
-    fi
-    
-    COND_SHARED1_MONOLITHIC1="#"
-    if test "x$SHARED" = "x1" -a \
-            "x$MONOLITHIC" = "x1" ; then
-        COND_SHARED1_MONOLITHIC1=
-    fi
-    
-    COND_PLATFORM_UNIX1="#"
-    if test "x$PLATFORM_UNIX" = "x1" ; then
-        COND_PLATFORM_UNIX1=
+        COND_WXUNIV_1=""

     fi
     fi

-    
-    COND_PLATFORM_MACOSX1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_PLATFORM_MACOSX1=
+
+    COND_WXUSE_EXPAT_BUILTIN="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_WXUSE_EXPAT_BUILTIN=""

     fi
     fi

-    
-    COND_PLATFORM_WIN321="#"
-    if test "x$PLATFORM_WIN32" = "x1" ; then
-        COND_PLATFORM_WIN321=
-    fi
-    
-    COND_USE_SOVERSION1_PLATFORM_MACOSX0="#"
-    if test "x$USE_SOVERSION" = "x1" -a \
-            "x$PLATFORM_MACOSX" = "x0" ; then
-        COND_USE_SOVERSION1_PLATFORM_MACOSX0=
-    fi
-    
-    COND_USE_SOVERSION1_PLATFORM_MACOSX1="#"
-    if test "x$USE_SOVERSION" = "x1" -a \
-            "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_USE_SOVERSION1_PLATFORM_MACOSX1=
-    fi
-    
-    COND_WXUSE_LIBTIFFBUILTIN="#"
-    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFFBUILTIN=
+
+    COND_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_WXUSE_LIBJPEG_BUILTIN=""

     fi
     fi

-    
-    COND_PLATFORM_WIN320="#"
-    if test "x$PLATFORM_WIN32" = "x0" ; then
-        COND_PLATFORM_WIN320=
+
+    COND_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_WXUSE_LIBPNG_BUILTIN=""

     fi
     fi

-    
-    COND_MONOLITHIC1="#"
-    if test "x$MONOLITHIC" = "x1" ; then
-        COND_MONOLITHIC1=
+
+    COND_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_WXUSE_LIBTIFF_BUILTIN=""

     fi
     fi

-    
-    COND_MONOLITHIC0="#"
-    if test "x$MONOLITHIC" = "x0" ; then
-        COND_MONOLITHIC0=
+
+    COND_WXUSE_ODBC_BUILTIN="#"
+    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
+        COND_WXUSE_ODBC_BUILTIN=""

     fi
     fi

-    
-    COND_USE_GUI1="#"
-    if test "x$USE_GUI" = "x1" ; then
-        COND_USE_GUI1=
+
+    COND_WXUSE_REGEX_BUILTIN="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_WXUSE_REGEX_BUILTIN=""

     fi
     fi

-    
-    COND_DEPS_TYPEGCC="#"
-    if test "x$DEPS_TYPE" = "xgcc" ; then
-        COND_DEPS_TYPEGCC=
+
+    COND_WXUSE_ZLIB_BUILTIN="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_WXUSE_ZLIB_BUILTIN=""

     fi
     fi

-    
-    COND_USE_GUI0="#"
-    if test "x$USE_GUI" = "x0" ; then
-        COND_USE_GUI0=
-    fi
-    
-    COND_USE_GUI1_WXUNIV0="#"
-    if test "x$USE_GUI" = "x1" -a \
-            "x$WXUNIV" = "x0" ; then
-        COND_USE_GUI1_WXUNIV0=
-    fi
-    
-    COND_USE_GUI1_WXUNIV1="#"
-    if test "x$USE_GUI" = "x1" -a \
-            "x$WXUNIV" = "x1" ; then
-        COND_USE_GUI1_WXUNIV1=
-    fi
-    
-    COND_USE_SOVERLINUX1="#"
-    if test "x$USE_SOVERLINUX" = "x1" ; then
-        COND_USE_SOVERLINUX1=
+
+    COND_PLATFORM_MAC_1="#"
+    if test "x$PLATFORM_MAC" = "x1" ; then
+        COND_PLATFORM_MAC_1=""

     fi
     fi

-    
-    COND_USE_SOVERSOLARIS1="#"
-    if test "x$USE_SOVERSOLARIS" = "x1" ; then
-        COND_USE_SOVERSOLARIS1=
+
+    COND_SHARED_1="#"
+    if test "x$SHARED" = "x1" ; then
+        COND_SHARED_1=""

     fi
     fi

-    

 
 

+    COND_SHARED_0="#"
+    if test "x$SHARED" = "x0" ; then
+        COND_SHARED_0=""
+    fi

 
 
 
 

-if test "$GXX" = yes ; then
-        CXXWARNINGS="-Wall"
-        fi

 
 

-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"

 
 

-CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
-CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
-CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
-LIBS=`echo $LIBS | sed 's/ \+/ /g'`

 
 

-LDFLAGS="$LDFLAGS $PROFILE"

 
 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'`"
 


@@ -23619,623 +35387,1469 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
 
 
 

-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:23624: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-       @echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.make <<\_ACEOF
+all:
+       @echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  SET_MAKE=
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then
+    mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
+fi
+
+          ac_config_headers="$ac_config_headers setup.h"
+
+
+                              ac_config_files="$ac_config_files wx-config version-script Makefile"
+
+
+          ac_config_commands="$ac_config_commands default"
+
+
+
+if test "$wxUSE_GUI" = "yes"; then
+    SUBDIRS="samples demos utils contrib"
+else         SUBDIRS="samples utils"
+fi
+
+for subdir in `echo $SUBDIRS`; do
+    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
+                    if test -d $srcdir/samples/$sample; then
+                        makefiles="samples/$sample/Makefile.in $makefiles"
+                    fi
+                done
+            else                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+            fi
+        else                                     if test ${subdir} = "samples"; then
+                makefiles="samples/Makefile.in samples/console/Makefile.in"
+            else                 makefiles="utils/HelpGen/Makefile.in \
+                           utils/HelpGen/src/Makefile.in \
+                           utils/makegen/Makefile.in"
+            fi
+        fi
+
+        for mkin in $makefiles ; do
+            mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'`
+                      ac_config_files="$ac_config_files $mk"
+
+        done
+    fi
+done
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+        "s/'/'\\\\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[        ]*VPATH[        ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[   ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[     ]*$//;
+}'
+fi
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_i=`echo "$ac_i" |
+         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+: ${CONFIG_STATUS=./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
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+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 -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
+  fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; 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'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+        case $as_dir in
+        /*)
+          if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+            $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+            $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+            CONFIG_SHELL=$as_dir/$as_base
+            export CONFIG_SHELL
+            exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+          fi;;
+        esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='     ' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS="  $as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by wxWindows $as_me 2.5.0, which was
+generated by GNU Autoconf 2.57.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -q, --quiet      do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+wxWindows config.status 2.5.0
+configured by $0, generated by GNU Autoconf 2.57,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+_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.
+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=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_option=$1
+     ac_need_defaults=false;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    ac_need_defaults=false;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1" ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"

 fi
 
 fi
 

-
-if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then
-    mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+if \$ac_cs_recheck; then
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

 fi
 
 fi
 

+_ACEOF

 
 

-
-wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
-wx_cv_if_gnu_make=$IF_GNU_MAKE
-wx_cv_path_ifs=$PATH_IFS
-wx_cv_program_ext=$PROGRAM_EXT
-wx_cv_target_library=$WX_TARGET_LIBRARY
-wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
-wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
-wx_cv_library_basename=${WX_LIBRARY_BASENAME}
-wx_cv_release=${WX_RELEASE}
-wx_cv_current=${WX_CURRENT}
-wx_cv_revision=${WX_REVISION}
-wx_cv_age=${WX_AGE}
-wx_cv_use_gui=${USE_GUI}
-wx_cv_use_resources=${wxUSE_RESOURCES}
-export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
-       wx_cv_path_ifs wx_cv_program_ext \
-       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
-       wx_cv_library_basename \
-       wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
-       wx_cv_use_gui wx_cv_use_resources \
-       CFLAGS LDFLAGS CXXFLAGS CPPFLAGS \
-       top_builddir USE_GUI MONOLITHIC \
-       wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG \
-       wxUSE_LIBTIFF EXTRALIBS UNICODE BUILD SHARED TOOLKIT TOOLKIT_LOWERCASE \
-       TOOLKIT_VERSION SAMPLES_RPATH_FLAG WXUNIV
-
-subdirs="demos samples utils contrib"
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+cat >>$CONFIG_STATUS <<_ACEOF

 #
 #

-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# INIT-COMMANDS section.

 #
 #

-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache

 
 

-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15

 
 

-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
+            LN_S="${LN_S}"

 
 

-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[        ]*VPATH[        ]*=[^:]*$/d'
-fi

 
 

-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15

 
 

-DEFS=-DHAVE_CONFIG_H
+_ACEOF

 
 

-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}

 
 

-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.

 
 

-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_config_target in $ac_config_targets

 do
 do

-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "wx-config" ) CONFIG_FILES="$CONFIG_FILES wx-config" ;;
+  "version-script" ) CONFIG_FILES="$CONFIG_FILES version-script" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "$mk" ) CONFIG_FILES="$CONFIG_FILES $mk" ;;
+  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+  "setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS setup.h" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;

   esac
 done
 
   esac
 done
 

-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason to put it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}

 
 

-trap 'rm -fr `echo "
-            wx-config
-            version-script
-            Makefile
-           setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
+# Create a (secure) tmp directory for tmp files.

 
 

-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@CXX@%$CXX%g
-s%@RANLIB@%$RANLIB%g
-s%@AR@%$AR%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@STRIP@%$STRIP%g
-s%@IF_GNU_MAKE@%$IF_GNU_MAKE%g
-s%@YACC@%$YACC%g
-s%@LEX@%$LEX%g
-s%@LEXLIB@%$LEXLIB%g
-s%@LN_S@%$LN_S%g
-s%@CXXCPP@%$CXXCPP%g
-s%@PKG_CONFIG@%$PKG_CONFIG%g
-s%@GTK_CFLAGS@%$GTK_CFLAGS%g
-s%@GTK_LIBS@%$GTK_LIBS%g
-s%@GTK_CONFIG@%$GTK_CONFIG%g
-s%@PANGOFT2_CFLAGS@%$PANGOFT2_CFLAGS%g
-s%@PANGOFT2_LIBS@%$PANGOFT2_LIBS%g
-s%@X_CFLAGS@%$X_CFLAGS%g
-s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-s%@X_LIBS@%$X_LIBS%g
-s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@PANGOX_CFLAGS@%$PANGOX_CFLAGS%g
-s%@PANGOX_LIBS@%$PANGOX_LIBS%g
-s%@PANGOXFT_CFLAGS@%$PANGOXFT_CFLAGS%g
-s%@PANGOXFT_LIBS@%$PANGOXFT_LIBS%g
-s%@AIX_CXX_LD@%$AIX_CXX_LD%g
-s%@RESCOMP@%$RESCOMP%g
-s%@DEREZ@%$DEREZ%g
-s%@SETFILE@%$SETFILE%g
-s%@LIBICONV@%$LIBICONV%g
-s%@wxUSE_ZLIB@%$wxUSE_ZLIB%g
-s%@wxUSE_REGEX@%$wxUSE_REGEX%g
-s%@wxUSE_ODBC@%$wxUSE_ODBC%g
-s%@wxUSE_LIBJPEG@%$wxUSE_LIBJPEG%g
-s%@wxUSE_LIBPNG@%$wxUSE_LIBPNG%g
-s%@wxUSE_LIBTIFF@%$wxUSE_LIBTIFF%g
-s%@WXUNIV@%$WXUNIV%g
-s%@MONOLITHIC@%$MONOLITHIC%g
-s%@EXTRALIBS@%$EXTRALIBS%g
-s%@UNICODE@%$UNICODE%g
-s%@BUILD@%$BUILD%g
-s%@SHARED@%$SHARED%g
-s%@TOOLKIT_LOWERCASE@%$TOOLKIT_LOWERCASE%g
-s%@TOOLKIT_VERSION@%$TOOLKIT_VERSION%g
-s%@SAMPLES_RPATH_FLAG@%$SAMPLES_RPATH_FLAG%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@MAKE_SET@%$MAKE_SET%g
-s%@INSTALL_DIR@%$INSTALL_DIR%g
-s%@PLATFORM_UNIX@%$PLATFORM_UNIX%g
-s%@PLATFORM_WIN32@%$PLATFORM_WIN32%g
-s%@PLATFORM_MSDOS@%$PLATFORM_MSDOS%g
-s%@PLATFORM_MAC@%$PLATFORM_MAC%g
-s%@PLATFORM_MACOSX@%$PLATFORM_MACOSX%g
-s%@SO_SUFFIX@%$SO_SUFFIX%g
-s%@EXEEXT@%$EXEEXT%g
-s%@DLLPREFIX@%$DLLPREFIX%g
-s%@SHARED_LD_CC@%$SHARED_LD_CC%g
-s%@SHARED_LD_CXX@%$SHARED_LD_CXX%g
-s%@PIC_FLAG@%$PIC_FLAG%g
-s%@USE_SOVERSION@%$USE_SOVERSION%g
-s%@USE_SOVERLINUX@%$USE_SOVERLINUX%g
-s%@USE_SOVERSOLARIS@%$USE_SOVERSOLARIS%g
-s%@USE_MACVERSION@%$USE_MACVERSION%g
-s%@USE_SOSYMLINKS@%$USE_SOSYMLINKS%g
-s%@SONAME_FLAG@%$SONAME_FLAG%g
-s%@DEPS_TYPE@%$DEPS_TYPE%g
-s%@COND_WXUSE_ZLIBBUILTIN@%$COND_WXUSE_ZLIBBUILTIN%g
-s%@COND_UNICODE1@%$COND_UNICODE1%g
-s%@COND_BUILDDEBUG@%$COND_BUILDDEBUG%g
-s%@COND_WXUSE_REGEXBUILTIN@%$COND_WXUSE_REGEXBUILTIN%g
-s%@COND_USE_SOSYMLINKS1@%$COND_USE_SOSYMLINKS1%g
-s%@COND_WXUSE_LIBJPEGBUILTIN@%$COND_WXUSE_LIBJPEGBUILTIN%g
-s%@COND_WXUSE_LIBPNGBUILTIN@%$COND_WXUSE_LIBPNGBUILTIN%g
-s%@COND_WXUSE_ODBCBUILTIN@%$COND_WXUSE_ODBCBUILTIN%g
-s%@COND_TOOLKITGTK@%$COND_TOOLKITGTK%g
-s%@COND_TOOLKITMOTIF@%$COND_TOOLKITMOTIF%g
-s%@COND_TOOLKITMSW@%$COND_TOOLKITMSW%g
-s%@COND_TOOLKITMAC@%$COND_TOOLKITMAC%g
-s%@COND_TOOLKITCOCOA@%$COND_TOOLKITCOCOA%g
-s%@COND_TOOLKITOS2@%$COND_TOOLKITOS2%g
-s%@COND_TOOLKITX11@%$COND_TOOLKITX11%g
-s%@COND_TOOLKITMGL@%$COND_TOOLKITMGL%g
-s%@COND_WXUNIV1@%$COND_WXUNIV1%g
-s%@COND_SHARED0_MONOLITHIC1@%$COND_SHARED0_MONOLITHIC1%g
-s%@COND_SHARED1_MONOLITHIC1@%$COND_SHARED1_MONOLITHIC1%g
-s%@COND_PLATFORM_UNIX1@%$COND_PLATFORM_UNIX1%g
-s%@COND_PLATFORM_MACOSX1@%$COND_PLATFORM_MACOSX1%g
-s%@COND_PLATFORM_WIN321@%$COND_PLATFORM_WIN321%g
-s%@COND_USE_SOVERSION1_PLATFORM_MACOSX0@%$COND_USE_SOVERSION1_PLATFORM_MACOSX0%g
-s%@COND_USE_SOVERSION1_PLATFORM_MACOSX1@%$COND_USE_SOVERSION1_PLATFORM_MACOSX1%g
-s%@COND_WXUSE_LIBTIFFBUILTIN@%$COND_WXUSE_LIBTIFFBUILTIN%g
-s%@COND_PLATFORM_WIN320@%$COND_PLATFORM_WIN320%g
-s%@COND_MONOLITHIC1@%$COND_MONOLITHIC1%g
-s%@COND_MONOLITHIC0@%$COND_MONOLITHIC0%g
-s%@COND_USE_GUI1@%$COND_USE_GUI1%g
-s%@COND_DEPS_TYPEGCC@%$COND_DEPS_TYPEGCC%g
-s%@COND_USE_GUI0@%$COND_USE_GUI0%g
-s%@COND_USE_GUI1_WXUNIV0@%$COND_USE_GUI1_WXUNIV0%g
-s%@COND_USE_GUI1_WXUNIV1@%$COND_USE_GUI1_WXUNIV1%g
-s%@COND_USE_SOVERLINUX1@%$COND_USE_SOVERLINUX1%g
-s%@COND_USE_SOVERSOLARIS1@%$COND_USE_SOVERSOLARIS1%g
-s%@LEX_STEM@%$LEX_STEM%g
-s%@PATH_IFS@%$PATH_IFS%g
-s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
-s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g
-s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g
-s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
-s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
-s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
-s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
-s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
-s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
-s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g
-s%@PROGRAM_EXT@%$PROGRAM_EXT%g
-s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
-s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g
-s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
-s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
-s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g
-s%@WX_ALL@%$WX_ALL%g
-s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g
-s%@SHARED_LD@%$SHARED_LD%g
-s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g
-s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g
-s%@SONAME_FLAGS@%$SONAME_FLAGS%g
-s%@SONAME_FLAGS_GL@%$SONAME_FLAGS_GL%g
-s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
-s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
-s%@STATIC_FLAG@%$STATIC_FLAG%g
-s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
-s%@USE_GUI@%$USE_GUI%g
-s%@AFMINSTALL@%$AFMINSTALL%g
-s%@WIN32INSTALL@%$WIN32INSTALL%g
-s%@TOOLKIT@%$TOOLKIT%g
-s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
-s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
-s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
-s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
-s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g
-s%@top_builddir@%$top_builddir%g
-s%@cross_compiling@%$cross_compiling%g
-s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
-s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g
-s%@WXCONFIG_LIBS_STATIC@%$WXCONFIG_LIBS_STATIC%g
-s%@WXCONFIG_LIBS_STATIC_GL@%$WXCONFIG_LIBS_STATIC_GL%g
-s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
-s%@WXCONFIG_RPATH@%$WXCONFIG_RPATH%g
-s%@WX_LARGEFILE_FLAGS@%$WX_LARGEFILE_FLAGS%g
-s%@ALL_OBJECTS@%$ALL_OBJECTS%g
-s%@ALL_HEADERS@%$ALL_HEADERS%g
-s%@ALL_SOURCES@%$ALL_SOURCES%g
-s%@GUIDIST@%$GUIDIST%g
-s%@PORT_FILES@%$PORT_FILES%g
-s%@DISTDIR@%$DISTDIR%g
-s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
-s%@LDFLAGS_GL@%$LDFLAGS_GL%g
-s%@LDFLAGS_VERSIONING@%$LDFLAGS_VERSIONING%g
-s%@LDFLAGS_EXE@%$LDFLAGS_EXE%g
-s%@OPENGL_LIBS@%$OPENGL_LIBS%g
-s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g
-s%@WX_VERSION_TAG@%$WX_VERSION_TAG%g
-s%@RESFLAGS@%$RESFLAGS%g
-s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
-s%@WX_RESOURCES_MACOSX_ASCII@%$WX_RESOURCES_MACOSX_ASCII%g
-s%@WX_RESOURCES_MACOSX_DATA@%$WX_RESOURCES_MACOSX_DATA%g
-s%@MACOSX_BUNDLE@%$MACOSX_BUNDLE%g
-s%@LIBWXMACRES@%$LIBWXMACRES%g
-s%@MACRESCOMP@%$MACRESCOMP%g
-s%@MACSETFILE@%$MACSETFILE%g
-s%@MACRESWXCONFIG@%$MACRESWXCONFIG%g
-s%@GCC@%$GCC%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@AS@%$AS%g
-s%@NM@%$NM%g
-s%@LD@%$LD%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@INSTALL_LIBRARY@%$INSTALL_LIBRARY%g
-s%@subdirs@%$subdirs%g
+{
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./confstat$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+
+#
+# CONFIG_FILES section.
+#

 
 

+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@target@,$target,;t t
+s,@target_cpu@,$target_cpu,;t t
+s,@target_vendor@,$target_vendor,;t t
+s,@target_os@,$target_os,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
+s,@CXX@,$CXX,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@AR@,$AR,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@STRIP@,$STRIP,;t t
+s,@IF_GNU_MAKE@,$IF_GNU_MAKE,;t t
+s,@YACC@,$YACC,;t t
+s,@LEX@,$LEX,;t t
+s,@LEXLIB@,$LEXLIB,;t t
+s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
+s,@LN_S@,$LN_S,;t t
+s,@CXXCPP@,$CXXCPP,;t t
+s,@subdirs@,$subdirs,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
+s,@GTK_LIBS@,$GTK_LIBS,;t t
+s,@GTK_CONFIG@,$GTK_CONFIG,;t t
+s,@PANGOFT2_CFLAGS@,$PANGOFT2_CFLAGS,;t t
+s,@PANGOFT2_LIBS@,$PANGOFT2_LIBS,;t t
+s,@X_CFLAGS@,$X_CFLAGS,;t t
+s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
+s,@X_LIBS@,$X_LIBS,;t t
+s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+s,@PANGOX_CFLAGS@,$PANGOX_CFLAGS,;t t
+s,@PANGOX_LIBS@,$PANGOX_LIBS,;t t
+s,@PANGOXFT_CFLAGS@,$PANGOXFT_CFLAGS,;t t
+s,@PANGOXFT_LIBS@,$PANGOXFT_LIBS,;t t
+s,@RESCOMP@,$RESCOMP,;t t
+s,@DEREZ@,$DEREZ,;t t
+s,@SETFILE@,$SETFILE,;t t
+s,@LIBICONV@,$LIBICONV,;t t
+s,@EXTRALIBS_ESD@,$EXTRALIBS_ESD,;t t
+s,@CORE_BASE_LIBS@,$CORE_BASE_LIBS,;t t
+s,@CORE_GUI_LIBS@,$CORE_GUI_LIBS,;t t
+s,@wxUSE_ZLIB@,$wxUSE_ZLIB,;t t
+s,@wxUSE_REGEX@,$wxUSE_REGEX,;t t
+s,@wxUSE_EXPAT@,$wxUSE_EXPAT,;t t
+s,@wxUSE_ODBC@,$wxUSE_ODBC,;t t
+s,@wxUSE_LIBJPEG@,$wxUSE_LIBJPEG,;t t
+s,@wxUSE_LIBPNG@,$wxUSE_LIBPNG,;t t
+s,@wxUSE_LIBTIFF@,$wxUSE_LIBTIFF,;t t
+s,@VENDOR@,$VENDOR,;t t
+s,@OFFICIAL_BUILD@,$OFFICIAL_BUILD,;t t
+s,@WXUNIV@,$WXUNIV,;t t
+s,@MONOLITHIC@,$MONOLITHIC,;t t
+s,@EXTRALIBS@,$EXTRALIBS,;t t
+s,@EXTRALIBS_XML@,$EXTRALIBS_XML,;t t
+s,@EXTRALIBS_ODBC@,$EXTRALIBS_ODBC,;t t
+s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t
+s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t
+s,@UNICODE@,$UNICODE,;t t
+s,@BUILD@,$BUILD,;t t
+s,@DEBUG_INFO@,$DEBUG_INFO,;t t
+s,@DEBUG_FLAG@,$DEBUG_FLAG,;t t
+s,@SHARED@,$SHARED,;t t
+s,@TOOLKIT_LOWERCASE@,$TOOLKIT_LOWERCASE,;t t
+s,@TOOLKIT_VERSION@,$TOOLKIT_VERSION,;t t
+s,@SAMPLES_RPATH_FLAG@,$SAMPLES_RPATH_FLAG,;t t
+s,@HOST_SUFFIX@,$HOST_SUFFIX,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@MAKE_SET@,$MAKE_SET,;t t
+s,@INSTALL_DIR@,$INSTALL_DIR,;t t
+s,@LDFLAGS_GUI@,$LDFLAGS_GUI,;t t
+s,@PLATFORM_UNIX@,$PLATFORM_UNIX,;t t
+s,@PLATFORM_WIN32@,$PLATFORM_WIN32,;t t
+s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t
+s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t
+s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
+s,@SO_SUFFIX@,$SO_SUFFIX,;t t
+s,@SO_SUFFIX_MODULE@,$SO_SUFFIX_MODULE,;t t
+s,@DLLPREFIX@,$DLLPREFIX,;t t
+s,@DLLPREFIX_MODULE@,$DLLPREFIX_MODULE,;t t
+s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
+s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
+s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
+s,@SHARED_LD_MODULE_CC@,$SHARED_LD_MODULE_CC,;t t
+s,@SHARED_LD_MODULE_CXX@,$SHARED_LD_MODULE_CXX,;t t
+s,@PIC_FLAG@,$PIC_FLAG,;t t
+s,@USE_SOVERSION@,$USE_SOVERSION,;t t
+s,@USE_SOVERLINUX@,$USE_SOVERLINUX,;t t
+s,@USE_SOVERSOLARIS@,$USE_SOVERSOLARIS,;t t
+s,@USE_MACVERSION@,$USE_MACVERSION,;t t
+s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t
+s,@SONAME_FLAG@,$SONAME_FLAG,;t t
+s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t
+s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
+s,@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT,;t t
+s,@COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT,;t t
+s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t
+s,@COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT@,$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT,;t t
+s,@COND_DEBUG_FLAG_1@,$COND_DEBUG_FLAG_1,;t t
+s,@COND_DEBUG_INFO_0@,$COND_DEBUG_INFO_0,;t t
+s,@COND_DEBUG_INFO_1@,$COND_DEBUG_INFO_1,;t t
+s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
+s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
+s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t
+s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t
+s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t
+s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_1,;t t
+s,@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1,;t t
+s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t
+s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t
+s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t
+s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t
+s,@COND_PLATFORM_UNIX_0@,$COND_PLATFORM_UNIX_0,;t t
+s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t
+s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t
+s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t
+s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t
+s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t
+s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t
+s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t
+s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t
+s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
+s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t
+s,@COND_TOOLKIT_OS2_USE_GUI_1@,$COND_TOOLKIT_OS2_USE_GUI_1,;t t
+s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
+s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
+s,@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
+s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
+s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
+s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
+s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
+s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
+s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
+s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
+s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t
+s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
+s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
+s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
+s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
+s,@COND_SHARED_1@,$COND_SHARED_1,;t t
+s,@COND_SHARED_0@,$COND_SHARED_0,;t t
+s,@LEX_STEM@,$LEX_STEM,;t t
+s,@PATH_IFS@,$PATH_IFS,;t t
+s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
+s,@WX_MINOR_VERSION_NUMBER@,$WX_MINOR_VERSION_NUMBER,;t t
+s,@WX_RELEASE_NUMBER@,$WX_RELEASE_NUMBER,;t t
+s,@WX_LIBRARY_NAME_STATIC@,$WX_LIBRARY_NAME_STATIC,;t t
+s,@WX_LIBRARY_NAME_SHARED@,$WX_LIBRARY_NAME_SHARED,;t t
+s,@WX_LIBRARY_BASENAME_NOGUI@,$WX_LIBRARY_BASENAME_NOGUI,;t t
+s,@WX_LIBRARY_BASENAME_GUI@,$WX_LIBRARY_BASENAME_GUI,;t t
+s,@WX_LIBRARY_IMPORTLIB@,$WX_LIBRARY_IMPORTLIB,;t t
+s,@WX_TARGET_LIBRARY@,$WX_TARGET_LIBRARY,;t t
+s,@WX_LIBRARY_LINK1@,$WX_LIBRARY_LINK1,;t t
+s,@WX_LIBRARY_LINK2@,$WX_LIBRARY_LINK2,;t t
+s,@PROGRAM_EXT@,$PROGRAM_EXT,;t t
+s,@WX_LIBRARY_NAME_STATIC_GL@,$WX_LIBRARY_NAME_STATIC_GL,;t t
+s,@WX_LIBRARY_NAME_SHARED_GL@,$WX_LIBRARY_NAME_SHARED_GL,;t t
+s,@WX_TARGET_LIBRARY_GL@,$WX_TARGET_LIBRARY_GL,;t t
+s,@WX_LIBRARY_LINK1_GL@,$WX_LIBRARY_LINK1_GL,;t t
+s,@WX_LIBRARY_LINK2_GL@,$WX_LIBRARY_LINK2_GL,;t t
+s,@WX_ALL@,$WX_ALL,;t t
+s,@WX_ALL_INSTALLED@,$WX_ALL_INSTALLED,;t t
+s,@SHARED_LD@,$SHARED_LD,;t t
+s,@WX_TARGET_LIBRARY_TYPE@,$WX_TARGET_LIBRARY_TYPE,;t t
+s,@STATIC_FLAG@,$STATIC_FLAG,;t t
+s,@WXDEBUG_DEFINE@,$WXDEBUG_DEFINE,;t t
+s,@USE_GUI@,$USE_GUI,;t t
+s,@AFMINSTALL@,$AFMINSTALL,;t t
+s,@WIN32INSTALL@,$WIN32INSTALL,;t t
+s,@TOOLKIT@,$TOOLKIT,;t t
+s,@TOOLKIT_DIR@,$TOOLKIT_DIR,;t t
+s,@TOOLKIT_VPATH@,$TOOLKIT_VPATH,;t t
+s,@TOOLCHAIN_NAME@,$TOOLCHAIN_NAME,;t t
+s,@TOOLCHAIN_DEFS@,$TOOLCHAIN_DEFS,;t t
+s,@TOOLCHAIN_DLL_DEFS@,$TOOLCHAIN_DLL_DEFS,;t t
+s,@top_builddir_wxconfig@,$top_builddir_wxconfig,;t t
+s,@cross_compiling@,$cross_compiling,;t t
+s,@WXCONFIG_EXTRALIBS@,$WXCONFIG_EXTRALIBS,;t t
+s,@WXCONFIG_LIBS@,$WXCONFIG_LIBS,;t t
+s,@WXCONFIG_LIBS_GL@,$WXCONFIG_LIBS_GL,;t t
+s,@WXCONFIG_LIBS_STATIC@,$WXCONFIG_LIBS_STATIC,;t t
+s,@WXCONFIG_LIBS_STATIC_GL@,$WXCONFIG_LIBS_STATIC_GL,;t t
+s,@WXCONFIG_INCLUDE@,$WXCONFIG_INCLUDE,;t t
+s,@WXCONFIG_RPATH@,$WXCONFIG_RPATH,;t t
+s,@WX_LARGEFILE_FLAGS@,$WX_LARGEFILE_FLAGS,;t t
+s,@CODE_GEN_FLAGS@,$CODE_GEN_FLAGS,;t t
+s,@CODE_GEN_FLAGS_CXX@,$CODE_GEN_FLAGS_CXX,;t t
+s,@ALL_OBJECTS@,$ALL_OBJECTS,;t t
+s,@ALL_HEADERS@,$ALL_HEADERS,;t t
+s,@ALL_SOURCES@,$ALL_SOURCES,;t t
+s,@GUIDIST@,$GUIDIST,;t t
+s,@PORT_FILES@,$PORT_FILES,;t t
+s,@DISTDIR@,$DISTDIR,;t t
+s,@SAMPLES_SUBDIRS@,$SAMPLES_SUBDIRS,;t t
+s,@LDFLAGS_GL@,$LDFLAGS_GL,;t t
+s,@LDFLAGS_VERSIONING@,$LDFLAGS_VERSIONING,;t t
+s,@LDFLAGS_EXE@,$LDFLAGS_EXE,;t t
+s,@OPENGL_LIBS@,$OPENGL_LIBS,;t t
+s,@DMALLOC_LIBS@,$DMALLOC_LIBS,;t t
+s,@WX_VERSION_TAG@,$WX_VERSION_TAG,;t t
+s,@RESFLAGS@,$RESFLAGS,;t t
+s,@RESPROGRAMOBJ@,$RESPROGRAMOBJ,;t t
+s,@WX_RESOURCES_MACOSX_ASCII@,$WX_RESOURCES_MACOSX_ASCII,;t t
+s,@WX_RESOURCES_MACOSX_DATA@,$WX_RESOURCES_MACOSX_DATA,;t t
+s,@MACOSX_BUNDLE@,$MACOSX_BUNDLE,;t t
+s,@LIBWXMACRES@,$LIBWXMACRES,;t t
+s,@MACRESCOMP@,$MACRESCOMP,;t t
+s,@MACSETFILE@,$MACSETFILE,;t t
+s,@MACRESWXCONFIG@,$MACRESWXCONFIG,;t t
+s,@GCC@,$GCC,;t t
+s,@DLLTOOL@,$DLLTOOL,;t t
+s,@AS@,$AS,;t t
+s,@NM@,$NM,;t t
+s,@LD@,$LD,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@INSTALL_LIBRARY@,$INSTALL_LIBRARY,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t

 CEOF
 CEOF

-EOF

 
 

-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false

     else
     else

-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+       ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+       ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`

     fi
     fi

-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat

   fi
   fi

-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
+fi # test -n "$CONFIG_FILES"

 
 

-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"wx-config
-            version-script
-            Makefile
-          "}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue

   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;

   esac
 
   esac
 

-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"

   else
   else

-    ac_dir_suffix= ac_dots=
-  fi
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.

 
 

-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;

   *) # Relative path.
   *) # Relative path.

-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`

 
 

-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac

 
 

-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;

   esac
 
   esac
 

-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
+
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+#
+# CONFIG_HEADER section.
+#

 
 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
 # NAME is the cpp macro being defined and VALUE is the value it is being given.
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
 
 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
 # NAME is the cpp macro being defined and VALUE is the value it is being given.
 #
 # ac_d sets the value in "#define NAME VALUE" lines.

-ac_dA='s%^\([  ]*\)#\([        ]*define[       ][      ]*\)'
-ac_dB='\([     ][      ]*\)[^  ]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([  ]*\)#\([        ]*\)undef\([    ][      ]*\)'
-ac_uB='\([     ]\)%\1#\2define\3'
+ac_dA='s,^\([  ]*\)#\([        ]*define[       ][      ]*\)'
+ac_dB='[       ].*$,\1#\2'
+ac_dC=' '
+ac_dD=',;t'
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_uA='s,^\([  ]*\)#\([        ]*\)undef\([    ][      ]*\)'
+ac_uB='$,\1#\2define\3'

 ac_uC=' '
 ac_uC=' '

-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([  ]*\)#\([        ]*\)undef\([    ][      ]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="setup.h:setup.h.in"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+ac_uD=',;t'
+
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue

   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;

   esac
 
   esac
 

-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
+  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+  # Remove the trailing spaces.
+  sed 's/[     ]*$//' $ac_file_inputs >$tmp/in
+
+_ACEOF
+
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
+# `conftest.undefs', that substitutes the proper values into
+# config.h.in to produce config.h.  The first handles `#define'
+# templates, and the second `#undef' templates.
+# And first: Protect against being on the right side of a sed subst in
+# config.status.  Protect against being in an unquoted here document
+# in config.status.
+rm -f conftest.defines conftest.undefs
+# Using a here document instead of a string reduces the quoting nightmare.
+# Putting comments in sed scripts is not portable.
+#
+# `end' is used to avoid that the second main sed command (meant for
+# 0-ary CPP macros) applies to n-ary macro definitions.
+# See the Autoconf documentation for `clear'.
+cat >confdef2sed.sed <<\_ACEOF
+s/[\\&,]/\\&/g
+s,[\\$`],\\&,g
+t clear
+: clear
+s,^[   ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+t end
+s,^[   ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+: end
+_ACEOF
+# If some macros were called several times there might be several times
+# the same #defines, which is useless.  Nevertheless, we may not want to
+# sort them, since we want the *last* AC-DEFINE to be honored.
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+rm -f confdef2sed.sed

 
 # This sed command replaces #undef with comments.  This is necessary, for
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
 
 # This sed command replaces #undef with comments.  This is necessary, for
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.

-cat >> conftest.vals <<\EOF
-s%^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
+cat >>conftest.undefs <<\_ACEOF
+s,^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+_ACEOF
+
+# Break up conftest.defines because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+echo '  if grep "^[    ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo '  :' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.defines >/dev/null
+do
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
+  echo '/^[    ]*#[    ]*define/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines
+echo '  fi # grep' >>$CONFIG_STATUS
+echo >>$CONFIG_STATUS

 
 

+# Break up conftest.undefs because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #undef templates' >>$CONFIG_STATUS

 rm -f conftest.tail
 rm -f conftest.tail

-while :
+while grep . conftest.undefs >/dev/null

 do
 do

-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+  # Write a limited-size here document to $tmp/undefs.sed.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#undef'
+  echo '/^[    ]*#[    ]*undef/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS

   echo 'CEOF
   echo 'CEOF

-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+  rm -f conftest.undefs
+  mv conftest.tail conftest.undefs

 done
 done

-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
+rm -f conftest.undefs
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    echo "/* Generated by configure.  */" >$tmp/config.h

   else
   else

-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h

   fi
   fi

-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
+  cat $tmp/in >>$tmp/config.h
+  rm -f $tmp/in
+  if test x"$ac_file" != x-; then
+    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+      { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }

 
 

-            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
-            LN_S="${LN_S}"
-          
-         
-EOF
-cat >> $CONFIG_STATUS <<\EOF
+      rm -f $ac_file
+      mv $tmp/config.h $ac_file
+    fi
+  else
+    cat $tmp/config.h
+    rm -f $tmp/config.h
+  fi
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF

 
 

+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_dest" : 'X\(//\)[^/]' \| \
+         X"$ac_dest" : 'X\(//\)$' \| \
+         X"$ac_dest" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    default )

                                                                                                 if test ! -h wx-config; then
                 chmod +x wx-config
                 mv wx-config wx${TOOLCHAIN_NAME}-config
                                                                                                 if test ! -h wx-config; then
                 chmod +x wx-config
                 mv wx-config wx${TOOLCHAIN_NAME}-config


@@ -24260,13 +36874,43 @@ cat >> $CONFIG_STATUS <<\EOF
             if test -f setup.h; then
               mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
             fi
             if test -f setup.h; then
               mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
             fi

-          
-exit 0
-EOF
+           ;;
+  esac
+done
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+{ (exit 0); exit 0; }
+_ACEOF

 chmod +x $CONFIG_STATUS
 chmod +x $CONFIG_STATUS

-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  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; }
+fi

 
 

+#
+# CONFIG_SUBDIRS section.
+#

 if test "$no_recursion" != yes; then
 
   # Remove --cache-file and --srcdir arguments so they do not pile up.
 if test "$no_recursion" != yes; then
 
   # Remove --cache-file and --srcdir arguments so they do not pile up.


@@ -24277,87 +36921,131 @@ if test "$no_recursion" != yes; then
       ac_prev=
       continue
     fi
       ac_prev=
       continue
     fi

-    case "$ac_arg" in
+    case $ac_arg in

     -cache-file | --cache-file | --cache-fil | --cache-fi \
     | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
       ac_prev=cache_file ;;
     -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
     -cache-file | --cache-file | --cache-fil | --cache-fi \
     | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
       ac_prev=cache_file ;;
     -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \

-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
+    | --c=*)
+      ;;
+    --config-cache | -C)

       ;;
     -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
       ac_prev=srcdir ;;
     -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
       ;;
       ;;
     -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
       ac_prev=srcdir ;;
     -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
       ;;

+    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+      ac_prev=prefix ;;
+    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+      ;;

     *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
     esac
   done
 
     *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
     esac
   done
 

-  for ac_config_dir in demos samples utils contrib; do
+  # Always prepend --prefix to ensure using the same prefix
+  # in subdir configurations.
+  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
+
+  ac_popdir=`pwd`
+  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue

 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.

-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
+    test -d $srcdir/$ac_dir || continue

 
 

-    echo configuring in $ac_config_dir
+    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
+echo "$as_me: configuring in $ac_dir" >&6;}
+    { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }

 
 

-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
+    ac_builddir=.

 
 

-    ac_popdir=`pwd`
-    cd $ac_config_dir
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`

 
 

-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`

 
 

-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
+    cd $ac_dir

 
     # Check for guested configure; otherwise get Cygnus style configure.
 
     # Check for guested configure; otherwise get Cygnus style configure.

-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
+    if test -f $ac_srcdir/configure.gnu; then
+      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
+    elif test -f $ac_srcdir/configure; then
+      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
+    elif test -f $ac_srcdir/configure.in; then

       ac_sub_configure=$ac_configure
     else
       ac_sub_configure=$ac_configure
     else

-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
+      { 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;}

       ac_sub_configure=
     fi
 
     # The recursion is here.
     if test -n "$ac_sub_configure"; then
       ac_sub_configure=
     fi
 
     # The recursion is here.
     if test -n "$ac_sub_configure"; then

-

       # Make the cache file name correct relative to the subdirectory.
       # Make the cache file name correct relative to the subdirectory.

-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
+      case $cache_file in
+      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;

       *) # Relative path.
       *) # Relative path.

-        ac_sub_cache_file="$ac_dots$cache_file" ;;
+        ac_sub_cache_file=$ac_top_builddir$cache_file ;;

       esac
       esac

-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac

 
 

-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}

       # The eval makes quoting arguments work.
       # The eval makes quoting arguments work.

-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
+      eval $ac_sub_configure $ac_sub_configure_args \
+           --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
+        { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+   { (exit 1); exit 1; }; }

     fi
 
     cd $ac_popdir
     fi
 
     cd $ac_popdir


@@ -24369,6 +37057,7 @@ echo
 echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
 echo ""
 echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"
 echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
 echo ""
 echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"

+echo "  Should wxWindows be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"

 
 echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
 
 echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"


@@ -24386,6 +37075,7 @@ echo "                                       regex              ${wxUSE_REGEX}"
 echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
 echo "                                       zlib               ${wxUSE_ZLIB}"
 echo "                                       odbc               ${wxUSE_ODBC}"
 echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
 echo "                                       zlib               ${wxUSE_ZLIB}"
 echo "                                       odbc               ${wxUSE_ODBC}"

+echo "                                       expat              ${wxUSE_EXPAT}"

 
 echo ""
 
 
 echo ""