cast correction Profiler

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 8a5938caedd8ecd95fcc5eac3f0be01f78c36d05..fe34f3fd4e1d299350bc023dd5c54c9c74f5f2a7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,158 +1,475 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in.
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.

 
 

-# 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
+# From configure.in Id: configure.in
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 

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

 
 

-# 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"

 
 

-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi

 
 

-# Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`

 
 

-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

 
 

-as_executable_p="test -f"

 
 

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

 
 

-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS="  $as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export 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

 
 

-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-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}

 
 

-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 demos samples utils contrib"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Configure paths for GTK+
+# Owen Taylor     1997-2001
+
+
+
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
+
+
+
+
+
+
+
+
+# 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=
+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"

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

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

 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


@@ -161,15 +478,10 @@ 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'


@@ -183,16 +495,17 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 

-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+# 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"


@@ -200,59 +513,59 @@ do
     continue
   fi
 
     continue
   fi
 

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

 
   # 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_alias ;;
+    ac_prev=build ;;

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

-    build_alias=$ac_optarg ;;
+    build="$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
+    cache_file="$ac_optarg" ;;

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

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

-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    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" ;;

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

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

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

-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+    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
+      *=*) ;;

       *) 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- \


@@ -261,47 +574,95 @@ 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 | -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 ;;
+  -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 ;;

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

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

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

-    host_alias=$ac_optarg ;;
+    host="$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 \


@@ -310,12 +671,12 @@ do
   -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.
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.


@@ -336,26 +697,26 @@ do
   -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 \


@@ -372,7 +733,7 @@ do
   | --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)


@@ -382,7 +743,7 @@ do
     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 \


@@ -393,57 +754,58 @@ do
   | --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_alias ;;
+    ac_prev=target ;;

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

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

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

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

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

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

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

-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
+    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'`
     ac_package=`echo $ac_package| sed 's/-/_/g'`

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

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

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

-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    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" ;;

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


@@ -454,98 +816,98 @@ do
     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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; 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 ;;
-

   *)
   *)

-    # 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}
+    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"

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

-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }

 fi
 
 fi
 

-# 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 path for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
+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
+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 bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir
+# 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

 do
 do

-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+  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" ;;

   esac
 done
 
   esac
 done
 

-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: should be removed in autoconf 3.0.
-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
+# 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

 
 

-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
+# 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

 
 

-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.
   ac_prog=$0
 
 # 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%[\\/][^\\/][^\\/]*$%%'`
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`

   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then
   test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
   srcdir=$ac_confdir
   if test ! -r $srcdir/$ac_unique_file; then


@@ -556,509 +918,13 @@ 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 "$as_me: error: cannot find sources in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }

   else
   else

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

   fi
 fi
   fi
 fi

-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
-
-#
-# 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 <<EOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-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 \`..']
-
-EOF
-
-  cat <<EOF
-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]
-EOF
-
-  cat <<\EOF
-
-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       build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-EOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\EOF
-
-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
-  --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-soname         set the DT_SONAME field in ELF shared libraries
-  --enable-optimise       create optimised code
-  --enable-debug          same as debug_flag and debug_info
-  --enable-precomp        enable use of precompiled headers (Mac OS X)
-  --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
-  --disable-compat22      disable wxWindows 2.2 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-ipc            use interprocess communication (wxSocket etc.)
-  --enable-cmdline        use wxCmdLineParser class
-  --enable-datetime       use wxDateTime class
-  --enable-timedate       use obsolete wxDate/wxTime classes
-  --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       use Prolog IO library
-  --enable-resources      use wxWindows resources
-  --enable-xresources     use X resources for save (default for gtk+)
-  --enable-clipboard      use wxClipboard classes
-  --enable-dnd            use Drag'n'Drop classes
-  --enable-metafile       use win32 metafiles
-  --enable-treelayout     use wxTreeLayout classes
-  --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 classes
-  --enable-gauge          use wxGauge class
-  --enable-grid           use wxGrid class
-  --enable-newgrid        use new wxGrid class
-  --enable-imaglist       use wxImageList class
-  --enable-listbox        use wxListBox class
-  --enable-listctrl       use wxListCtrl class
-  --enable-notebook       use wxNotebook class
-  --enable-propsheet      use wxPropertySheet 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-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
-  --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-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-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.
-
-EOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
-    cd $ac_subdir
-    # A "../" for each directory in /$ac_subdir.
-    ac_dots=`echo $ac_subdir |
-             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
-
-    case $srcdir in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    [\\/]* | ?:[\\/]* ) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_subdir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_sub_srcdir/configure; then
-      echo
-      $SHELL $ac_sub_srcdir/configure  --help=recursive
-    elif test -f $ac_sub_srcdir/configure.ac ||
-           test -f $ac_sub_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\EOF
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-EOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<EOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`

 
 

-It was created by $as_me, which was
-generated by GNU Autoconf 2.52.  Invocation command line was
-
-  $ $0 $@
-
-EOF
-{
-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`
-
-PATH = $PATH
-
-_ASUNAME
-} >&5
-
-cat >&5 <<EOF
-## ------------ ##
-## Core tests.  ##
-## ------------ ##
-
-EOF
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell meta-characters.
-ac_configure_args=
-ac_sep=
-for ac_arg
-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_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
-    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-    ac_sep=" " ;;
-  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
-     ac_sep=" " ;;
-  esac
-  # Get rid of the leading space.
-done
-
-# 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.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  echo >&5
-  echo "## ----------------- ##" >&5
-  echo "## Cache variables.  ##" >&5
-  echo "## ----------------- ##" >&5
-  echo >&5
-  # 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;
-} >&5
-  sed "/^$/d" confdefs.h >conftest.log
-  if test -s conftest.log; then
-    echo >&5
-    echo "## ------------ ##" >&5
-    echo "## confdefs.h.  ##" >&5
-    echo "## ------------ ##" >&5
-    echo >&5
-    cat conftest.log >&5
-  fi
-  (echo; echo) >&5
-  test "$ac_signal" != 0 &&
-    echo "$as_me: caught signal $ac_signal" >&5
-  echo "$as_me: exit $exit_status" >&5
-  rm -rf conftest* confdefs* core core.* *.core 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
-
-# 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
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then


@@ -1069,107 +935,41 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then

-    { echo "$as_me:1072: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    cat "$ac_site_file" >&5
+    echo "loading site script $ac_site_file"

     . "$ac_site_file"
   fi
 done
 
 if test -r "$cache_file"; then
     . "$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:1083: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
+  echo "loading cache $cache_file"
+  . $cache_file

 else
 else

-  { echo "$as_me:1091: 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:1107: 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:1111: 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:1117: 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:1119:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1121:   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.  It doesn't matter if
-  # we pass some twice (in addition to the command line arguments).
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"   "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
-       ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:1140: 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:1142: 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; }; }
+  echo "creating cache $cache_file"
+  > $cache_file

 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 -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
-
-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
-echo "#! $SHELL" >conftest.sh
-echo  "exit 0"   >>conftest.sh
-chmod +x conftest.sh
-if { (echo "$as_me:1162: PATH=\".;.\"; conftest.sh") >&5
-  (PATH=".;."; conftest.sh) 2>&5
-  ac_status=$?
-  echo "$as_me:1165: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  ac_path_separator=';'
+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
 else

-  ac_path_separator=:
+  ac_n= ac_c='\c' ac_t=

 fi
 fi

-PATH_SEPARATOR="$ac_path_separator"
-rm -f conftest.sh
+
+

 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
 
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do


@@ -1181,152 +981,153 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break

-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break

   fi
 done
 if test -z "$ac_aux_dir"; then
   fi
 done
 if test -z "$ac_aux_dir"; then

-  { { echo "$as_me:1191: 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; }; }
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }

 fi
 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.
+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.

 
 

-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1201: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:1205: 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:1214: 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:1218: 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:1223: 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/'`
-
-test -z "$build_alias" &&
-  build_alias=$ac_cv_build
-
-echo "$as_me:1233: 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:1242: 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:1247: 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/'`
-
-test -z "$host_alias" &&
-  host_alias=$ac_cv_host
-
-echo "$as_me:1257: 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:1266: 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:1271: 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/'`
+
+# 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.
 
 # 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 -z "$target_alias" &&
-  target_alias=$ac_cv_target
+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

 
 

-WX_MAJOR_VERSION_NUMBER=2
-WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=3

 
 

-WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
-WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
+# 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:1022: 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

 
 

-WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
+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:1043: 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

 
 

-WX_CURRENT=2
+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:1061: 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" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+
+
+WX_MAJOR_VERSION_NUMBER=2
+WX_MINOR_VERSION_NUMBER=5
+WX_RELEASE_NUMBER=0
+
+WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
+WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
+
+WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
+
+WX_CURRENT=0

 WX_REVISION=0
 WX_AGE=0
 
 WX_REVISION=0
 WX_AGE=0
 

+
+

 USE_UNIX=1
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 
 USE_UNIX=1
 USE_WIN32=0
 USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 

-USE_LINUX=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=

 USE_AIX=
 USE_AIX=

-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=

 USE_BSD=
 USE_DARWIN=
 USE_FREEBSD=
 USE_BSD=
 USE_DARWIN=
 USE_FREEBSD=

-USE_OPENBSD=
+USE_HPUX=
+USE_LINUX=

 USE_NETBSD=
 USE_NETBSD=

+USE_OPENBSD=
+USE_OSF=
+USE_SGI=
+USE_SOLARIS=
+USE_SUN=
+USE_SUNOS=
+USE_SVR4=
+USE_SYSV=

 USE_VMS=
 USE_ULTRIX=
 USE_VMS=
 USE_ULTRIX=

-USE_DATA_GENERAL=
+USE_UNIXWARE=
+
+USE_ALPHA=

 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 

-ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE X11"
+ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11"

 
 

+DEFAULT_wxUSE_COCOA=0

 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_MAC=0
 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_MAC=0
 DEFAULT_wxUSE_MGL=0


@@ -1334,9 +1135,9 @@ DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_PM=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_PM=0

-DEFAULT_wxUSE_WINE=0

 DEFAULT_wxUSE_X11=0
 
 DEFAULT_wxUSE_X11=0
 

+DEFAULT_DEFAULT_wxUSE_COCOA=0

 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_MAC=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_MAC=0
 DEFAULT_DEFAULT_wxUSE_MGL=0


@@ -1344,7 +1145,6 @@ DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_PM=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_PM=0

-DEFAULT_DEFAULT_wxUSE_WINE=0

 DEFAULT_DEFAULT_wxUSE_X11=0
 
 PROGRAM_EXT=
 DEFAULT_DEFAULT_wxUSE_X11=0
 
 PROGRAM_EXT=


@@ -1356,21 +1156,21 @@ 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 <<\EOF

 #define __HPUX__ 1
 EOF
 
   ;;
   *-*-linux* )
     USE_LINUX=1
 #define __HPUX__ 1
 EOF
 
   ;;
   *-*-linux* )
     USE_LINUX=1

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

 #define __LINUX__ 1
 EOF
 
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1
 #define __LINUX__ 1
 EOF
 
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1

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

 #define __ALPHA__ 1
 EOF
 
 #define __ALPHA__ 1
 EOF
 


@@ -1380,11 +1180,11 @@ EOF
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
     USE_SVR4=1
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
     USE_SVR4=1

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

 #define __SGI__ 1
 EOF
 
 #define __SGI__ 1
 EOF
 

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

 #define __SVR4__ 1
 EOF
 
 #define __SVR4__ 1
 EOF
 


@@ -1394,15 +1194,15 @@ 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 <<\EOF

 #define __SUN__ 1
 EOF
 
 #define __SUN__ 1
 EOF
 

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

 #define __SOLARIS__ 1
 EOF
 
 #define __SOLARIS__ 1
 EOF
 

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

 #define __SVR4__ 1
 EOF
 
 #define __SVR4__ 1
 EOF
 


@@ -1413,15 +1213,15 @@ 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 <<\EOF

 #define __SUN__ 1
 EOF
 
 #define __SUN__ 1
 EOF
 

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

 #define __SUNOS__ 1
 EOF
 
 #define __SUNOS__ 1
 EOF
 

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

 #define __BSD__ 1
 EOF
 
 #define __BSD__ 1
 EOF
 


@@ -1430,11 +1230,11 @@ EOF
   *-*-freebsd*)
     USE_BSD=1
     USE_FREEBSD=1
   *-*-freebsd*)
     USE_BSD=1
     USE_FREEBSD=1

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

 #define __FREEBSD__ 1
 EOF
 
 #define __FREEBSD__ 1
 EOF
 

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

 #define __BSD__ 1
 EOF
 
 #define __BSD__ 1
 EOF
 


@@ -1443,12 +1243,12 @@ EOF
   *-*-openbsd*)
     USE_BSD=1
     USE_OPENBSD=1
   *-*-openbsd*)
     USE_BSD=1
     USE_OPENBSD=1

-    cat >>confdefs.h <<\EOF
-#define __FREEBSD__ 1
+    cat >> confdefs.h <<\EOF
+#define __OPENBSD__ 1

 EOF
 
 EOF
 

-    cat >>confdefs.h <<\EOF
-#define __OPENBSD__ 1
+    cat >> confdefs.h <<\EOF
+#define __BSD__ 1

 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1


@@ -1456,12 +1256,12 @@ EOF
   *-*-netbsd*)
     USE_BSD=1
     USE_NETBSD=1
   *-*-netbsd*)
     USE_BSD=1
     USE_NETBSD=1

-    cat >>confdefs.h <<\EOF
-#define __FREEBSD__ 1
+    cat >> confdefs.h <<\EOF
+#define __NETBSD__ 1

 EOF
 
 EOF
 

-    cat >>confdefs.h <<\EOF
-#define __NETBSD__ 1
+    cat >> confdefs.h <<\EOF
+#define __BSD__ 1

 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1


@@ -1469,11 +1269,11 @@ EOF
   *-*-osf* )
     USE_ALPHA=1
     USE_OSF=1
   *-*-osf* )
     USE_ALPHA=1
     USE_OSF=1

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

 #define __ALPHA__ 1
 EOF
 
 #define __ALPHA__ 1
 EOF
 

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

 #define __OSF__ 1
 EOF
 
 #define __OSF__ 1
 EOF
 


@@ -1483,11 +1283,11 @@ EOF
   *-*-dgux5* )
     USE_ALPHA=1
     USE_SVR4=1
   *-*-dgux5* )
     USE_ALPHA=1
     USE_SVR4=1

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

 #define __ALPHA__ 1
 EOF
 
 #define __ALPHA__ 1
 EOF
 

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

 #define __SVR4__ 1
 EOF
 
 #define __SVR4__ 1
 EOF
 


@@ -1496,11 +1296,11 @@ EOF
   *-*-sysv5* )
     USE_SYSV=1
     USE_SVR4=1
   *-*-sysv5* )
     USE_SYSV=1
     USE_SVR4=1

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

 #define __SYSV__ 1
 EOF
 
 #define __SYSV__ 1
 EOF
 

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

 #define __SVR4__ 1
 EOF
 
 #define __SVR4__ 1
 EOF
 


@@ -1510,22 +1310,32 @@ EOF
     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1
     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1

-            SO_SUFFIX=a
-    cat >>confdefs.h <<\EOF
+                        SO_SUFFIX=a
+    cat >> confdefs.h <<\EOF

 #define __AIX__ 1
 EOF
 
 #define __AIX__ 1
 EOF
 

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

 #define __SYSV__ 1
 EOF
 
 #define __SYSV__ 1
 EOF
 

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

 #define __SVR4__ 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
 #define __SVR4__ 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 

+  *-*-*UnixWare*)
+    USE_SYSV=1
+    USE_SVR4=1
+    USE_UNIXWARE=1
+    cat >> confdefs.h <<\EOF
+#define __UNIXWARE__ 1
+EOF
+
+  ;;
+

   *-*-cygwin* | *-*-mingw32* )
                 SO_SUFFIX=dll
     PROGRAM_EXT=".exe"
   *-*-cygwin* | *-*-mingw32* )
                 SO_SUFFIX=dll
     PROGRAM_EXT=".exe"


@@ -1536,7 +1346,7 @@ EOF
   *-pc-msdosdjgpp )
     USE_UNIX=0
     USE_DOS=1
   *-pc-msdosdjgpp )
     USE_UNIX=0
     USE_DOS=1

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

 #define __DOS__ 1
 EOF
 
 #define __DOS__ 1
 EOF
 


@@ -1546,29 +1356,32 @@ EOF
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )

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

 #define __EMX__ 1
 EOF
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
 #define __EMX__ 1
 EOF
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1

-    LIBS="$LIBS -lstdcpp"

   ;;
 
   powerpc-*-darwin* )
         USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib
   ;;
 
   powerpc-*-darwin* )
         USE_BSD=1
     USE_DARWIN=1
     SO_SUFFIX=dylib

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

 #define __BSD__ 1
 EOF
 
 #define __BSD__ 1
 EOF
 

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

 #define __DARWIN__ 1
 EOF
 
 #define __DARWIN__ 1
 EOF
 

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

 #define __POWERPC__ 1
 #define __POWERPC__ 1

+EOF
+
+    cat >> confdefs.h <<\EOF
+#define TARGET_CARBON 1

 EOF
 
     DEFAULT_DEFAULT_wxUSE_MAC=1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MAC=1


@@ -1576,23 +1389,25 @@ EOF
 
   *-*-beos* )
         USE_BEOS=1
 
   *-*-beos* )
         USE_BEOS=1

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

 #define __BEOS__ 1
 EOF
 
   ;;
 
   *)
 #define __BEOS__ 1
 EOF
 
   ;;
 
   *)

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

 esac
 
 esac
 

+
+
+

           wx_arg_cache_file="configarg.cache"
           echo "loading argument cache $wx_arg_cache_file"
           rm -f ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}
           wx_arg_cache_file="configarg.cache"
           echo "loading argument cache $wx_arg_cache_file"
           rm -f ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}.tmp
           touch ${wx_arg_cache_file}

+        

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


@@ -1640,7 +1455,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_CMDLINE_PARSER=no
   DEFAULT_wxUSE_DATETIME=no
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_CMDLINE_PARSER=no
   DEFAULT_wxUSE_DATETIME=no

-  DEFAULT_wxUSE_TIMEDATE=no

   DEFAULT_wxUSE_TIMER=no
   DEFAULT_wxUSE_STOPWATCH=no
   DEFAULT_wxUSE_FILE=no
   DEFAULT_wxUSE_TIMER=no
   DEFAULT_wxUSE_STOPWATCH=no
   DEFAULT_wxUSE_FILE=no


@@ -1653,6 +1467,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FONTMAP=no
   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_FONTMAP=no
   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no

+  DEFAULT_wxUSE_OLE=no
+  DEFAULT_wxUSE_DATAOBJ=no

   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_DYNLIB_CLASS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_DYNLIB_CLASS=no


@@ -1664,7 +1480,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
   DEFAULT_wxUSE_POSTSCRIPT=no
 
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
   DEFAULT_wxUSE_POSTSCRIPT=no
 

-  DEFAULT_wxUSE_X_RESOURCES=no

   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no
   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no


@@ -1675,7 +1490,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
   DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
 
   DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
   DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
 

-  DEFAULT_wxUSE_PROLOGIO=no

   DEFAULT_wxUSE_RESOURCES=no
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_RESOURCES=no
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no


@@ -1726,14 +1540,13 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CHECKLST=no
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_CHECKLST=no
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_COMBOBOX=no

+  DEFAULT_wxUSE_DISPLAY=no

   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no

-  DEFAULT_wxUSE_NEW_GRID=no

   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no

-  DEFAULT_wxUSE_PROPSHEET=no

   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no


@@ -1769,6 +1582,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_IFF=no
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no
   DEFAULT_wxUSE_IFF=no
   DEFAULT_wxUSE_XPM=no
   DEFAULT_wxUSE_ICO_CUR=no

+  DEFAULT_wxUSE_ACCESSIBILITY=no

 else
   DEFAULT_wxUSE_UNIVERSAL=no
 
 else
   DEFAULT_wxUSE_UNIVERSAL=no
 


@@ -1813,7 +1627,6 @@ else
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes

-  DEFAULT_wxUSE_TIMEDATE=no

   DEFAULT_wxUSE_TIMER=yes
   DEFAULT_wxUSE_STOPWATCH=yes
   DEFAULT_wxUSE_FILE=yes
   DEFAULT_wxUSE_TIMER=yes
   DEFAULT_wxUSE_STOPWATCH=yes
   DEFAULT_wxUSE_FILE=yes


@@ -1826,6 +1639,8 @@ else
   DEFAULT_wxUSE_FONTMAP=yes
   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_FONTMAP=yes
   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes

+  DEFAULT_wxUSE_OLE=yes
+  DEFAULT_wxUSE_DATAOBJ=yes

   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes


@@ -1837,7 +1652,6 @@ else
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
   DEFAULT_wxUSE_POSTSCRIPT=yes
 
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
   DEFAULT_wxUSE_POSTSCRIPT=yes
 

-  DEFAULT_wxUSE_X_RESOURCES=no

   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes
   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes


@@ -1848,8 +1662,7 @@ else
   DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
   DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
 
   DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
   DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
 

-  DEFAULT_wxUSE_PROLOGIO=yes
-  DEFAULT_wxUSE_RESOURCES=yes
+  DEFAULT_wxUSE_RESOURCES=no

   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes


@@ -1899,14 +1712,13 @@ else
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_COMBOBOX=yes

+  DEFAULT_wxUSE_DISPLAY=no

   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes

-  DEFAULT_wxUSE_NEW_GRID=yes

   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes

-  DEFAULT_wxUSE_PROPSHEET=yes

   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes


@@ -1942,32 +1754,38 @@ else
   DEFAULT_wxUSE_PNM=yes
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes
   DEFAULT_wxUSE_PNM=yes
   DEFAULT_wxUSE_XPM=yes
   DEFAULT_wxUSE_ICO_CUR=yes

+  DEFAULT_wxUSE_ACCESSIBILITY=no

 fi
 
 fi
 

+
+

 for toolkit in `echo $ALL_TOOLKITS`; do
 for toolkit in `echo $ALL_TOOLKITS`; do

-  LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}`
-  if test "x$LINE" != x ; then
+  LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
+  if test "x$LINE" != "x" ; then

     has_toolkit_in_cache=1
     eval "DEFAULT_$LINE"
     eval "CACHE_$toolkit=1"
   fi
 done
 
     has_toolkit_in_cache=1
     eval "DEFAULT_$LINE"
     eval "CACHE_$toolkit=1"
   fi
 done
 

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

           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"


@@ -1976,8 +1794,9 @@ 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


@@ -1985,30 +1804,31 @@ fi;
           fi
 
           if test "$wxUSE_GUI" = yes; then
           fi
 
           if test "$wxUSE_GUI" = yes; then

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

           else
           else

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

           fi
           fi

+        

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

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

           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"


@@ -2017,8 +1837,9 @@ 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


@@ -2026,82 +1847,88 @@ fi;
           fi
 
           if test "$wxUSE_UNIVERSAL" = yes; then
           fi
 
           if test "$wxUSE_UNIVERSAL" = yes; then

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

           else
           else

-            echo "$as_me:2032: result: no" >&5
-echo "${ECHO_T}no" >&6
+            echo "$ac_t""no" 1>&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
+fi

 
 # Check whether --with-wine or --without-wine was given.
 if test "${with_wine+set}" = set; then
   withval="$with_wine"
 
 # 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 TOOLKIT_GIVEN=1
-fi;
+  wxUSE_WINE="$withval" CACHE_WINE=1
+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

 
 

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

           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"


@@ -2110,8 +1937,9 @@ 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


@@ -2119,29 +1947,61 @@ fi;
           fi
 
           if test "$wxUSE_NANOX" = yes; then
           fi
 
           if test "$wxUSE_NANOX" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

-# Check whether --enable-gtk2 or --disable-gtk2 was given.
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-gtk2""... $ac_c" 1>&6
+echo "configure:1960: checking for --${enablestring:-enable}-gtk2" >&5
+          no_cache=0
+          # Check whether --enable-gtk2 or --disable-gtk2 was given.

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

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

 else
 else

-  wxUSE_GTK2="no"
-fi;
+  
+                          LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
+                        
+fi

 
 

-          echo "$as_me:2137: checking for --with-libpng" >&5
-echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6
-          no_cache=0

 
 

-# Check whether --with-libpng or --without-libpng was given.
+          eval "$ac_cv_use_gtk2"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GTK2" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:2000: checking for --with-libpng" >&5
+          no_cache=0
+          # 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


@@ -2151,13 +2011,11 @@ 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 "$as_me:2154: 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; }; }
+                          { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; 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"


@@ -2166,8 +2024,9 @@ 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


@@ -2175,31 +2034,25 @@ fi;
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then

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

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

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

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

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

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

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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


@@ -2209,13 +2062,11 @@ 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 "$as_me:2212: 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; }; }
+                          { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; 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"


@@ -2224,8 +2075,9 @@ 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


@@ -2233,31 +2085,25 @@ fi;
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then

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

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

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

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

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

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

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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


@@ -2267,13 +2113,11 @@ 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 "$as_me:2270: 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; }; }
+                          { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; 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"


@@ -2282,8 +2126,9 @@ 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


@@ -2291,39 +2136,33 @@ fi;
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then

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

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

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

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

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

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

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -2332,8 +2171,9 @@ 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


@@ -2341,31 +2181,30 @@ fi;
           fi
 
           if test "$wxUSE_OPENGL" = yes; then
           fi
 
           if test "$wxUSE_OPENGL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 fi
 
 
 fi
 

-          echo "$as_me:2353: checking for --with-dmalloc" >&5
-echo $ECHO_N "checking for --with-dmalloc... $ECHO_C" >&6
-          no_cache=0

 
 

-# Check whether --with-dmalloc or --without-dmalloc was given.
+          echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2195: checking for --with-dmalloc" >&5
+          no_cache=0
+          # 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"


@@ -2374,8 +2213,9 @@ 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


@@ -2383,21 +2223,19 @@ fi;
           fi
 
           if test "$wxUSE_DMALLOC" = yes; then
           fi
 
           if test "$wxUSE_DMALLOC" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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


@@ -2407,13 +2245,11 @@ 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 "$as_me:2410: 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; }; }
+                          { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; 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"


@@ -2422,8 +2258,9 @@ 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


@@ -2431,31 +2268,25 @@ fi;
           fi
 
           if test "$wxUSE_REGEX" = yes; then
           fi
 
           if test "$wxUSE_REGEX" = yes; then

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

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

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

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

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

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

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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


@@ -2465,13 +2296,11 @@ 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 "$as_me:2468: 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; }; }
+                          { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; 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"


@@ -2480,8 +2309,9 @@ 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


@@ -2489,39 +2319,39 @@ fi;
           fi
 
           if test "$wxUSE_ZLIB" = yes; then
           fi
 
           if test "$wxUSE_ZLIB" = yes; then

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

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

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

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

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

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

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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'
                         if test "$withval" = yes; then
                           ac_cv_use_odbc='wxUSE_ODBC=yes'

-                        else
+                        elif test "$withval" = no; then

                           ac_cv_use_odbc='wxUSE_ODBC=no'
                           ac_cv_use_odbc='wxUSE_ODBC=no'

+                        elif test "$withval" = sys; then
+                          ac_cv_use_odbc='wxUSE_ODBC=sys'
+                        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; }

                         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"


@@ -2530,8 +2360,9 @@ 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


@@ -2539,28 +2370,36 @@ fi;
           fi
 
           if test "$wxUSE_ODBC" = yes; then
           fi
 
           if test "$wxUSE_ODBC" = yes; then

-            echo "$as_me:2542: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_ODBC" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_ODBC" = sys; then
+            echo "$ac_t""system version" 1>&6
+          elif test "$wxUSE_ODBC" = builtin; then
+            echo "$ac_t""builtin version" 1>&6

           else
           else

-            echo "$as_me:2545: result: no" >&5
-echo "${ECHO_T}no" >&6
+            { echo "configure: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" 1>&2; exit 1; }

           fi
           fi

+        
+

 
 

-          echo "$as_me:2549: checking for --enable-shared" >&5
-echo $ECHO_N "checking for --enable-shared... $ECHO_C" >&6
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-shared""... $ac_c" 1>&6
+echo "configure:2390: checking for --${enablestring:-enable}-shared" >&5

           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"


@@ -2569,8 +2408,9 @@ 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


@@ -2578,28 +2418,28 @@ fi;
           fi
 
           if test "$wxUSE_SHARED" = yes; then
           fi
 
           if test "$wxUSE_SHARED" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2588: checking for --enable-soname" >&5
-echo $ECHO_N "checking for --enable-soname... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-soname""... $ac_c" 1>&6
+echo "configure:2430: 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"
           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
                           if test "$enableval" = yes; then
                             ac_cv_use_soname='wxUSE_SONAME=yes'
                           else
                             ac_cv_use_soname='wxUSE_SONAME=no'
                           fi

-
+                        

 else
 else

-
+  

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


@@ -2608,8 +2448,9 @@ else
                           fi
 
                           ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME
                           fi
 
                           ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME

+                        
+fi

 
 

-fi;

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


@@ -2617,28 +2458,28 @@ fi;
           fi
 
           if test "$wxUSE_SONAME" = yes; then
           fi
 
           if test "$wxUSE_SONAME" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2627: checking for --enable-optimise" >&5
-echo $ECHO_N "checking for --enable-optimise... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-optimise""... $ac_c" 1>&6
+echo "configure:2470: checking for --${enablestring:-enable}-optimise" >&5

           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"


@@ -2647,8 +2488,9 @@ 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


@@ -2656,28 +2498,28 @@ fi;
           fi
 
           if test "$wxUSE_OPTIMISE" = yes; then
           fi
 
           if test "$wxUSE_OPTIMISE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2666: checking for --enable-debug" >&5
-echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug""... $ac_c" 1>&6
+echo "configure:2510: checking for --${enablestring:-enable}-debug" >&5

           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"


@@ -2686,8 +2528,9 @@ 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


@@ -2695,28 +2538,29 @@ fi;
           fi
 
           if test "$wxUSE_DEBUG" = yes; then
           fi
 
           if test "$wxUSE_DEBUG" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

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

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

-
+  

                           if test "$enableval" = yes; then
                             ac_cv_use_precomp='wxUSE_PRECOMP=yes'
                           else
                             ac_cv_use_precomp='wxUSE_PRECOMP=no'
                           fi
                           if test "$enableval" = yes; then
                             ac_cv_use_precomp='wxUSE_PRECOMP=yes'
                           else
                             ac_cv_use_precomp='wxUSE_PRECOMP=no'
                           fi

-
+                        

 else
 else

-
+  

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


@@ -2725,8 +2569,9 @@ else
                           fi
 
                           ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP
                           fi
 
                           ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP

+                        
+fi

 
 

-fi;

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


@@ -2734,12 +2579,11 @@ fi;
           fi
 
           if test "$wxUSE_PRECOMP" = yes; then
           fi
 
           if test "$wxUSE_PRECOMP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes
 
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes


@@ -2749,21 +2593,23 @@ elif test "$wxUSE_DEBUG" = "no"; then
   DEFAULT_wxUSE_DEBUG_INFO=no
 fi
 
   DEFAULT_wxUSE_DEBUG_INFO=no
 fi
 

-          echo "$as_me:2752: checking for --enable-debug_flag" >&5
-echo $ECHO_N "checking for --enable-debug_flag... $ECHO_C" >&6
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_flag""... $ac_c" 1>&6
+echo "configure:2600: checking for --${enablestring:-enable}-debug_flag" >&5

           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"


@@ -2772,8 +2618,9 @@ 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


@@ -2781,28 +2628,28 @@ fi;
           fi
 
           if test "$wxUSE_DEBUG_FLAG" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_FLAG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2791: checking for --enable-debug_info" >&5
-echo $ECHO_N "checking for --enable-debug_info... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_info""... $ac_c" 1>&6
+echo "configure:2640: checking for --${enablestring:-enable}-debug_info" >&5

           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"


@@ -2811,8 +2658,9 @@ 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


@@ -2820,28 +2668,28 @@ fi;
           fi
 
           if test "$wxUSE_DEBUG_INFO" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_INFO" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2830: checking for --enable-debug_gdb" >&5
-echo $ECHO_N "checking for --enable-debug_gdb... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_gdb""... $ac_c" 1>&6
+echo "configure:2680: checking for --${enablestring:-enable}-debug_gdb" >&5

           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"


@@ -2850,8 +2698,9 @@ 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


@@ -2859,28 +2708,28 @@ fi;
           fi
 
           if test "$wxUSE_DEBUG_GDB" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_GDB" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2869: checking for --enable-debug_cntxt" >&5
-echo $ECHO_N "checking for --enable-debug_cntxt... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2720: checking for --${enablestring:-enable}-debug_cntxt" >&5

           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"


@@ -2889,8 +2738,9 @@ 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


@@ -2898,28 +2748,28 @@ fi;
           fi
 
           if test "$wxUSE_DEBUG_CONTEXT" = yes; then
           fi
 
           if test "$wxUSE_DEBUG_CONTEXT" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2908: checking for --enable-mem_tracing" >&5
-echo $ECHO_N "checking for --enable-mem_tracing... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mem_tracing""... $ac_c" 1>&6
+echo "configure:2760: checking for --${enablestring:-enable}-mem_tracing" >&5

           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"


@@ -2928,8 +2778,9 @@ 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


@@ -2937,28 +2788,28 @@ fi;
           fi
 
           if test "$wxUSE_MEM_TRACING" = yes; then
           fi
 
           if test "$wxUSE_MEM_TRACING" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -2967,8 +2818,9 @@ 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


@@ -2976,28 +2828,28 @@ fi;
           fi
 
           if test "$wxUSE_PROFILE" = yes; then
           fi
 
           if test "$wxUSE_PROFILE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:2986: checking for --enable-no_rtti" >&5
-echo $ECHO_N "checking for --enable-no_rtti... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-no_rtti""... $ac_c" 1>&6
+echo "configure:2840: checking for --${enablestring:-enable}-no_rtti" >&5

           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"


@@ -3006,8 +2858,9 @@ 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


@@ -3015,28 +2868,28 @@ fi;
           fi
 
           if test "$wxUSE_NO_RTTI" = yes; then
           fi
 
           if test "$wxUSE_NO_RTTI" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:3025: checking for --enable-no_exceptions" >&5
-echo $ECHO_N "checking for --enable-no_exceptions... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-no_exceptions""... $ac_c" 1>&6
+echo "configure:2880: checking for --${enablestring:-enable}-no_exceptions" >&5

           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"


@@ -3045,8 +2898,9 @@ 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


@@ -3054,28 +2908,28 @@ fi;
           fi
 
           if test "$wxUSE_NO_EXCEPTIONS" = yes; then
           fi
 
           if test "$wxUSE_NO_EXCEPTIONS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3084,8 +2938,9 @@ 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


@@ -3093,28 +2948,28 @@ fi;
           fi
 
           if test "$wxUSE_PERMISSIVE" = yes; then
           fi
 
           if test "$wxUSE_PERMISSIVE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:3103: checking for --enable-no_deps" >&5
-echo $ECHO_N "checking for --enable-no_deps... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-no_deps""... $ac_c" 1>&6
+echo "configure:2960: checking for --${enablestring:-enable}-no_deps" >&5

           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"


@@ -3123,8 +2978,9 @@ 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


@@ -3132,28 +2988,29 @@ fi;
           fi
 
           if test "$wxUSE_NO_DEPS" = yes; then
           fi
 
           if test "$wxUSE_NO_DEPS" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

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

           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"


@@ -3162,8 +3019,9 @@ 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


@@ -3171,28 +3029,28 @@ fi;
           fi
 
           if test "$WXWIN_COMPATIBILITY_2" = yes; then
           fi
 
           if test "$WXWIN_COMPATIBILITY_2" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3201,8 +3059,9 @@ 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


@@ -3210,77 +3069,122 @@ fi;
           fi
 
           if test "$WXWIN_COMPATIBILITY_2_2" = yes; then
           fi
 
           if test "$WXWIN_COMPATIBILITY_2_2" = yes; then

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

           else
           else

-            echo "$as_me:3216: result: no" >&5
-echo "${ECHO_T}no" >&6
+            echo "$ac_t""no" 1>&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"
-fi;
-
-if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
-   WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
-fi
-
-          echo "$as_me:3230: checking for --enable-intl" >&5
-echo $ECHO_N "checking for --enable-intl... $ECHO_C" >&6
+         enablestring=disable
+          echo $ac_n "checking for --${enablestring:-enable}-compat24""... $ac_c" 1>&6
+echo "configure:3081: checking for --${enablestring:-enable}-compat24" >&5

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_intl='wxUSE_INTL=yes'
+                            ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes'

                           else
                           else

-                            ac_cv_use_intl='wxUSE_INTL=no'
+                            ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no'

                           fi
                           fi

-
+                        

 else
 else

-
-                          LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}`
+  
+                          LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${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_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL
+                          ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4
+                        
+fi

 
 

-fi;

 
 

-          eval "$ac_cv_use_intl"
+          eval "$ac_cv_use_compat24"

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

-            echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_compat24 >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_INTL" = yes; then
-            echo "$as_me:3262: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+          if test "$WXWIN_COMPATIBILITY_2_4" = yes; then
+            echo "$ac_t""yes" 1>&6

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:3269: checking for --enable-config" >&5
-echo $ECHO_N "checking for --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"
+# Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  wxRPATH_DIR="$enableval"
+fi
+
+
+if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
+   WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
+fi
+
+
+
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6
+echo "configure:3135: checking for --${enablestring:-enable}-intl" >&5
+          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
+                        
+else
+  
+                          LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL
+                        
+fi
+
+
+          eval "$ac_cv_use_intl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp
+          fi

 
 

+          if test "$wxUSE_INTL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6
+echo "configure:3175: checking for --${enablestring:-enable}-config" >&5
+          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"


@@ -3289,8 +3193,9 @@ 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


@@ -3298,28 +3203,29 @@ fi;
           fi
 
           if test "$wxUSE_CONFIG" = yes; then
           fi
 
           if test "$wxUSE_CONFIG" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

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

           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"


@@ -3328,8 +3234,9 @@ 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


@@ -3337,28 +3244,28 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3367,8 +3274,9 @@ 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


@@ -3376,28 +3284,28 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3406,8 +3314,9 @@ 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


@@ -3415,28 +3324,28 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3445,8 +3354,9 @@ 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


@@ -3454,28 +3364,28 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3484,8 +3394,9 @@ 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


@@ -3493,28 +3404,109 @@ fi;
           fi
 
           if test "$wxUSE_SOCKETS" = yes; then
           fi
 
           if test "$wxUSE_SOCKETS" = yes; then

-            echo "$as_me:3496: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6
+echo "configure:3416: checking for --${enablestring:-enable}-ole" >&5
+          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
+                        
+else
+  
+                          LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE
+                        
+fi
+
+
+          eval "$ac_cv_use_ole"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_OLE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6
+echo "configure:3456: checking for --${enablestring:-enable}-dataobj" >&5
+          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
+                        
+else
+  
+                          LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ
+                        
+fi
+
+
+          eval "$ac_cv_use_dataobj"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DATAOBJ" = yes; then
+            echo "$ac_t""yes" 1>&6

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3523,8 +3515,9 @@ 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


@@ -3532,28 +3525,29 @@ fi;
           fi
 
           if test "$wxUSE_IPC" = yes; then
           fi
 
           if test "$wxUSE_IPC" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

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

           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"


@@ -3562,8 +3556,9 @@ 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


@@ -3571,28 +3566,28 @@ fi;
           fi
 
           if test "$wxUSE_CMDLINE_PARSER" = yes; then
           fi
 
           if test "$wxUSE_CMDLINE_PARSER" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3601,8 +3596,9 @@ 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


@@ -3610,67 +3606,28 @@ fi;
           fi
 
           if test "$wxUSE_DATETIME" = yes; then
           fi
 
           if test "$wxUSE_DATETIME" = yes; then

-            echo "$as_me:3613: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:3616: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-          echo "$as_me:3620: checking for --enable-timedate" >&5
-echo $ECHO_N "checking for --enable-timedate... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-timedate or --disable-timedate was given.
-if test "${enable_timedate+set}" = set; then
-  enableval="$enable_timedate"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_timedate='wxUSE_TIMEDATE=yes'
-                          else
-                            ac_cv_use_timedate='wxUSE_TIMEDATE=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
-
-fi;
-
-          eval "$ac_cv_use_timedate"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_TIMEDATE" = yes; then
-            echo "$as_me:3652: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            echo "$ac_t""yes" 1>&6

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3679,8 +3636,9 @@ 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


@@ -3688,28 +3646,28 @@ fi;
           fi
 
           if test "$wxUSE_STOPWATCH" = yes; then
           fi
 
           if test "$wxUSE_STOPWATCH" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3718,8 +3676,9 @@ 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


@@ -3727,28 +3686,28 @@ fi;
           fi
 
           if test "$wxUSE_DIALUP_MANAGER" = yes; then
           fi
 
           if test "$wxUSE_DIALUP_MANAGER" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:3737: checking for --enable-apple_ieee" >&5
-echo $ECHO_N "checking for --enable-apple_ieee... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6
+echo "configure:3698: checking for --${enablestring:-enable}-apple_ieee" >&5

           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"


@@ -3757,8 +3716,9 @@ 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


@@ -3766,28 +3726,28 @@ fi;
           fi
 
           if test "$wxUSE_APPLE_IEEE" = yes; then
           fi
 
           if test "$wxUSE_APPLE_IEEE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3796,8 +3756,9 @@ 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


@@ -3805,28 +3766,28 @@ fi;
           fi
 
           if test "$wxUSE_TIMER" = yes; then
           fi
 
           if test "$wxUSE_TIMER" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3835,8 +3796,9 @@ 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


@@ -3844,28 +3806,28 @@ fi;
           fi
 
           if test "$wxUSE_WAVE" = yes; then
           fi
 
           if test "$wxUSE_WAVE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3874,8 +3836,9 @@ 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


@@ -3883,28 +3846,28 @@ fi;
           fi
 
           if test "$wxUSE_FRACTION" = yes; then
           fi
 
           if test "$wxUSE_FRACTION" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3913,8 +3876,9 @@ 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


@@ -3922,28 +3886,28 @@ fi;
           fi
 
           if test "$wxUSE_DYNLIB_CLASS" = yes; then
           fi
 
           if test "$wxUSE_DYNLIB_CLASS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3952,8 +3916,9 @@ 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


@@ -3961,28 +3926,28 @@ fi;
           fi
 
           if test "$wxUSE_DYNAMIC_LOADER" = yes; then
           fi
 
           if test "$wxUSE_DYNAMIC_LOADER" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -3991,8 +3956,9 @@ 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


@@ -4000,28 +3966,28 @@ fi;
           fi
 
           if test "$wxUSE_LONGLONG" = yes; then
           fi
 
           if test "$wxUSE_LONGLONG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -4030,8 +3996,9 @@ 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


@@ -4039,28 +4006,28 @@ fi;
           fi
 
           if test "$wxUSE_GEOMETRY" = yes; then
           fi
 
           if test "$wxUSE_GEOMETRY" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -4069,8 +4036,9 @@ 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


@@ -4078,28 +4046,28 @@ fi;
           fi
 
           if test "$wxUSE_LOG" = yes; then
           fi
 
           if test "$wxUSE_LOG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -4108,8 +4076,9 @@ 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


@@ -4117,28 +4086,28 @@ fi;
           fi
 
           if test "$wxUSE_STREAMS" = yes; then
           fi
 
           if test "$wxUSE_STREAMS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -4147,8 +4116,9 @@ 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


@@ -4156,28 +4126,28 @@ fi;
           fi
 
           if test "$wxUSE_FILE" = yes; then
           fi
 
           if test "$wxUSE_FILE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -4186,8 +4156,9 @@ 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


@@ -4195,28 +4166,28 @@ fi;
           fi
 
           if test "$wxUSE_FFILE" = yes; then
           fi
 
           if test "$wxUSE_FFILE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -4225,8 +4196,9 @@ 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


@@ -4234,28 +4206,28 @@ fi;
           fi
 
           if test "$wxUSE_TEXTBUFFER" = yes; then
           fi
 
           if test "$wxUSE_TEXTBUFFER" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4244: checking for --enable-textfile" >&5
-echo $ECHO_N "checking for --enable-textfile... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6
+echo "configure:4218: checking for --${enablestring:-enable}-textfile" >&5

           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"


@@ -4264,8 +4236,9 @@ 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


@@ -4273,28 +4246,28 @@ fi;
           fi
 
           if test "$wxUSE_TEXTFILE" = yes; then
           fi
 
           if test "$wxUSE_TEXTFILE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4283: checking for --enable-fontmap" >&5
-echo $ECHO_N "checking for --enable-fontmap... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6
+echo "configure:4258: checking for --${enablestring:-enable}-fontmap" >&5

           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"


@@ -4303,8 +4276,9 @@ 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


@@ -4312,28 +4286,28 @@ fi;
           fi
 
           if test "$wxUSE_FONTMAP" = yes; then
           fi
 
           if test "$wxUSE_FONTMAP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4322: checking for --enable-unicode" >&5
-echo $ECHO_N "checking for --enable-unicode... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6
+echo "configure:4298: checking for --${enablestring:-enable}-unicode" >&5

           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"


@@ -4342,8 +4316,9 @@ 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


@@ -4351,28 +4326,28 @@ fi;
           fi
 
           if test "$wxUSE_UNICODE" = yes; then
           fi
 
           if test "$wxUSE_UNICODE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4361: checking for --enable-mslu" >&5
-echo $ECHO_N "checking for --enable-mslu... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6
+echo "configure:4338: checking for --${enablestring:-enable}-mslu" >&5

           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"


@@ -4381,8 +4356,9 @@ 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


@@ -4390,28 +4366,28 @@ fi;
           fi
 
           if test "$wxUSE_UNICODE_MSLU" = yes; then
           fi
 
           if test "$wxUSE_UNICODE_MSLU" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4400: checking for --enable-wxprintfv" >&5
-echo $ECHO_N "checking for --enable-wxprintfv... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6
+echo "configure:4378: checking for --${enablestring:-enable}-wxprintfv" >&5

           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"


@@ -4420,8 +4396,9 @@ 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


@@ -4429,28 +4406,28 @@ fi;
           fi
 
           if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
           fi
 
           if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4439: checking for --enable-std_iostreams" >&5
-echo $ECHO_N "checking for --enable-std_iostreams... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6
+echo "configure:4418: checking for --${enablestring:-enable}-std_iostreams" >&5

           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"


@@ -4459,8 +4436,9 @@ 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


@@ -4468,28 +4446,28 @@ fi;
           fi
 
           if test "$wxUSE_STD_IOSTREAM" = yes; then
           fi
 
           if test "$wxUSE_STD_IOSTREAM" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4478: checking for --enable-filesystem" >&5
-echo $ECHO_N "checking for --enable-filesystem... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6
+echo "configure:4458: checking for --${enablestring:-enable}-filesystem" >&5

           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"


@@ -4498,8 +4476,9 @@ 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


@@ -4507,28 +4486,28 @@ fi;
           fi
 
           if test "$wxUSE_FILESYSTEM" = yes; then
           fi
 
           if test "$wxUSE_FILESYSTEM" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4517: checking for --enable-fs_inet" >&5
-echo $ECHO_N "checking for --enable-fs_inet... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6
+echo "configure:4498: checking for --${enablestring:-enable}-fs_inet" >&5

           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"


@@ -4537,8 +4516,9 @@ 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


@@ -4546,28 +4526,28 @@ fi;
           fi
 
           if test "$wxUSE_FS_INET" = yes; then
           fi
 
           if test "$wxUSE_FS_INET" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4556: checking for --enable-fs_zip" >&5
-echo $ECHO_N "checking for --enable-fs_zip... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6
+echo "configure:4538: checking for --${enablestring:-enable}-fs_zip" >&5

           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"


@@ -4576,8 +4556,9 @@ 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


@@ -4585,28 +4566,28 @@ fi;
           fi
 
           if test "$wxUSE_FS_ZIP" = yes; then
           fi
 
           if test "$wxUSE_FS_ZIP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4595: checking for --enable-zipstream" >&5
-echo $ECHO_N "checking for --enable-zipstream... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6
+echo "configure:4578: checking for --${enablestring:-enable}-zipstream" >&5

           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"


@@ -4615,8 +4596,9 @@ 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


@@ -4624,28 +4606,29 @@ fi;
           fi
 
           if test "$wxUSE_ZIPSTREAM" = yes; then
           fi
 
           if test "$wxUSE_ZIPSTREAM" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4634: checking for --enable-catch_segvs" >&5
-echo $ECHO_N "checking for --enable-catch_segvs... $ECHO_C" >&6
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6
+echo "configure:4619: checking for --${enablestring:-enable}-catch_segvs" >&5

           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"


@@ -4654,8 +4637,9 @@ 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


@@ -4663,28 +4647,28 @@ fi;
           fi
 
           if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
           fi
 
           if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4673: checking for --enable-snglinst" >&5
-echo $ECHO_N "checking for --enable-snglinst... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6
+echo "configure:4659: checking for --${enablestring:-enable}-snglinst" >&5

           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"


@@ -4693,8 +4677,9 @@ 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


@@ -4702,28 +4687,29 @@ fi;
           fi
 
           if test "$wxUSE_SNGLINST_CHECKER" = yes; then
           fi
 
           if test "$wxUSE_SNGLINST_CHECKER" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

-          echo "$as_me:4712: checking for --enable-mimetype" >&5
-echo $ECHO_N "checking for --enable-mimetype... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6
+echo "configure:4700: checking for --${enablestring:-enable}-mimetype" >&5

           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"


@@ -4732,8 +4718,9 @@ 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


@@ -4741,28 +4728,28 @@ fi;
           fi
 
           if test "$wxUSE_MIMETYPE" = yes; then
           fi
 
           if test "$wxUSE_MIMETYPE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4751: checking for --enable-system_options" >&5
-echo $ECHO_N "checking for --enable-system_options... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6
+echo "configure:4740: checking for --${enablestring:-enable}-system_options" >&5

           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"


@@ -4771,8 +4758,9 @@ 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


@@ -4780,28 +4768,29 @@ fi;
           fi
 
           if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
           fi
 
           if test "$wxUSE_SYSTEM_OPTIONS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4790: checking for --enable-url" >&5
-echo $ECHO_N "checking for --enable-url... $ECHO_C" >&6
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6
+echo "configure:4781: checking for --${enablestring:-enable}-url" >&5

           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"


@@ -4810,8 +4799,9 @@ 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


@@ -4819,28 +4809,28 @@ fi;
           fi
 
           if test "$wxUSE_URL" = yes; then
           fi
 
           if test "$wxUSE_URL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4829: checking for --enable-protocol" >&5
-echo $ECHO_N "checking for --enable-protocol... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6
+echo "configure:4821: checking for --${enablestring:-enable}-protocol" >&5

           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"


@@ -4849,8 +4839,9 @@ 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


@@ -4858,28 +4849,28 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4868: checking for --enable-protocol_http" >&5
-echo $ECHO_N "checking for --enable-protocol_http... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6
+echo "configure:4861: checking for --${enablestring:-enable}-protocol_http" >&5

           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"


@@ -4888,8 +4879,9 @@ 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


@@ -4897,28 +4889,28 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_HTTP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4907: checking for --enable-protocol_ftp" >&5
-echo $ECHO_N "checking for --enable-protocol_ftp... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6
+echo "configure:4901: checking for --${enablestring:-enable}-protocol_ftp" >&5

           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"


@@ -4927,8 +4919,9 @@ 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


@@ -4936,28 +4929,28 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FTP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:4946: checking for --enable-protocol_file" >&5
-echo $ECHO_N "checking for --enable-protocol_file... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6
+echo "configure:4941: checking for --${enablestring:-enable}-protocol_file" >&5

           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"


@@ -4966,8 +4959,9 @@ 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


@@ -4975,28 +4969,31 @@ fi;
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then
           fi
 
           if test "$wxUSE_PROTOCOL_FILE" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

-          echo "$as_me:4985: checking for --enable-threads" >&5
-echo $ECHO_N "checking for --enable-threads... $ECHO_C" >&6
+
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6
+echo "configure:4984: checking for --${enablestring:-enable}-threads" >&5

           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"


@@ -5005,8 +5002,9 @@ 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


@@ -5014,30 +5012,32 @@ fi;
           fi
 
           if test "$wxUSE_THREADS" = yes; then
           fi
 
           if test "$wxUSE_THREADS" = yes; then

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

           else
           else

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

           fi
           fi

+        

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

-          echo "$as_me:5026: checking for --enable-docview" >&5
-echo $ECHO_N "checking for --enable-docview... $ECHO_C" >&6
+
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6
+echo "configure:5028: checking for --${enablestring:-enable}-docview" >&5

           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"


@@ -5046,8 +5046,9 @@ 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


@@ -5055,28 +5056,28 @@ fi;
           fi
 
           if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
           fi
 
           if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5065: checking for --enable-help" >&5
-echo $ECHO_N "checking for --enable-help... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6
+echo "configure:5068: checking for --${enablestring:-enable}-help" >&5

           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"


@@ -5085,8 +5086,9 @@ 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


@@ -5094,28 +5096,28 @@ fi;
           fi
 
           if test "$wxUSE_HELP" = yes; then
           fi
 
           if test "$wxUSE_HELP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5104: checking for --enable-mshtmlhelp" >&5
-echo $ECHO_N "checking for --enable-mshtmlhelp... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:5108: checking for --${enablestring:-enable}-mshtmlhelp" >&5

           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"


@@ -5124,8 +5126,9 @@ 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


@@ -5133,28 +5136,28 @@ fi;
           fi
 
           if test "$wxUSE_MS_HTML_HELP" = yes; then
           fi
 
           if test "$wxUSE_MS_HTML_HELP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5143: checking for --enable-html" >&5
-echo $ECHO_N "checking for --enable-html... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6
+echo "configure:5148: checking for --${enablestring:-enable}-html" >&5

           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"


@@ -5163,8 +5166,9 @@ 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


@@ -5172,28 +5176,28 @@ fi;
           fi
 
           if test "$wxUSE_HTML" = yes; then
           fi
 
           if test "$wxUSE_HTML" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5182: checking for --enable-htmlhelp" >&5
-echo $ECHO_N "checking for --enable-htmlhelp... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6
+echo "configure:5188: checking for --${enablestring:-enable}-htmlhelp" >&5

           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"


@@ -5202,8 +5206,9 @@ 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


@@ -5211,28 +5216,28 @@ fi;
           fi
 
           if test "$wxUSE_WXHTML_HELP" = yes; then
           fi
 
           if test "$wxUSE_WXHTML_HELP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5221: checking for --enable-constraints" >&5
-echo $ECHO_N "checking for --enable-constraints... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6
+echo "configure:5228: checking for --${enablestring:-enable}-constraints" >&5

           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"


@@ -5241,8 +5246,9 @@ 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


@@ -5250,28 +5256,28 @@ fi;
           fi
 
           if test "$wxUSE_CONSTRAINTS" = yes; then
           fi
 
           if test "$wxUSE_CONSTRAINTS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5260: checking for --enable-printarch" >&5
-echo $ECHO_N "checking for --enable-printarch... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6
+echo "configure:5268: checking for --${enablestring:-enable}-printarch" >&5

           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"


@@ -5280,8 +5286,9 @@ 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


@@ -5289,28 +5296,28 @@ fi;
           fi
 
           if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
           fi
 
           if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5299: checking for --enable-mdi" >&5
-echo $ECHO_N "checking for --enable-mdi... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6
+echo "configure:5308: checking for --${enablestring:-enable}-mdi" >&5

           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"


@@ -5319,8 +5326,9 @@ 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


@@ -5328,28 +5336,28 @@ fi;
           fi
 
           if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
           fi
 
           if test "$wxUSE_MDI_ARCHITECTURE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5338: checking for --enable-loggui" >&5
-echo $ECHO_N "checking for --enable-loggui... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6
+echo "configure:5348: checking for --${enablestring:-enable}-loggui" >&5

           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"


@@ -5358,8 +5366,9 @@ 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


@@ -5367,28 +5376,28 @@ fi;
           fi
 
           if test "$wxUSE_LOGGUI" = yes; then
           fi
 
           if test "$wxUSE_LOGGUI" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5377: checking for --enable-logwin" >&5
-echo $ECHO_N "checking for --enable-logwin... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6
+echo "configure:5388: checking for --${enablestring:-enable}-logwin" >&5

           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"


@@ -5397,8 +5406,9 @@ 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


@@ -5406,28 +5416,28 @@ fi;
           fi
 
           if test "$wxUSE_LOGWINDOW" = yes; then
           fi
 
           if test "$wxUSE_LOGWINDOW" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5416: checking for --enable-logdialog" >&5
-echo $ECHO_N "checking for --enable-logdialog... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6
+echo "configure:5428: checking for --${enablestring:-enable}-logdialog" >&5

           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"


@@ -5436,8 +5446,9 @@ 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


@@ -5445,28 +5456,29 @@ fi;
           fi
 
           if test "$wxUSE_LOGDIALOG" = yes; then
           fi
 
           if test "$wxUSE_LOGDIALOG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5455: checking for --enable-postscript" >&5
-echo $ECHO_N "checking for --enable-postscript... $ECHO_C" >&6
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6
+echo "configure:5469: checking for --${enablestring:-enable}-postscript" >&5

           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"


@@ -5475,8 +5487,9 @@ 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


@@ -5484,28 +5497,31 @@ fi;
           fi
 
           if test "$wxUSE_POSTSCRIPT" = yes; then
           fi
 
           if test "$wxUSE_POSTSCRIPT" = yes; then

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

           else
           else

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

           fi
           fi

+        
+
+
+

 
 

-          echo "$as_me:5494: checking for --enable-prologio" >&5
-echo $ECHO_N "checking for --enable-prologio... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-prologio""... $ac_c" 1>&6
+echo "configure:5512: checking for --${enablestring:-enable}-prologio" >&5

           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"


@@ -5514,8 +5530,9 @@ 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


@@ -5523,28 +5540,28 @@ fi;
           fi
 
           if test "$wxUSE_PROLOGIO" = yes; then
           fi
 
           if test "$wxUSE_PROLOGIO" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5533: checking for --enable-resources" >&5
-echo $ECHO_N "checking for --enable-resources... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6
+echo "configure:5552: checking for --${enablestring:-enable}-resources" >&5

           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"


@@ -5553,8 +5570,9 @@ 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


@@ -5562,67 +5580,30 @@ fi;
           fi
 
           if test "$wxUSE_RESOURCES" = yes; then
           fi
 
           if test "$wxUSE_RESOURCES" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5572: checking for --enable-xresources" >&5
-echo $ECHO_N "checking for --enable-xresources... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-xresources or --disable-xresources was given.
-if test "${enable_xresources+set}" = set; then
-  enableval="$enable_xresources"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_xresources='wxUSE_X_RESOURCES=yes'
-                          else
-                            ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES
-
-fi;
-
-          eval "$ac_cv_use_xresources"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
-          fi

 
 

-          if test "$wxUSE_X_RESOURCES" = yes; then
-            echo "$as_me:5604: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:5607: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi

 
 

-          echo "$as_me:5611: checking for --enable-clipboard" >&5
-echo $ECHO_N "checking for --enable-clipboard... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6
+echo "configure:5594: checking for --${enablestring:-enable}-clipboard" >&5

           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"


@@ -5631,8 +5612,9 @@ 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


@@ -5640,28 +5622,28 @@ fi;
           fi
 
           if test "$wxUSE_CLIPBOARD" = yes; then
           fi
 
           if test "$wxUSE_CLIPBOARD" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5650: checking for --enable-dnd" >&5
-echo $ECHO_N "checking for --enable-dnd... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6
+echo "configure:5634: checking for --${enablestring:-enable}-dnd" >&5

           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"


@@ -5670,8 +5652,9 @@ 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


@@ -5679,28 +5662,28 @@ fi;
           fi
 
           if test "$wxUSE_DRAG_AND_DROP" = yes; then
           fi
 
           if test "$wxUSE_DRAG_AND_DROP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5689: checking for --enable-metafile" >&5
-echo $ECHO_N "checking for --enable-metafile... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
+echo "configure:5674: checking for --${enablestring:-enable}-metafile" >&5

           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"


@@ -5709,8 +5692,9 @@ 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


@@ -5718,67 +5702,31 @@ fi;
           fi
 
           if test "$wxUSE_METAFILE" = yes; then
           fi
 
           if test "$wxUSE_METAFILE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5728: checking for --enable-treelayout" >&5
-echo $ECHO_N "checking for --enable-treelayout... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-treelayout or --disable-treelayout was given.
-if test "${enable_treelayout+set}" = set; then
-  enableval="$enable_treelayout"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes'
-                          else
-                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_TREELAYOUT" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT

 
 

-fi;
-
-          eval "$ac_cv_use_treelayout"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp
-          fi

 
 

-          if test "$wxUSE_TREELAYOUT" = yes; then
-            echo "$as_me:5760: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:5763: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi

 
 

-          echo "$as_me:5767: checking for --enable-controls" >&5
-echo $ECHO_N "checking for --enable-controls... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6
+echo "configure:5717: checking for --${enablestring:-enable}-controls" >&5

           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"


@@ -5787,8 +5735,9 @@ 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


@@ -5796,12 +5745,11 @@ fi;
           fi
 
           if test "$wxUSE_CONTROLS" = yes; then
           fi
 
           if test "$wxUSE_CONTROLS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_ACCEL=yes
 
 if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_ACCEL=yes


@@ -5815,12 +5763,10 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes

-  DEFAULT_wxUSE_NEW_GRID=yes

   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes

-  DEFAULT_wxUSE_PROPSHEET=yes

   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes


@@ -5854,12 +5800,10 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no

-  DEFAULT_wxUSE_NEW_GRID=no

   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no

-  DEFAULT_wxUSE_PROPSHEET=no

   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no


@@ -5883,21 +5827,53 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_TIPWINDOW=no
 fi
 
   DEFAULT_wxUSE_TIPWINDOW=no
 fi
 

-          echo "$as_me:5886: checking for --enable-accel" >&5
-echo $ECHO_N "checking for --enable-accel... $ECHO_C" >&6
+## 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_DATAOBJ=no
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+  DEFAULT_wxUSE_GAUGE=no
+  DEFAULT_wxUSE_SCROLLBAR=no
+  DEFAULT_wxUSE_SLIDER=no
+  DEFAULT_wxUSE_COMBOBOX=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_SPINBTN=no
+  DEFAULT_wxUSE_SPINCTRL=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_COLOURDLG=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=
+          echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6
+echo "configure:5864: checking for --${enablestring:-enable}-accel" >&5

           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"


@@ -5906,8 +5882,9 @@ 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


@@ -5915,28 +5892,28 @@ fi;
           fi
 
           if test "$wxUSE_ACCEL" = yes; then
           fi
 
           if test "$wxUSE_ACCEL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5925: checking for --enable-button" >&5
-echo $ECHO_N "checking for --enable-button... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6
+echo "configure:5904: checking for --${enablestring:-enable}-button" >&5

           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"


@@ -5945,8 +5922,9 @@ 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


@@ -5954,28 +5932,28 @@ fi;
           fi
 
           if test "$wxUSE_BUTTON" = yes; then
           fi
 
           if test "$wxUSE_BUTTON" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:5964: checking for --enable-bmpbutton" >&5
-echo $ECHO_N "checking for --enable-bmpbutton... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6
+echo "configure:5944: checking for --${enablestring:-enable}-bmpbutton" >&5

           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"


@@ -5984,8 +5962,9 @@ 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


@@ -5993,28 +5972,28 @@ fi;
           fi
 
           if test "$wxUSE_BMPBUTTON" = yes; then
           fi
 
           if test "$wxUSE_BMPBUTTON" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6003: checking for --enable-calendar" >&5
-echo $ECHO_N "checking for --enable-calendar... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6
+echo "configure:5984: checking for --${enablestring:-enable}-calendar" >&5

           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"


@@ -6023,8 +6002,9 @@ 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


@@ -6032,28 +6012,28 @@ fi;
           fi
 
           if test "$wxUSE_CALCTRL" = yes; then
           fi
 
           if test "$wxUSE_CALCTRL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6042: checking for --enable-caret" >&5
-echo $ECHO_N "checking for --enable-caret... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6
+echo "configure:6024: checking for --${enablestring:-enable}-caret" >&5

           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"


@@ -6062,8 +6042,9 @@ 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


@@ -6071,28 +6052,28 @@ fi;
           fi
 
           if test "$wxUSE_CARET" = yes; then
           fi
 
           if test "$wxUSE_CARET" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6081: checking for --enable-checkbox" >&5
-echo $ECHO_N "checking for --enable-checkbox... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6
+echo "configure:6064: checking for --${enablestring:-enable}-checkbox" >&5

           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"


@@ -6101,8 +6082,9 @@ 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


@@ -6110,28 +6092,28 @@ fi;
           fi
 
           if test "$wxUSE_CHECKBOX" = yes; then
           fi
 
           if test "$wxUSE_CHECKBOX" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6120: checking for --enable-checklst" >&5
-echo $ECHO_N "checking for --enable-checklst... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6
+echo "configure:6104: checking for --${enablestring:-enable}-checklst" >&5

           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"


@@ -6140,8 +6122,9 @@ 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


@@ -6149,28 +6132,28 @@ fi;
           fi
 
           if test "$wxUSE_CHECKLST" = yes; then
           fi
 
           if test "$wxUSE_CHECKLST" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6159: checking for --enable-choice" >&5
-echo $ECHO_N "checking for --enable-choice... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6
+echo "configure:6144: checking for --${enablestring:-enable}-choice" >&5

           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"


@@ -6179,8 +6162,9 @@ 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


@@ -6188,28 +6172,28 @@ fi;
           fi
 
           if test "$wxUSE_CHOICE" = yes; then
           fi
 
           if test "$wxUSE_CHOICE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6198: checking for --enable-combobox" >&5
-echo $ECHO_N "checking for --enable-combobox... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6
+echo "configure:6184: checking for --${enablestring:-enable}-combobox" >&5

           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"


@@ -6218,8 +6202,9 @@ 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


@@ -6227,28 +6212,68 @@ fi;
           fi
 
           if test "$wxUSE_COMBOBOX" = yes; then
           fi
 
           if test "$wxUSE_COMBOBOX" = yes; then

-            echo "$as_me:6230: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-display""... $ac_c" 1>&6
+echo "configure:6224: checking for --${enablestring:-enable}-display" >&5
+          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
+                        
+else
+  
+                          LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY
+                        
+fi
+
+
+          eval "$ac_cv_use_display"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DISPLAY" = yes; then
+            echo "$ac_t""yes" 1>&6

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6237: checking for --enable-gauge" >&5
-echo $ECHO_N "checking for --enable-gauge... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6
+echo "configure:6264: checking for --${enablestring:-enable}-gauge" >&5

           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"


@@ -6257,8 +6282,9 @@ 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


@@ -6266,28 +6292,28 @@ fi;
           fi
 
           if test "$wxUSE_GAUGE" = yes; then
           fi
 
           if test "$wxUSE_GAUGE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6276: checking for --enable-grid" >&5
-echo $ECHO_N "checking for --enable-grid... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6
+echo "configure:6304: checking for --${enablestring:-enable}-grid" >&5

           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"


@@ -6296,8 +6322,9 @@ 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


@@ -6305,106 +6332,68 @@ fi;
           fi
 
           if test "$wxUSE_GRID" = yes; then
           fi
 
           if test "$wxUSE_GRID" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6315: checking for --enable-newgrid" >&5
-echo $ECHO_N "checking for --enable-newgrid... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6
+echo "configure:6344: checking for --${enablestring:-enable}-imaglist" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-newgrid or --disable-newgrid was given.
-if test "${enable_newgrid+set}" = set; then
-  enableval="$enable_newgrid"
-
+          # Check whether --enable-imaglist or --disable-imaglist was given.
+if test "${enable_imaglist+set}" = set; then
+  enableval="$enable_imaglist"
+  

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

-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'

                           else
                           else

-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'

                           fi
                           fi

-
+                        

 else
 else

-
-                          LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+  
+                          LINE=`grep "wxUSE_IMAGLIST" ${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_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+                          ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+                        
+fi

 
 

-fi;

 
 

-          eval "$ac_cv_use_newgrid"
+          eval "$ac_cv_use_imaglist"

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

-            echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_NEW_GRID" = yes; then
-            echo "$as_me:6347: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:6350: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-          echo "$as_me:6354: checking for --enable-imaglist" >&5
-echo $ECHO_N "checking for --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"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
-                          else
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
-
-fi;
-
-          eval "$ac_cv_use_imaglist"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp

           fi
 
           if test "$wxUSE_IMAGLIST" = yes; then
           fi
 
           if test "$wxUSE_IMAGLIST" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6393: checking for --enable-listbox" >&5
-echo $ECHO_N "checking for --enable-listbox... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6
+echo "configure:6384: checking for --${enablestring:-enable}-listbox" >&5

           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"


@@ -6413,8 +6402,9 @@ 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


@@ -6422,28 +6412,28 @@ fi;
           fi
 
           if test "$wxUSE_LISTBOX" = yes; then
           fi
 
           if test "$wxUSE_LISTBOX" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6432: checking for --enable-listctrl" >&5
-echo $ECHO_N "checking for --enable-listctrl... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6
+echo "configure:6424: checking for --${enablestring:-enable}-listctrl" >&5

           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"


@@ -6452,8 +6442,9 @@ 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


@@ -6461,28 +6452,28 @@ fi;
           fi
 
           if test "$wxUSE_LISTCTRL" = yes; then
           fi
 
           if test "$wxUSE_LISTCTRL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6471: checking for --enable-notebook" >&5
-echo $ECHO_N "checking for --enable-notebook... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6
+echo "configure:6464: checking for --${enablestring:-enable}-notebook" >&5

           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"


@@ -6491,8 +6482,9 @@ 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


@@ -6500,67 +6492,28 @@ fi;
           fi
 
           if test "$wxUSE_NOTEBOOK" = yes; then
           fi
 
           if test "$wxUSE_NOTEBOOK" = yes; then

-            echo "$as_me:6503: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:6506: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-          echo "$as_me:6510: checking for --enable-propsheet" >&5
-echo $ECHO_N "checking for --enable-propsheet... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-propsheet or --disable-propsheet was given.
-if test "${enable_propsheet+set}" = set; then
-  enableval="$enable_propsheet"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_propsheet='wxUSE_PROPSHEET=yes'
-                          else
-                            ac_cv_use_propsheet='wxUSE_PROPSHEET=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_PROPSHEET" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET
-
-fi;
-
-          eval "$ac_cv_use_propsheet"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_PROPSHEET" = yes; then
-            echo "$as_me:6542: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+            echo "$ac_t""yes" 1>&6

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6549: checking for --enable-radiobox" >&5
-echo $ECHO_N "checking for --enable-radiobox... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6
+echo "configure:6504: checking for --${enablestring:-enable}-radiobox" >&5

           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"


@@ -6569,8 +6522,9 @@ 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


@@ -6578,28 +6532,28 @@ fi;
           fi
 
           if test "$wxUSE_RADIOBOX" = yes; then
           fi
 
           if test "$wxUSE_RADIOBOX" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6588: checking for --enable-radiobtn" >&5
-echo $ECHO_N "checking for --enable-radiobtn... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6
+echo "configure:6544: checking for --${enablestring:-enable}-radiobtn" >&5

           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"


@@ -6608,8 +6562,9 @@ 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


@@ -6617,28 +6572,28 @@ fi;
           fi
 
           if test "$wxUSE_RADIOBTN" = yes; then
           fi
 
           if test "$wxUSE_RADIOBTN" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6627: checking for --enable-sash" >&5
-echo $ECHO_N "checking for --enable-sash... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6
+echo "configure:6584: checking for --${enablestring:-enable}-sash" >&5

           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"


@@ -6647,8 +6602,9 @@ 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


@@ -6656,28 +6612,28 @@ fi;
           fi
 
           if test "$wxUSE_SASH" = yes; then
           fi
 
           if test "$wxUSE_SASH" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6666: checking for --enable-scrollbar" >&5
-echo $ECHO_N "checking for --enable-scrollbar... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6
+echo "configure:6624: checking for --${enablestring:-enable}-scrollbar" >&5

           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"


@@ -6686,8 +6642,9 @@ 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


@@ -6695,28 +6652,28 @@ fi;
           fi
 
           if test "$wxUSE_SCROLLBAR" = yes; then
           fi
 
           if test "$wxUSE_SCROLLBAR" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6705: checking for --enable-slider" >&5
-echo $ECHO_N "checking for --enable-slider... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6
+echo "configure:6664: checking for --${enablestring:-enable}-slider" >&5

           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"


@@ -6725,8 +6682,9 @@ 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


@@ -6734,28 +6692,28 @@ fi;
           fi
 
           if test "$wxUSE_SLIDER" = yes; then
           fi
 
           if test "$wxUSE_SLIDER" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6744: checking for --enable-spinbtn" >&5
-echo $ECHO_N "checking for --enable-spinbtn... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6
+echo "configure:6704: checking for --${enablestring:-enable}-spinbtn" >&5

           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"


@@ -6764,8 +6722,9 @@ 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


@@ -6773,28 +6732,28 @@ fi;
           fi
 
           if test "$wxUSE_SPINBTN" = yes; then
           fi
 
           if test "$wxUSE_SPINBTN" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6783: checking for --enable-spinctrl" >&5
-echo $ECHO_N "checking for --enable-spinctrl... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6
+echo "configure:6744: checking for --${enablestring:-enable}-spinctrl" >&5

           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"


@@ -6803,8 +6762,9 @@ 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


@@ -6812,28 +6772,28 @@ fi;
           fi
 
           if test "$wxUSE_SPINCTRL" = yes; then
           fi
 
           if test "$wxUSE_SPINCTRL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6822: checking for --enable-splitter" >&5
-echo $ECHO_N "checking for --enable-splitter... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6
+echo "configure:6784: checking for --${enablestring:-enable}-splitter" >&5

           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"


@@ -6842,8 +6802,9 @@ 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


@@ -6851,28 +6812,28 @@ fi;
           fi
 
           if test "$wxUSE_SPLITTER" = yes; then
           fi
 
           if test "$wxUSE_SPLITTER" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6861: checking for --enable-statbmp" >&5
-echo $ECHO_N "checking for --enable-statbmp... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6
+echo "configure:6824: checking for --${enablestring:-enable}-statbmp" >&5

           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"


@@ -6881,8 +6842,9 @@ 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


@@ -6890,28 +6852,28 @@ fi;
           fi
 
           if test "$wxUSE_STATBMP" = yes; then
           fi
 
           if test "$wxUSE_STATBMP" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6900: checking for --enable-statbox" >&5
-echo $ECHO_N "checking for --enable-statbox... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6
+echo "configure:6864: checking for --${enablestring:-enable}-statbox" >&5

           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"


@@ -6920,8 +6882,9 @@ 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


@@ -6929,28 +6892,28 @@ fi;
           fi
 
           if test "$wxUSE_STATBOX" = yes; then
           fi
 
           if test "$wxUSE_STATBOX" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6939: checking for --enable-statline" >&5
-echo $ECHO_N "checking for --enable-statline... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6
+echo "configure:6904: checking for --${enablestring:-enable}-statline" >&5

           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"


@@ -6959,8 +6922,9 @@ 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


@@ -6968,28 +6932,28 @@ fi;
           fi
 
           if test "$wxUSE_STATLINE" = yes; then
           fi
 
           if test "$wxUSE_STATLINE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:6978: checking for --enable-stattext" >&5
-echo $ECHO_N "checking for --enable-stattext... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6
+echo "configure:6944: checking for --${enablestring:-enable}-stattext" >&5

           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"


@@ -6998,8 +6962,9 @@ 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


@@ -7007,28 +6972,28 @@ fi;
           fi
 
           if test "$wxUSE_STATTEXT" = yes; then
           fi
 
           if test "$wxUSE_STATTEXT" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7017: checking for --enable-statusbar" >&5
-echo $ECHO_N "checking for --enable-statusbar... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6
+echo "configure:6984: checking for --${enablestring:-enable}-statusbar" >&5

           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"


@@ -7037,8 +7002,9 @@ 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


@@ -7046,28 +7012,28 @@ fi;
           fi
 
           if test "$wxUSE_STATUSBAR" = yes; then
           fi
 
           if test "$wxUSE_STATUSBAR" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7056: checking for --enable-tabdialog" >&5
-echo $ECHO_N "checking for --enable-tabdialog... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6
+echo "configure:7024: checking for --${enablestring:-enable}-tabdialog" >&5

           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"


@@ -7076,8 +7042,9 @@ 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


@@ -7085,28 +7052,28 @@ fi;
           fi
 
           if test "$wxUSE_TABDIALOG" = yes; then
           fi
 
           if test "$wxUSE_TABDIALOG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7095: checking for --enable-textctrl" >&5
-echo $ECHO_N "checking for --enable-textctrl... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6
+echo "configure:7064: checking for --${enablestring:-enable}-textctrl" >&5

           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"


@@ -7115,8 +7082,9 @@ 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


@@ -7124,28 +7092,28 @@ fi;
           fi
 
           if test "$wxUSE_TEXTCTRL" = yes; then
           fi
 
           if test "$wxUSE_TEXTCTRL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7134: checking for --enable-togglebtn" >&5
-echo $ECHO_N "checking for --enable-togglebtn... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6
+echo "configure:7104: checking for --${enablestring:-enable}-togglebtn" >&5

           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"


@@ -7154,8 +7122,9 @@ 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


@@ -7163,28 +7132,28 @@ fi;
           fi
 
           if test "$wxUSE_TOGGLEBTN" = yes; then
           fi
 
           if test "$wxUSE_TOGGLEBTN" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7173: checking for --enable-toolbar" >&5
-echo $ECHO_N "checking for --enable-toolbar... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6
+echo "configure:7144: checking for --${enablestring:-enable}-toolbar" >&5

           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"


@@ -7193,8 +7162,9 @@ 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


@@ -7202,28 +7172,28 @@ fi;
           fi
 
           if test "$wxUSE_TOOLBAR" = yes; then
           fi
 
           if test "$wxUSE_TOOLBAR" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7212: checking for --enable-tbarnative" >&5
-echo $ECHO_N "checking for --enable-tbarnative... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6
+echo "configure:7184: checking for --${enablestring:-enable}-tbarnative" >&5

           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"


@@ -7232,8 +7202,9 @@ 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


@@ -7241,28 +7212,28 @@ fi;
           fi
 
           if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
           fi
 
           if test "$wxUSE_TOOLBAR_NATIVE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7251: checking for --enable-tbarsmpl" >&5
-echo $ECHO_N "checking for --enable-tbarsmpl... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6
+echo "configure:7224: checking for --${enablestring:-enable}-tbarsmpl" >&5

           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"


@@ -7271,8 +7242,9 @@ 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


@@ -7280,28 +7252,28 @@ fi;
           fi
 
           if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
           fi
 
           if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7290: checking for --enable-treectrl" >&5
-echo $ECHO_N "checking for --enable-treectrl... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6
+echo "configure:7264: checking for --${enablestring:-enable}-treectrl" >&5

           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"


@@ -7310,8 +7282,9 @@ 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


@@ -7319,28 +7292,28 @@ fi;
           fi
 
           if test "$wxUSE_TREECTRL" = yes; then
           fi
 
           if test "$wxUSE_TREECTRL" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7329: checking for --enable-tipwindow" >&5
-echo $ECHO_N "checking for --enable-tipwindow... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6
+echo "configure:7304: checking for --${enablestring:-enable}-tipwindow" >&5

           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"


@@ -7349,8 +7322,9 @@ 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


@@ -7358,28 +7332,28 @@ fi;
           fi
 
           if test "$wxUSE_TIPWINDOW" = yes; then
           fi
 
           if test "$wxUSE_TIPWINDOW" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7368: checking for --enable-popupwin" >&5
-echo $ECHO_N "checking for --enable-popupwin... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6
+echo "configure:7344: checking for --${enablestring:-enable}-popupwin" >&5

           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"


@@ -7388,8 +7362,9 @@ 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


@@ -7397,28 +7372,30 @@ fi;
           fi
 
           if test "$wxUSE_POPUPWIN" = yes; then
           fi
 
           if test "$wxUSE_POPUPWIN" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

-          echo "$as_me:7407: checking for --enable-commondlg" >&5
-echo $ECHO_N "checking for --enable-commondlg... $ECHO_C" >&6
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6
+echo "configure:7386: checking for --${enablestring:-enable}-commondlg" >&5

           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"


@@ -7427,8 +7404,9 @@ 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


@@ -7436,28 +7414,28 @@ fi;
           fi
 
           if test "$wxUSE_COMMONDLGS" = yes; then
           fi
 
           if test "$wxUSE_COMMONDLGS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7446: checking for --enable-choicedlg" >&5
-echo $ECHO_N "checking for --enable-choicedlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6
+echo "configure:7426: checking for --${enablestring:-enable}-choicedlg" >&5

           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"


@@ -7466,8 +7444,9 @@ 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


@@ -7475,28 +7454,28 @@ fi;
           fi
 
           if test "$wxUSE_CHOICEDLG" = yes; then
           fi
 
           if test "$wxUSE_CHOICEDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7485: checking for --enable-coldlg" >&5
-echo $ECHO_N "checking for --enable-coldlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6
+echo "configure:7466: checking for --${enablestring:-enable}-coldlg" >&5

           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"


@@ -7505,8 +7484,9 @@ 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


@@ -7514,28 +7494,28 @@ fi;
           fi
 
           if test "$wxUSE_COLOURDLG" = yes; then
           fi
 
           if test "$wxUSE_COLOURDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7524: checking for --enable-filedlg" >&5
-echo $ECHO_N "checking for --enable-filedlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6
+echo "configure:7506: checking for --${enablestring:-enable}-filedlg" >&5

           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"


@@ -7544,8 +7524,9 @@ 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


@@ -7553,28 +7534,28 @@ fi;
           fi
 
           if test "$wxUSE_FILEDLG" = yes; then
           fi
 
           if test "$wxUSE_FILEDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7563: checking for --enable-finddlg" >&5
-echo $ECHO_N "checking for --enable-finddlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6
+echo "configure:7546: checking for --${enablestring:-enable}-finddlg" >&5

           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"


@@ -7583,8 +7564,9 @@ 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


@@ -7592,28 +7574,28 @@ fi;
           fi
 
           if test "$wxUSE_FINDREPLDLG" = yes; then
           fi
 
           if test "$wxUSE_FINDREPLDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7602: checking for --enable-fontdlg" >&5
-echo $ECHO_N "checking for --enable-fontdlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6
+echo "configure:7586: checking for --${enablestring:-enable}-fontdlg" >&5

           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"


@@ -7622,8 +7604,9 @@ 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


@@ -7631,28 +7614,28 @@ fi;
           fi
 
           if test "$wxUSE_FONTDLG" = yes; then
           fi
 
           if test "$wxUSE_FONTDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7641: checking for --enable-dirdlg" >&5
-echo $ECHO_N "checking for --enable-dirdlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6
+echo "configure:7626: checking for --${enablestring:-enable}-dirdlg" >&5

           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"


@@ -7661,8 +7644,9 @@ 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


@@ -7670,28 +7654,28 @@ fi;
           fi
 
           if test "$wxUSE_DIRDLG" = yes; then
           fi
 
           if test "$wxUSE_DIRDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7680: checking for --enable-msgdlg" >&5
-echo $ECHO_N "checking for --enable-msgdlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6
+echo "configure:7666: checking for --${enablestring:-enable}-msgdlg" >&5

           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"


@@ -7700,8 +7684,9 @@ 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


@@ -7709,28 +7694,28 @@ fi;
           fi
 
           if test "$wxUSE_MSGDLG" = yes; then
           fi
 
           if test "$wxUSE_MSGDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7719: checking for --enable-numberdlg" >&5
-echo $ECHO_N "checking for --enable-numberdlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6
+echo "configure:7706: checking for --${enablestring:-enable}-numberdlg" >&5

           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"


@@ -7739,8 +7724,9 @@ 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


@@ -7748,28 +7734,28 @@ fi;
           fi
 
           if test "$wxUSE_NUMBERDLG" = yes; then
           fi
 
           if test "$wxUSE_NUMBERDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7758: checking for --enable-splash" >&5
-echo $ECHO_N "checking for --enable-splash... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6
+echo "configure:7746: checking for --${enablestring:-enable}-splash" >&5

           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"


@@ -7778,8 +7764,9 @@ 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


@@ -7787,28 +7774,28 @@ fi;
           fi
 
           if test "$wxUSE_SPLASH" = yes; then
           fi
 
           if test "$wxUSE_SPLASH" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7797: checking for --enable-textdlg" >&5
-echo $ECHO_N "checking for --enable-textdlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6
+echo "configure:7786: checking for --${enablestring:-enable}-textdlg" >&5

           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"


@@ -7817,8 +7804,9 @@ 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


@@ -7826,28 +7814,28 @@ fi;
           fi
 
           if test "$wxUSE_TEXTDLG" = yes; then
           fi
 
           if test "$wxUSE_TEXTDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7836: checking for --enable-tipdlg" >&5
-echo $ECHO_N "checking for --enable-tipdlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6
+echo "configure:7826: checking for --${enablestring:-enable}-tipdlg" >&5

           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"


@@ -7856,8 +7844,9 @@ 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


@@ -7865,28 +7854,28 @@ fi;
           fi
 
           if test "$wxUSE_STARTUP_TIPS" = yes; then
           fi
 
           if test "$wxUSE_STARTUP_TIPS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7875: checking for --enable-progressdlg" >&5
-echo $ECHO_N "checking for --enable-progressdlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6
+echo "configure:7866: checking for --${enablestring:-enable}-progressdlg" >&5

           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"


@@ -7895,8 +7884,9 @@ 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


@@ -7904,28 +7894,28 @@ fi;
           fi
 
           if test "$wxUSE_PROGRESSDLG" = yes; then
           fi
 
           if test "$wxUSE_PROGRESSDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7914: checking for --enable-wizarddlg" >&5
-echo $ECHO_N "checking for --enable-wizarddlg... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6
+echo "configure:7906: checking for --${enablestring:-enable}-wizarddlg" >&5

           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"


@@ -7934,8 +7924,9 @@ 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


@@ -7943,28 +7934,30 @@ fi;
           fi
 
           if test "$wxUSE_WIZARDDLG" = yes; then
           fi
 
           if test "$wxUSE_WIZARDDLG" = yes; then

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

           else
           else

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

           fi
           fi

+        
+

 
 

-          echo "$as_me:7953: checking for --enable-menus" >&5
-echo $ECHO_N "checking for --enable-menus... $ECHO_C" >&6
+
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6
+echo "configure:7948: checking for --${enablestring:-enable}-menus" >&5

           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"


@@ -7973,8 +7966,9 @@ 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


@@ -7982,28 +7976,28 @@ fi;
           fi
 
           if test "$wxUSE_MENUS" = yes; then
           fi
 
           if test "$wxUSE_MENUS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:7992: checking for --enable-miniframe" >&5
-echo $ECHO_N "checking for --enable-miniframe... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6
+echo "configure:7988: checking for --${enablestring:-enable}-miniframe" >&5

           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"


@@ -8012,8 +8006,9 @@ 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


@@ -8021,28 +8016,28 @@ fi;
           fi
 
           if test "$wxUSE_MINIFRAME" = yes; then
           fi
 
           if test "$wxUSE_MINIFRAME" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8031: checking for --enable-tooltips" >&5
-echo $ECHO_N "checking for --enable-tooltips... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6
+echo "configure:8028: checking for --${enablestring:-enable}-tooltips" >&5

           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"


@@ -8051,8 +8046,9 @@ 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


@@ -8060,28 +8056,28 @@ fi;
           fi
 
           if test "$wxUSE_TOOLTIPS" = yes; then
           fi
 
           if test "$wxUSE_TOOLTIPS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8070: checking for --enable-splines" >&5
-echo $ECHO_N "checking for --enable-splines... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6
+echo "configure:8068: checking for --${enablestring:-enable}-splines" >&5

           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"


@@ -8090,8 +8086,9 @@ 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


@@ -8099,28 +8096,28 @@ fi;
           fi
 
           if test "$wxUSE_SPLINES" = yes; then
           fi
 
           if test "$wxUSE_SPLINES" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8109: checking for --enable-validators" >&5
-echo $ECHO_N "checking for --enable-validators... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6
+echo "configure:8108: checking for --${enablestring:-enable}-validators" >&5

           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"


@@ -8129,8 +8126,9 @@ 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


@@ -8138,28 +8136,28 @@ fi;
           fi
 
           if test "$wxUSE_VALIDATORS" = yes; then
           fi
 
           if test "$wxUSE_VALIDATORS" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

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

           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"


@@ -8168,8 +8166,9 @@ 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


@@ -8177,28 +8176,28 @@ fi;
           fi
 
           if test "$wxUSE_BUSYINFO" = yes; then
           fi
 
           if test "$wxUSE_BUSYINFO" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8187: checking for --enable-joystick" >&5
-echo $ECHO_N "checking for --enable-joystick... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6
+echo "configure:8188: checking for --${enablestring:-enable}-joystick" >&5

           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"


@@ -8207,8 +8206,9 @@ 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


@@ -8216,28 +8216,28 @@ fi;
           fi
 
           if test "$wxUSE_JOYSTICK" = yes; then
           fi
 
           if test "$wxUSE_JOYSTICK" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8226: checking for --enable-metafile" >&5
-echo $ECHO_N "checking for --enable-metafile... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
+echo "configure:8228: checking for --${enablestring:-enable}-metafile" >&5

           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"


@@ -8246,8 +8246,9 @@ 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


@@ -8255,28 +8256,28 @@ fi;
           fi
 
           if test "$wxUSE_METAFILE" = yes; then
           fi
 
           if test "$wxUSE_METAFILE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8265: checking for --enable-dragimage" >&5
-echo $ECHO_N "checking for --enable-dragimage... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6
+echo "configure:8268: checking for --${enablestring:-enable}-dragimage" >&5

           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"


@@ -8285,8 +8286,9 @@ 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


@@ -8294,28 +8296,70 @@ fi;
           fi
 
           if test "$wxUSE_DRAGIMAGE" = yes; then
           fi
 
           if test "$wxUSE_DRAGIMAGE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8304: checking for --enable-palette" >&5
-echo $ECHO_N "checking for --enable-palette... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-accessibility""... $ac_c" 1>&6
+echo "configure:8308: checking for --${enablestring:-enable}-accessibility" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-palette or --disable-palette was given.
-if test "${enable_palette+set}" = set; then
-  enableval="$enable_palette"
-
+          # Check whether --enable-accessibility or --disable-accessibility was given.
+if test "${enable_accessibility+set}" = set; then
+  enableval="$enable_accessibility"
+  

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

-                            ac_cv_use_palette='wxUSE_PALETTE=yes'
+                            ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'

                           else
                           else

-                            ac_cv_use_palette='wxUSE_PALETTE=no'
+                            ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'

                           fi
                           fi

-
+                        

 else
 else

+  
+                          LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY
+                        
+fi
+
+
+          eval "$ac_cv_use_accessibility"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_ACCESSIBILITY" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+

 
 

+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6
+echo "configure:8350: checking for --${enablestring:-enable}-palette" >&5
+          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
+                        
+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"


@@ -8324,8 +8368,9 @@ 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


@@ -8333,28 +8378,28 @@ fi;
           fi
 
           if test "$wxUSE_PALETTE" = yes; then
           fi
 
           if test "$wxUSE_PALETTE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8343: checking for --enable-image" >&5
-echo $ECHO_N "checking for --enable-image... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6
+echo "configure:8390: checking for --${enablestring:-enable}-image" >&5

           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"


@@ -8363,8 +8408,9 @@ 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


@@ -8372,28 +8418,28 @@ fi;
           fi
 
           if test "$wxUSE_IMAGE" = yes; then
           fi
 
           if test "$wxUSE_IMAGE" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8382: checking for --enable-gif" >&5
-echo $ECHO_N "checking for --enable-gif... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6
+echo "configure:8430: checking for --${enablestring:-enable}-gif" >&5

           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"


@@ -8402,8 +8448,9 @@ 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


@@ -8411,28 +8458,28 @@ fi;
           fi
 
           if test "$wxUSE_GIF" = yes; then
           fi
 
           if test "$wxUSE_GIF" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8421: checking for --enable-pcx" >&5
-echo $ECHO_N "checking for --enable-pcx... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6
+echo "configure:8470: checking for --${enablestring:-enable}-pcx" >&5

           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"


@@ -8441,8 +8488,9 @@ 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


@@ -8450,28 +8498,28 @@ fi;
           fi
 
           if test "$wxUSE_PCX" = yes; then
           fi
 
           if test "$wxUSE_PCX" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8460: checking for --enable-iff" >&5
-echo $ECHO_N "checking for --enable-iff... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6
+echo "configure:8510: checking for --${enablestring:-enable}-iff" >&5

           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"


@@ -8480,8 +8528,9 @@ 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


@@ -8489,28 +8538,28 @@ fi;
           fi
 
           if test "$wxUSE_IFF" = yes; then
           fi
 
           if test "$wxUSE_IFF" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8499: checking for --enable-pnm" >&5
-echo $ECHO_N "checking for --enable-pnm... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6
+echo "configure:8550: checking for --${enablestring:-enable}-pnm" >&5

           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"


@@ -8519,8 +8568,9 @@ 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


@@ -8528,28 +8578,28 @@ fi;
           fi
 
           if test "$wxUSE_PNM" = yes; then
           fi
 
           if test "$wxUSE_PNM" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8538: checking for --enable-xpm" >&5
-echo $ECHO_N "checking for --enable-xpm... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6
+echo "configure:8590: checking for --${enablestring:-enable}-xpm" >&5

           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"


@@ -8558,8 +8608,9 @@ 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


@@ -8567,28 +8618,28 @@ fi;
           fi
 
           if test "$wxUSE_XPM" = yes; then
           fi
 
           if test "$wxUSE_XPM" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 

-          echo "$as_me:8577: checking for --enable-ico_cur" >&5
-echo $ECHO_N "checking for --enable-ico_cur... $ECHO_C" >&6
+         enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6
+echo "configure:8630: checking for --${enablestring:-enable}-ico_cur" >&5

           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"


@@ -8597,8 +8648,9 @@ 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


@@ -8606,18 +8658,18 @@ fi;
           fi
 
           if test "$wxUSE_ICO_CUR" = yes; then
           fi
 
           if test "$wxUSE_ICO_CUR" = yes; then

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

           else
           else

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

           fi
           fi

+        

 
 fi
 
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
 
 fi
 
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )

-        LEX_STEM="lexyy"
+    PATH_IFS=';'
+    LEX_STEM="lexyy"

   ;;
   *)
     PATH_IFS=':'
   ;;
   *)
     PATH_IFS=':'


@@ -8625,18 +8677,27 @@ case "${host}" in
   ;;
 esac
 
   ;;
 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 "$as_me:8631: checking for toolkit" >&5
-echo $ECHO_N "checking for toolkit... $ECHO_C" >&6
+echo $ac_n "checking for toolkit""... $ac_c" 1>&6
+echo "configure:8689: checking for toolkit" >&5
+
+# In Wine, we need to default to MSW, not GTK or MOTIF
+if test "$wxUSE_WINE" = "yes"; then
+    DEFAULT_DEFAULT_wxUSE_GTK=0
+    DEFAULT_DEFAULT_wxUSE_MOTIF=0
+    DEFAULT_DEFAULT_wxUSE_MSW=1
+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 "$as_me:8637: 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; }; }
+        { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }

     fi
 
     if test "$TOOLKIT_GIVEN" = 1; then
     fi
 
     if test "$TOOLKIT_GIVEN" = 1; then


@@ -8656,8 +8717,9 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
       done
     fi
 
       done
     fi
 

-            NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0}  \
-                  + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} + ${wxUSE_X11:-0}`
+            NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
+                  + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} \
+                  + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`

 
         case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx )
 
         case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx )


@@ -8668,14 +8730,10 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
       1)
       ;;
       0)
       1)
       ;;
       0)

-        { { echo "$as_me:8671: 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 a toolkit -- cannot determine the default for ${host}" 1>&2; exit 1; }

       ;;
       *)
       ;;
       *)

-        { { echo "$as_me:8676: error: Please specify at most one toolkit (may be some are cached?)" >&5
-echo "$as_me: error: Please specify at most one toolkit (may be some are cached?)" >&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; }

     esac
 
         for toolkit in `echo $ALL_TOOLKITS`; do
     esac
 
         for toolkit in `echo $ALL_TOOLKITS`; do


@@ -8689,14 +8747,12 @@ echo "$as_me: error: Please specify at most one toolkit (may be some are cached?
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`

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

         fi
       fi
     done
 else
         fi
       fi
     done
 else

-    echo "$as_me:8698: result: base ($host_alias hosted) only" >&5
-echo "${ECHO_T}base ($host_alias hosted) only" >&6
+    echo "$ac_t""base ($host_alias hosted) only" 1>&6

 fi
 
 wants_win32=0
 fi
 
 wants_win32=0


@@ -8714,30 +8770,37 @@ case "${host}" in
   ;;
 esac
 
   ;;
 esac
 

+if test "$wxUSE_WINE" = "yes"; then
+    wants_win32=1
+        CC=winegcc
+    CXX=wineg++
+    RESCOMP=wrc
+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 <<\EOF

 #define __WIN32__ 1
 EOF
 
 #define __WIN32__ 1
 EOF
 

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

 #define __WIN95__ 1
 EOF
 
 #define __WIN95__ 1
 EOF
 

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

 #define __WINDOWS__ 1
 EOF
 
 #define __WINDOWS__ 1
 EOF
 

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

 #define __GNUWIN32__ 1
 EOF
 
 #define __GNUWIN32__ 1
 EOF
 

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

 #define STRICT 1
 EOF
 
 #define STRICT 1
 EOF
 

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

 #define WINVER 0x0400
 EOF
 
 #define WINVER 0x0400
 EOF
 


@@ -8749,67 +8812,61 @@ 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 <<\EOF

 #define __UNIX__ 1
 EOF
 
 fi
 
 #define __UNIX__ 1
 EOF
 
 fi
 

-cat >confcache <<\_ACEOF
+
+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
 # 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.
+# 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.

 #
 #

-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
+# 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.

 #
 #

-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
+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.
 # 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 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 \
+      -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
   if test -w $cache_file; then

-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+    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


@@ -8822,585 +8879,219 @@ if test "$build" != "$host" ; then
         NM=$host_alias-nm
         STRIP=$host_alias-strip
     else
         NM=$host_alias-nm
         STRIP=$host_alias-strip
     else

-        { { echo "$as_me:8825: 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; }; }
+        { echo "configure: error: $build_alias -> $host_alias cross compilation not supported yet." 1>&2; exit 1; }

     fi
 fi
 
 CFLAGS=${CFLAGS:=}
     fi
 fi
 
 CFLAGS=${CFLAGS:=}

-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:8840: 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
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:8855: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:8863: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:8866: 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.
+# 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 "$as_me:8875: 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
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:8890: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:8898: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:8901: 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:8914: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8891: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:8929: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

 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 "$as_me:8937: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:8940: 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:8949: 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
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:8964: found $ac_dir/$ac_word" >&5
-break
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:8972: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:8975: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
+  echo "$ac_t""$CC" 1>&6

 else
 else

-  CC="$ac_cv_prog_CC"
+  echo "$ac_t""no" 1>&6

 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 "$as_me:8988: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8921: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-  ac_prog_rejected=yes
-  continue
-fi
-ac_cv_prog_CC="cc"
-echo "$as_me:9008: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

 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 $# != 0; then
+  if test $# -gt 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" ${1+"$@"}
+    set dummy "$ac_dir/$ac_word" "$@"

     shift
     ac_cv_prog_CC="$@"
   fi
 fi
 fi
 fi
     shift
     ac_cv_prog_CC="$@"
   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 "$as_me:9030: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  echo "$ac_t""$CC" 1>&6

 else
 else

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

 fi
 
 fi
 

-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:9044: 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
+  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:8972: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:9059: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

 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 "$as_me:9067: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  echo "$ac_t""$CC" 1>&6

 else
 else

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

 fi
 fi

-
-    test -n "$CC" && break
-  done
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }

 fi
 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:9083: 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
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:9098: found $ac_dir/$ac_word" >&5
-break
-done

 
 

-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:9106: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:9109: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:9004: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5

 
 

-  test -n "$ac_ct_CC" && break
-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

 
 

-  CC=$ac_ct_CC
-fi
-
-fi
-
-test -z "$CC" && { { echo "$as_me:9121: error: no acceptable cc found in \$PATH" >&5
-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:9126:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:9129: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:9132: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:9134: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:9137: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:9139: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:9142: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-#line 9146 "configure"
-#include "confdefs.h"
+cat > conftest.$ac_ext << EOF

 
 

-int
-main ()
-{
+#line 9015 "configure"
+#include "confdefs.h"

 
 

-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe"
-# 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:9162: 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:9165: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:9168: \$? = $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.
-for ac_file in `ls a.exe conftest.exe 2>/dev/null;
-                ls a.out conftest 2>/dev/null;
-                ls a.* conftest.* 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-    a.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 --akim.
-          export ac_cv_exeext
-          break;;
-    * ) break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:9191: error: C compiler cannot create executables" >&5
-echo "$as_me: error: C compiler cannot create executables" >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:9197: 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:9202: 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:9208: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9211: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
+main(){return(0);}
+EOF
+if { (eval echo configure:9020: \"$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

   else
   else

-    if test "$cross_compiling" = maybe; then
-       cross_compiling=yes
-    else
-       { { echo "$as_me:9218: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
+    ac_cv_prog_cc_cross=yes

   fi
   fi

-fi
-echo "$as_me:9226: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext
-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:9233: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:9235: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:9238: checking for executable suffix" >&5
-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:9240: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:9243: \$? = $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 `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          export ac_cv_exeext
-          break;;
-    * ) break;;
-  esac
-done

 else
 else

-  { { echo "$as_me:9259: error: cannot compute EXEEXT: cannot compile and link" >&5
-echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no

 fi
 fi

-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:9265: 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:9271: checking for object suffix" >&5
-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+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:9046: 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:9051: 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:9060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9277 "configure"
-#include "confdefs.h"
+  ac_cv_prog_gcc=no
+fi
+fi

 
 

-int
-main ()
-{
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:9289: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9292: \$? = $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 ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-{ { echo "$as_me:9304: error: cannot compute OBJEXT: cannot compile" >&5
-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-   { (exit 1); exit 1; }; }
+  GCC=

 fi
 
 fi
 

-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:9311: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:9315: 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
+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:9079: 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

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9321 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9336: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9339: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9342: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9345: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:9357: 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:9363: 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 9369 "configure"
-#include "confdefs.h"
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9381: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9384: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9387: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9390: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then

   ac_cv_prog_cc_g=yes
 else
   ac_cv_prog_cc_g=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+  ac_cv_prog_cc_g=no

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+

 fi
 fi

-echo "$as_me:9400: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&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"


@@ -9414,562 +9105,275 @@ else
     CFLAGS=
   fi
 fi
     CFLAGS=
   fi
 fi

-# 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:9427: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9430: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9433: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9436: \$? = $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 9448 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9461: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9464: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9467: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9470: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 9480 "configure"
-#include "confdefs.h"
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9492: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9495: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9498: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9501: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-cat 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
-cat 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

 
 

-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:9533: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:9112: checking how to run the C preprocessor" >&5

 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then

-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-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.
+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"

   # 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. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 9554 "configure"
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 9127 "configure"

 #include "confdefs.h"
 #include <assert.h>
 #include "confdefs.h"
 #include <assert.h>

-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:9559: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:9565: \$? = $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
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9133: \"$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

   :
 else
   :
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat 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 9588 "configure"
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 9144 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:9592: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:9598: \$? = $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
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9150: \"$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
+  :

 else
 else

-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
+  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 9161 "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:9167: \"$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
+  :

 else
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  # Passes both tests.
-ac_preproc_ok=:
-break
+  rm -rf conftest*
+  CPP=/lib/cpp

 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
-  break
+rm -f conftest*

 fi
 fi

-
-    done
-    ac_cv_prog_CPP=$CPP
-
+rm -f conftest*

 fi
 fi

-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:9635: 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.
-  # 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 9645 "configure"
-#include "confdefs.h"
-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:9650: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:9656: \$? = $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
-  cat 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 9679 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:9683: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:9689: \$? = $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
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"

 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
-  :
+  CPP="$ac_cv_prog_CPP"

 else
 else

-  { { echo "$as_me:9717: error: C preprocessor \"$CPP\" fails sanity check" >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-   { (exit 1); exit 1; }; }
+  ac_cv_prog_CPP="$CPP"

 fi
 fi

+echo "$ac_t""$CPP" 1>&6

 
 

-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:9729: 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
+if test $ac_cv_prog_gcc = yes; then
+    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+echo "configure:9193: 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

 else
     ac_pattern="Autoconf.*'x'"
 else
     ac_pattern="Autoconf.*'x'"

-  cat >conftest.$ac_ext <<_ACEOF
-#line 9736 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 9199 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP

-_ACEOF
+EOF

 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "$ac_pattern" >/dev/null 2>&1; then
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "$ac_pattern" >/dev/null 2>&1; then

+  rm -rf conftest*

   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*
 
   ac_cv_prog_gcc_traditional=no
 fi
 rm -f conftest*
 

+

   if test $ac_cv_prog_gcc_traditional = no; then
   if test $ac_cv_prog_gcc_traditional = no; then

-    cat >conftest.$ac_ext <<_ACEOF
-#line 9751 "configure"
+    cat > conftest.$ac_ext <<EOF
+#line 9217 "configure"

 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA

-_ACEOF
+EOF

 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "$ac_pattern" >/dev/null 2>&1; then
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "$ac_pattern" >/dev/null 2>&1; then

+  rm -rf conftest*

   ac_cv_prog_gcc_traditional=yes
 fi
 rm -f conftest*
 
   fi
 fi
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -f conftest*
 
   fi
 fi

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

   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 

-ac_ext=cc
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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
+

 
 CXXFLAGS=${CXXFLAGS:=}
 
 CXXFLAGS=${CXXFLAGS:=}

-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:9788: 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
+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:9254: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:9803: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

 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 "$as_me:9811: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  echo "$ac_t""$CXX" 1>&6

 else
 else

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

 fi
 
 fi
 

-    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:9827: 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
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:9842: found $ac_dir/$ac_word" >&5
-break
+test -n "$CXX" && break

 done
 done

+test -n "$CXX" || CXX="gcc"

 
 

-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:9850: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:9853: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi

 
 

-  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:9865:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:9868: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:9871: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:9873: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:9876: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:9878: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:9881: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:9884: 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 9890 "configure"
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:9286: 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 9297 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
+int main(){return(0);}
+EOF
+if { (eval echo configure:9302: \"$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
+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:9328: 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:9333: 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
 #endif

+EOF
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9342: \"$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

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9905: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9908: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9911: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9914: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:9926: 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:9932: 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 9938 "configure"
-#include "confdefs.h"
+echo "$ac_t""$ac_cv_prog_gxx" 1>&6

 
 

-int
-main ()
-{
+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:9950: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:9953: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9956: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:9959: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+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:9361: 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

   ac_cv_prog_cxx_g=yes
 else
   ac_cv_prog_cxx_g=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
+  ac_cv_prog_cxx_g=no

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+

 fi
 fi

-echo "$as_me:9969: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&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"


@@ -9983,204 +9387,78 @@ 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 9996 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10009: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:10012: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10015: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10018: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-#line 10028 "configure"
-#include "confdefs.h"
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10040: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:10043: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10046: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10049: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-cat 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 -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}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:10080: 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
+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
+
+
+# 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:9404: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:10095: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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=":"

 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 "$as_me:10103: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:10106: 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:10115: 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
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:10130: found $ac_dir/$ac_word" >&5
-break
-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:10139: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  echo "$ac_t""$RANLIB" 1>&6

 else
 else

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

 fi
 
 fi
 

-  RANLIB=$ac_ct_RANLIB
-else
-  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
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2

-echo "$as_me:10153: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9435: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_AR="ar"
-echo "$as_me:10168: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

   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 "$as_me:10177: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  echo "$ac_t""$AR" 1>&6

 else
 else

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

 fi
 
 fi
 

+

 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:


@@ -10188,39 +9466,31 @@ 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 "$as_me:10196: checking for a BSD compatible install" >&5
-echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:9475: checking for a BSD compatible install" >&5

 if test -z "$INSTALL"; then
 if test -z "$INSTALL"; then

-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-    ac_save_IFS=$IFS; IFS=$ac_path_separator
+    IFS="${IFS=        }"; ac_save_IFS="$IFS"; IFS=":"

   for ac_dir in $PATH; do
   for ac_dir in $PATH; do

-    IFS=$ac_save_IFS

     # Account for people who put trailing slashes in PATH elements.
     # Account for people who put trailing slashes in PATH elements.

-    case $ac_dir/ in
-    / | ./ | .// | /cC/* \
-    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
-    | /usr/ucb/* ) ;;
+    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
     *)
       # 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 $as_executable_p "$ac_dir/$ac_prog"; then
+        if test -f $ac_dir/$ac_prog; then

          if test $ac_prog = install &&
          if test $ac_prog = install &&

-            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then

            # AIX install.  It has an incompatible calling convention.
            :
            # AIX install.  It has an incompatible calling convention.
            :

-         elif test $ac_prog = install &&
-           grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :

          else
            ac_cv_path_install="$ac_dir/$ac_prog -c"
            break 2
          else
            ac_cv_path_install="$ac_dir/$ac_prog -c"
            break 2


@@ -10230,36 +9500,49 @@ else
       ;;
     esac
   done
       ;;
     esac
   done

+  IFS="$ac_save_IFS"

 
 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 "$as_me:10245: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+echo "$ac_t""$INSTALL" 1>&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}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'

 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 

+

 case ${INSTALL} in
   /* ) # Absolute
      ;;
 case ${INSTALL} in
   /* ) # Absolute
      ;;

+  ?:* ) # Drive letter, considered as absolute.
+     ;;

   *)
      INSTALL=`pwd`/${INSTALL} ;;
 esac
 
   *)
      INSTALL=`pwd`/${INSTALL} ;;
 esac
 

+case ${host} in
+    *-hp-hpux* )
+        INSTALL_DIR="mkdir"
+        ;;
+
+    *)  INSTALL_DIR="$INSTALL -d"
+        ;;
+esac
+
+

 case "${host}" in
 
                 powerpc-*-darwin* )
 case "${host}" in
 
                 powerpc-*-darwin* )


@@ -10272,43 +9555,41 @@ 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 "$as_me:10275: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9560: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_STRIP="strip"
-echo "$as_me:10290: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

   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 "$as_me:10299: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  echo "$ac_t""$STRIP" 1>&6

 else
 else

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

 fi
 
 fi
 

-echo "$as_me:10306: 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

 
 

+echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
+echo "configure:9589: 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
+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"


@@ -10317,8 +9598,8 @@ else
     fi
 
 fi
     fi
 
 fi

-echo "$as_me:10320: result: $wx_cv_prog_makeisgnu" >&5
-echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6
+
+echo "$ac_t""$wx_cv_prog_makeisgnu" 1>&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=""


@@ -10326,13 +9607,15 @@ else
     IF_GNU_MAKE="#"
 fi
 
     IF_GNU_MAKE="#"
 fi
 

+
+

 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then

-echo "$as_me:10330: 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
+echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6
+echo "configure:9615: 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

 else
 else

-
+  

 cat - << EOF > confMake
 check : file
        cp \$? \$@
 cat - << EOF > confMake
 check : file
        cp \$? \$@


@@ -10354,22 +9637,11 @@ else
 fi
 
 fi
 fi
 
 fi

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

 
 if test "x$wx_cv_prog_makevpath" != "xyes"; then
 
 if test "x$wx_cv_prog_makevpath" != "xyes"; then

-{ { echo "$as_me:10361: 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:
+{ echo "configure: 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,


@@ -10379,2899 +9651,1112 @@ 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.

-" >&2;}
-   { (exit 1); exit 1; }; }
-fi fi
+" 1>&2; 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 "$as_me:10389: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9662: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:10404: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

 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 "$as_me:10412: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
+  echo "$ac_t""$YACC" 1>&6

 else
 else

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

 fi
 
 fi
 

-  test -n "$YACC" && break
+test -n "$YACC" && break

 done
 test -n "$YACC" || YACC="yacc"
 
 done
 test -n "$YACC" || YACC="yacc"
 

-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:10427: 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
+
+# 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:9696: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_LEX="$ac_prog"
-echo "$as_me:10442: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

 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 "$as_me:10450: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6
+  echo "$ac_t""$LEX" 1>&6

 else
 else

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

 fi
 
 fi
 

-  test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
-

 if test -z "$LEXLIB"
 then
 if test -z "$LEXLIB"
 then

-  echo "$as_me:10463: 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 10471 "configure"
+  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:9730: 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 9738 "configure"

 #include "confdefs.h"
 #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 yywrap ();
-int
-main ()
-{
-yywrap ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10490: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10493: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10496: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10499: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_fl_yywrap=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:10510: 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:10515: 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 10523 "configure"
-#include "confdefs.h"
+    builtin and then its argument prototype would still apply.  */
+char yywrap();

 
 

-/* 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:10542: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10545: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10548: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10551: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_l_yywrap=yes
+int main() {
+yywrap()
+; return 0; }
+EOF
+if { (eval echo configure:9749: \"$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
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_l_yywrap=no
+  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.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+

 fi
 fi

-echo "$as_me:10562: 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"
+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
 
 fi
 

-fi

 
 

-if test "x$LEX" != "x:"; then
-  echo "$as_me:10573: 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
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:9773: 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
 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.
-echo '%%
-%%' | $LEX
-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
+  rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"

 else
 else

-  { { echo "$as_me:10587: 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; }; }
+  ac_cv_prog_LN_S=ln

 fi
 fi
 fi
 fi

-echo "$as_me:10592: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-echo "$as_me:10596: 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
-  # 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:10612: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:10615: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10618: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:10621: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_lex_yytext_pointer=yes
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+  echo "$ac_t""no" 1>&6

 fi
 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:10633: 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 <<\EOF
-#define YYTEXT_POINTER 1
-EOF
+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
+                              echo $ac_n "checking for drand48 in -lcExt""... $ac_c" 1>&6
+echo "configure:9799: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lcExt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9807 "configure"
+#include "confdefs.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 drand48();

 
 

+int main() {
+drand48()
+; return 0; }
+EOF
+if { (eval echo configure:9818: \"$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
 
 fi

-
-echo "$as_me:10645: 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:10649: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lcExt"

 else
 else

-  echo "$as_me:10652: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-if test "$wxUSE_MAC" != 1; then
+      else
+                    RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+      fi
+  ;;
+esac

 
 

-for ac_header in strings.h
+
+if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+    for ac_hdr in strings.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10661: 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 10667 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9850: 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 9855 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:10671: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:10677: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9860: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:10696: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 
 fi
 done
 
 fi
 

-for ac_header in stdlib.h
+for ac_hdr in stdlib.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10711: 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 10717 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9892: 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 9897 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:10721: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:10727: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9902: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:10746: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-for ac_header in malloc.h
+for ac_hdr in malloc.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10759: 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 10765 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9932: 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 9937 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:10769: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:10775: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9942: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:10794: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-for ac_header in unistd.h
+for ac_hdr in unistd.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10807: 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 10813 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9972: 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 9977 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:10817: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:10823: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9982: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:10842: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-for ac_header in wchar.h
+for ac_hdr in wchar.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10855: 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 10861 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10012: 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 10017 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:10865: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:10871: \$? = $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
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10022: \"$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
 else

-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:10890: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-if test "$ac_cv_header_wchar_h" != "yes"; then

 
 

-for ac_header in wcstr.h
+if test "$ac_cv_header_wchar_h" != "yes"; then
+        for ac_hdr in wcstr.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10905: 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 10911 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10054: 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 10059 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:10915: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:10921: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10064: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:10940: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 
 fi
 done
 
 fi
 

-for ac_header in fnmatch.h
+for ac_hdr in fnmatch.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10955: 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 10961 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10096: 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 10101 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:10965: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:10971: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10106: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:10990: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then

 
 

-for ac_func in fnmatch
+if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
+    for ac_func in fnmatch

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11005: 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 11011 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10137: 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 10142 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11042: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11045: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11048: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11051: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:11061: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:10165: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 
 fi
 done
 
 fi
 

-for ac_header in langinfo.h
+for ac_hdr in langinfo.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11076: 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 11082 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10195: 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 10200 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:11086: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:11092: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10205: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:11111: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 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
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes"; then

-
-for ac_header in X11/XKBlib.h
+                for ac_hdr in X11/XKBlib.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11127: 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 11133 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10246: 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 10251 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:11137: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:11143: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10256: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:11162: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
     fi
 fi
 
 fi
 done
 
     fi
 fi
 

-echo "$as_me:11175: 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
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:10287: 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
 else

-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line 11183 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10292 "configure"

 #include "confdefs.h"
 #include "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];
+
+int main() {
+
+/* 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;

 }
 }

-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;
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;

 }
 }

-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;
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;

 }
 }

-_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:11232: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11235: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11238: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11241: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:11258: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:11261: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-echo "$as_me:11266: 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 11272 "configure"
-#include "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;
+{ /* 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;

 }
 }

-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11330: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11333: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11336: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11339: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+
+; return 0; }
+EOF
+if { (eval echo configure:10341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   ac_cv_c_const=yes
 else
   ac_cv_c_const=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_const=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:11349: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then

 
 

-cat >>confdefs.h <<\EOF
-#define const
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 

 EOF
 
 fi
 
 EOF
 
 fi
 

-echo "$as_me:11359: 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
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:10362: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11367 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10369 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#ifndef __cplusplus
-static $ac_kw int static_foo () {return 0; }
-$ac_kw int foo () {return 0; }
-#endif

 
 

-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11376: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11379: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11382: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11385: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:10376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   ac_cv_c_inline=$ac_kw; break
 else
   ac_cv_c_inline=$ac_kw; break
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 done
 
 fi
 done
 
 fi

-echo "$as_me:11396: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-case $ac_cv_c_inline in
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in

   inline | yes) ;;
   inline | yes) ;;

-  no)
-cat >>confdefs.h <<\EOF
-#define inline
+  no) cat >> confdefs.h <<\EOF
+#define inline 

 EOF
  ;;
 EOF
  ;;

-  *)  cat >>confdefs.h <<EOF
+  *)  cat >> confdefs.h <<EOF

 #define inline $ac_cv_c_inline
 EOF
  ;;
 esac
 
 #define inline $ac_cv_c_inline
 EOF
  ;;
 esac
 

-echo "$as_me:11411: 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 11417 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>

 
 

-_ACEOF
-if { (eval echo "$as_me:11425: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:11431: \$? = $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
+echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:10403: 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
 else

-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_cv_header_stdc=yes
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_char=1

 else
 else

-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-#line 11453 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10411 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(char));
+  exit(0);
+}
+EOF
+if { (eval echo configure:10423: \"$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`

 else
 else

-  ac_cv_header_stdc=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_char=0

 fi
 fi

-rm -f conftest*
-
+rm -fr conftest*

 fi
 
 fi
 

-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 11471 "configure"
-#include "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
 fi

-rm -f conftest*
+echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+EOF

 
 

-fi

 
 

-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:10443: checking size of short" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else

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

-  :
+  ac_cv_sizeof_short=2

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11492 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10451 "configure"

 #include "confdefs.h"
 #include "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
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
+#include <stdio.h>
+#include <sys/types.h>
+main()

 {
 {

-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-        || toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);

 }
 }

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11518: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11521: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11526: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+EOF
+if { (eval echo configure:10463: \"$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`

 else
 else

-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_header_stdc=no
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_short=0

 fi
 fi

+rm -fr conftest*

 fi
 fi

-echo "$as_me:11539: 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 <<\EOF
-#define STDC_HEADERS 1
-EOF

 
 fi
 
 fi

+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF

 
 

-# 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:11555: 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 11561 "configure"
+echo $ac_n "checking size of void *""... $ac_c" 1>&6
+echo "configure:10483: 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
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_void_p=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10491 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11570: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11573: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11576: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:11586: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(void *));
+  exit(0);
+}

 EOF
 EOF

+if { (eval echo configure:10503: \"$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`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_void_p=0
+fi
+rm -fr conftest*
+fi

 
 fi
 
 fi

-done
+echo "$ac_t""$ac_cv_sizeof_void_p" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+EOF

 
 

-echo "$as_me:11596: 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
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:10523: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11602 "configure"
-#include "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:11617: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11620: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11623: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11626: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_char=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_char=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:11636: result: $ac_cv_type_char" >&5
-echo "${ECHO_T}$ac_cv_type_char" >&6
-
-echo "$as_me:11639: 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

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

-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 11648 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (char)) >= 0)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11660: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11663: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11666: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11669: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 11674 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11686: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11689: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11692: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11695: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
+  ac_cv_sizeof_int=4

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 11711 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10531 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-$ac_includes_default
-int
-main ()
+#include <stdio.h>
+#include <sys/types.h>
+main()

 {
 {

-int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)]
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);

 }
 }

-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11723: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11726: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11729: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11732: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
+EOF
+if { (eval echo configure:10543: \"$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`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0

 fi
 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 11748 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11760: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11763: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11766: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11769: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_char=$ac_lo
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:10563: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
   if test "$cross_compiling" = yes; then
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:11782: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  ac_cv_sizeof_long=4

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11787 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10571 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-$ac_includes_default
-int
-main ()
+#include <stdio.h>
+#include <sys/types.h>
+main()

 {
 {

-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  exit (1);
-fprintf (f, "%d", (sizeof (char)));
-fclose (f);
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);

 }
 }

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11803: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11806: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11808: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11811: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_char=`cat conftest.val`
+EOF
+if { (eval echo configure:10583: \"$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`

 else
 else

-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0

 fi
 fi

-rm -f conftest.val
-else
-  ac_cv_sizeof_char=0
+rm -fr conftest*

 fi
 fi

+

 fi
 fi

-echo "$as_me:11827: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
-cat >>confdefs.h <<EOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long

 EOF
 
 EOF
 

-echo "$as_me:11833: 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
+
+
+case "${host}" in
+    arm-*-linux* )
+        echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:10606: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 11839 "configure"
-#include "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:11854: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11857: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11860: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11863: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_short=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:11873: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6
-
-echo "$as_me:11876: 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

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

-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 11885 "configure"
+  ac_cv_sizeof_long_long=8
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10614 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-$ac_includes_default
-int
-main ()
+#include <stdio.h>
+#include <sys/types.h>
+main()

 {
 {

-int _array_ [1 - 2 * !((sizeof (short)) >= 0)]
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);

 }
 }

-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11897: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11900: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11903: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11906: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 11911 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11923: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11926: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11929: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11932: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; 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
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 11948 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (short)) >= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11960: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:11963: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11966: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11969: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-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 11985 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11997: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12000: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12003: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12006: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_short=$ac_lo
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:12019: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 12024 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  exit (1);
-fprintf (f, "%d", (sizeof (short)));
-fclose (f);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12040: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12043: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12045: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12048: \$? = $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
-cat conftest.$ac_ext >&5
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_short=0
-fi
-fi
-echo "$as_me:12064: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-cat >>confdefs.h <<EOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short

 EOF
 EOF

-
-echo "$as_me:12070: 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 12076 "configure"
-#include "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:12091: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12094: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12097: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12100: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_void_p=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_void_p=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:12110: result: $ac_cv_type_void_p" >&5
-echo "${ECHO_T}$ac_cv_type_void_p" >&6
-
-echo "$as_me:12113: 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
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 12122 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (void *)) >= 0)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12134: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12137: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12140: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12143: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12148 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (void *)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12160: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12163: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12166: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12169: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; 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
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12185 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (void *)) >= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12197: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12200: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12203: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12206: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-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 12222 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (void *)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12234: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12237: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12240: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12243: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_void_p=$ac_lo
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:12256: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 12261 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  exit (1);
-fprintf (f, "%d", (sizeof (void *)));
-fclose (f);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12277: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12280: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12282: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12285: \$? = $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
-cat conftest.$ac_ext >&5
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+if { (eval echo configure:10626: \"$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`

 else
 else

-  ac_cv_sizeof_void_p=0
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0

 fi
 fi

+rm -fr conftest*

 fi
 fi

-echo "$as_me:12301: result: $ac_cv_sizeof_void_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6
-cat >>confdefs.h <<EOF
-#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-EOF

 
 

-echo "$as_me:12307: 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 12313 "configure"
-#include "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:12328: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12331: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12334: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12337: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_int=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:12347: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:12350: 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
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 12359 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12371: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12374: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12377: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12380: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12385 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12397: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12400: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12403: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12406: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; 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
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12422 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12434: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12437: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12440: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12443: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-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 12459 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12471: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12474: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12480: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_int=$ac_lo
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:12493: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 12498 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  exit (1);
-fprintf (f, "%d", (sizeof (int)));
-fclose (f);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12514: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12517: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12519: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12522: \$? = $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
-cat conftest.$ac_ext >&5

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_int=0
-fi
-fi
-echo "$as_me:12538: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long

 EOF
 
 EOF
 

-echo "$as_me:12544: 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 12550 "configure"
-#include "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:12565: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12568: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12571: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12574: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_long=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:12584: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:12587: 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
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 12596 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12608: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12611: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12614: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12617: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12622 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12637: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12643: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; 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
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12659 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12671: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12674: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12677: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12680: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-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 12696 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12708: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12711: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12714: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12717: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_long=$ac_lo
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:12730: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 12735 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  exit (1);
-fprintf (f, "%d", (sizeof (long)));
-fclose (f);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12751: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12754: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12756: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12759: \$? = $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
-cat conftest.$ac_ext >&5
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_long=0
-fi
-fi
-echo "$as_me:12775: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF

 
 

-case "${host}" in
-    arm-*-linux* )
-        echo "$as_me:12783: 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 12789 "configure"
-#include "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:12804: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12807: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12810: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12813: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_long_long=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:12823: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
-echo "$as_me:12826: 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
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 12835 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) >= 0)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12847: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12850: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12853: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12856: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12861 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12873: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12876: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12879: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12882: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; 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
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 12898 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) >= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12910: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12913: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12916: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12919: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-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 12935 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12947: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:12950: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12953: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12956: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_long_long=$ac_lo
+    ;;
+    *-hp-hpux* )
+        echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:10648: 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
   if test "$cross_compiling" = yes; then
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:12969: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  ac_cv_sizeof_long_long=0

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 12974 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10656 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-$ac_includes_default
-int
-main ()
+#include <stdio.h>
+#include <sys/types.h>
+main()

 {
 {

-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  exit (1);
-fprintf (f, "%d", (sizeof (long long)));
-fclose (f);
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);

 }
 }

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12990: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:12993: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:12995: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:12998: \$? = $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
-cat conftest.$ac_ext >&5
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:10668: \"$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`

 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 "$as_me:13014: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-cat >>confdefs.h <<EOF
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF

 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 EOF
 
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 EOF
 

+
+        if test "$ac_cv_sizeof_long_long" != "0"; then
+                        CPPFLAGS="$CPPFLAGS -D_INCLUDE_LONGLONG"
+        fi

     ;;
     * )
     ;;
     * )

-        echo "$as_me:13022: 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 13028 "configure"
-#include "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:13043: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13046: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13049: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13052: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_long_long=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:13062: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
-echo "$as_me:13065: 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
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-#line 13074 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) >= 0)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13086: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13089: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13092: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13095: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 13100 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13112: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13115: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13118: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13121: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`; 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
-cat conftest.$ac_ext >&5
-ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-#line 13137 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) >= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13149: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13152: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13155: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13158: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-  done
-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 13174 "configure"
-#include "confdefs.h"
-$ac_includes_default
-int
-main ()
-{
-int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)]
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13186: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13189: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13192: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13195: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_lo=`expr $ac_mid + 1`
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-ac_cv_sizeof_long_long=$ac_lo
+        echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:10693: 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
   if test "$cross_compiling" = yes; then
 else
   if test "$cross_compiling" = yes; then

-  { { echo "$as_me:13208: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
+  ac_cv_sizeof_long_long=0

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13213 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10701 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-$ac_includes_default
-int
-main ()
+#include <stdio.h>
+#include <sys/types.h>
+main()

 {
 {

-FILE *f = fopen ("conftest.val", "w");
-if (!f)
-  exit (1);
-fprintf (f, "%d", (sizeof (long long)));
-fclose (f);
-  ;
-  return 0;
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);

 }
 }

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13229: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:13232: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13234: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13237: \$? = $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
-cat conftest.$ac_ext >&5
-fi
-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
+EOF
+if { (eval echo configure:10713: \"$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`

 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 "$as_me:13253: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-cat >>confdefs.h <<EOF
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF

 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 EOF
 
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 EOF
 

+

 esac
 
 esac
 

-echo "$as_me:13261: 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
+echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:10735: 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

 else
 else

-
+  

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

-  wx_cv_sizeof_wchar_t=4
-
+  
+            case "${host}" in
+              *-pc-msdosdjgpp )
+                wx_cv_sizeof_wchar_t=0
+                ;;
+              * )
+                wx_cv_sizeof_wchar_t=4
+                ;;
+            esac
+        
+    

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 13272 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10754 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

+            /* DJGPP only has fake wchar_t: */
+            #ifdef __DJGPP__
+            #  error "fake wchar_t"
+            #endif

             #ifdef HAVE_WCHAR_H
             #  ifdef __CYGWIN__
             #    include <stddef.h>
             #ifdef HAVE_WCHAR_H
             #  ifdef __CYGWIN__
             #    include <stddef.h>


@@ -13289,150 +10774,120 @@ else
                 fprintf(f, "%i", sizeof(wchar_t));
                 exit(0);
             }
                 fprintf(f, "%i", sizeof(wchar_t));
                 exit(0);
             }

-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13295: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:13298: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13300: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13303: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+        
+EOF
+if { (eval echo configure:10780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then

   wx_cv_sizeof_wchar_t=`cat conftestval`
 else
   wx_cv_sizeof_wchar_t=`cat conftestval`
 else

-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_sizeof_wchar_t=0
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  wx_cv_sizeof_wchar_t=0

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*

 fi
 
 fi
 

+

 fi
 fi

-echo "$as_me:13316: result: $wx_cv_sizeof_wchar_t" >&5
-echo "${ECHO_T}$wx_cv_sizeof_wchar_t" >&6

 
 

-cat >>confdefs.h <<EOF
+echo "$ac_t""$wx_cv_sizeof_wchar_t" 1>&6
+
+cat >> confdefs.h <<EOF

 #define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
 EOF
 
 #define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
 EOF
 

+

 # 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 "$as_me:13331: 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 13338 "configure"
+    
+    echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
+echo "configure:10812: 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 10818 "configure"

 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
                           #include <sys/types.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13354: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13357: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13360: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13363: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:10829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   ac_cv_sys_file_offset_bits=64
 else
   ac_cv_sys_file_offset_bits=64
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_sys_file_offset_bits=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_sys_file_offset_bits=no

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+        
+    

 fi
 fi

-echo "$as_me:13374: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+
+echo "$ac_t""$ac_cv_sys_file_offset_bits" 1>&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 <<EOF

 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 EOF
 
     fi
 
     if test "x$wx_largefile" != "xyes"; then
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 EOF
 
     fi
 
     if test "x$wx_largefile" != "xyes"; then

-
-    echo "$as_me:13387: 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 13394 "configure"
+        
+    echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
+echo "configure:10856: 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 10862 "configure"

 #include "confdefs.h"
 #define _LARGE_FILES 1
                           #include <sys/types.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13410: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13413: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13416: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13419: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:10873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   ac_cv_sys_large_files=1
 else
   ac_cv_sys_large_files=1
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_sys_large_files=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_sys_large_files=no

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+        
+    

 fi
 fi

-echo "$as_me:13430: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+
+echo "$ac_t""$ac_cv_sys_large_files" 1>&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 <<EOF

 #define _LARGE_FILES $ac_cv_sys_large_files
 EOF
 
 #define _LARGE_FILES $ac_cv_sys_large_files
 EOF
 


@@ -13440,100 +10895,82 @@ EOF
 
     fi
 
 
     fi
 

-    echo "$as_me:13443: checking if large file support is available" >&5
-echo $ECHO_N "checking if large file support is available... $ECHO_C" >&6
+    echo $ac_n "checking if large file support is available""... $ac_c" 1>&6
+echo "configure:10900: checking if large file support is available" >&5

     if test "x$wx_largefile" = "xyes"; then
     if test "x$wx_largefile" = "xyes"; then

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

 #define HAVE_LARGEFILE_SUPPORT 1
 EOF
 
     fi
 #define HAVE_LARGEFILE_SUPPORT 1
 EOF
 
     fi

-    echo "$as_me:13451: result: $wx_largefile" >&5
-echo "${ECHO_T}$wx_largefile" >&6
+    echo "$ac_t""$wx_largefile" 1>&6
+fi
+
+
+if test "x$wx_largefile" = "xyes"; then
+    if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
+        WX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+    else
+        WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
+    fi
+    CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"

 fi
 
 fi
 

-echo "$as_me:13455: 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
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:10921: 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

 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 <<_ACEOF
-#line 13463 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 10928 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13479: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13482: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13485: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13488: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:10939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   # 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 <<_ACEOF
-#line 13492 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 10943 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13508: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13511: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13514: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13517: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:10954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   ac_cv_c_bigendian=yes
 else
   ac_cv_c_bigendian=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_bigendian=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_bigendian=no

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 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 <<_ACEOF
-#line 13536 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10974 "configure"

 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */


@@ -13545,490 +10982,355 @@ main () {
   u.l = 1;
   exit (u.c[sizeof (long) - 1] == 1);
 }
   u.l = 1;
   exit (u.c[sizeof (long) - 1] == 1);
 }

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13550: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:13553: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:13555: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13558: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:10987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then

   ac_cv_c_bigendian=no
 else
   ac_cv_c_bigendian=no
 else

-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_c_bigendian=yes
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*

 fi
 fi

+

 fi
 fi
 fi
 fi

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

 if test $ac_cv_c_bigendian = unknown; then
 if test $ac_cv_c_bigendian = unknown; then

-  { echo "$as_me:13574: 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;}
+  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

 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 <<\EOF

 #define WORDS_BIGENDIAN 1
 EOF
 
 fi
 
 #define WORDS_BIGENDIAN 1
 EOF
 
 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
-echo "$as_me:13589: 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 "${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.
-  # 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 13606 "configure"
-#include "confdefs.h"
-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:13611: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:13617: \$? = $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
-  cat 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 13640 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:13644: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:13650: \$? = $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
-  cat 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
+echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:11015: checking how to run the C++ preprocessor" >&5
+if test -z "$CXXCPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:13687: 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.
-  # 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 13697 "configure"
+  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 11028 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <assert.h>
-                     Syntax error
-_ACEOF
-if { (eval echo "$as_me:13702: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:13708: \$? = $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
+#include <stdlib.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11033: \"$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

   :
 else
   :
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  # Broken: fails on valid input.
-continue
+  rm -rf conftest*
+  CXXCPP=/lib/cpp

 fi
 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 13731 "configure"
-#include "confdefs.h"
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:13735: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:13741: \$? = $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
-  cat conftest.$ac_ext >&5
-  # Passes both tests.
-ac_preproc_ok=:
-break
+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

 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:13769: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&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 <<\EOF

 #define wxUSE_IOSTREAMH 1
 EOF
 
   else
 #define wxUSE_IOSTREAMH 1
 EOF
 
   else

-
-    ac_ext=cc
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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
+

 
 

-for ac_header in iostream
+    for ac_hdr in iostream

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13796: 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 13802 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:13806: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:13812: \$? = $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
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11077: 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
 else

-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  eval "$as_ac_Header=yes"
+  cat > conftest.$ac_ext <<EOF
+#line 11082 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11087: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:13831: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

+

     if test "$ac_cv_header_iostream" = "yes" ; then
       :
     else
     if test "$ac_cv_header_iostream" = "yes" ; then
       :
     else

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

 #define wxUSE_IOSTREAMH 1
 EOF
 
     fi
 
     ac_ext=c
 #define wxUSE_IOSTREAMH 1
 EOF
 
     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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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
 

-  echo "$as_me:13858: checking if C++ compiler supports bool" >&5
-echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6
-if test "${wx_cv_cpp_bool+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else

 
 

-    ac_ext=cc
+
+  echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
+echo "configure:11135: 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
+else
+  
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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 <<_ACEOF
-#line 13871 "configure"
+
+    cat > conftest.$ac_ext <<EOF
+#line 11150 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-int
-main ()
-{
+      
+int main() {

 
         bool b = true;
 
         return 0;
 
         bool b = true;
 
         return 0;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13887: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13890: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13893: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13896: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+      
+; return 0; }
+EOF
+if { (eval echo configure:11162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

         wx_cv_cpp_bool=yes
         wx_cv_cpp_bool=yes

-
+      

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

         wx_cv_cpp_bool=no
         wx_cv_cpp_bool=no

-
+      
+    

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 
     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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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

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

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

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

 #define HAVE_BOOL 1
 EOF
 
   fi
 
 #define HAVE_BOOL 1
 EOF
 
   fi
 

-  echo "$as_me:13927: checking if C++ compiler supports the explicit keyword" >&5
-echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6
-if test "${wx_cv_explicit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else

 
 

-    ac_ext=cc
+
+  echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6
+echo "configure:11200: 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
+else
+  
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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 <<_ACEOF
-#line 13940 "configure"
+
+            cat > conftest.$ac_ext <<EOF
+#line 11215 "configure"

 #include "confdefs.h"
 
         class Foo { public: explicit Foo(int) {} };
 #include "confdefs.h"
 
         class Foo { public: explicit Foo(int) {} };

-
-int
-main ()
-{
+      
+int main() {

 
         return 0;
 
         return 0;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13956: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13959: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13962: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13965: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-        cat >conftest.$ac_ext <<_ACEOF
-#line 13969 "configure"
+      
+; return 0; }
+EOF
+if { (eval echo configure:11226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+        cat > conftest.$ac_ext <<EOF
+#line 11230 "configure"

 #include "confdefs.h"
 
                 class Foo { public: explicit Foo(int) {} };
                 static void TakeFoo(const Foo& foo) { }
 #include "confdefs.h"
 
                 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13987: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:13990: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13993: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:13996: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+            
+; return 0; }
+EOF
+if { (eval echo configure:11243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_explicit=no
 else
   wx_cv_explicit=no
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_explicit=yes
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_explicit=yes
+        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+      

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_explicit=no
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_explicit=no
+    

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 
     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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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

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

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

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

 #define HAVE_EXPLICIT 1
 EOF
 
   fi
 
 #define HAVE_EXPLICIT 1
 EOF
 
   fi
 

+
+echo $ac_n "checking whether the compiler supports const_cast<>""... $ac_c" 1>&6
+echo "configure:11285: 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
+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 11298 "configure"
+#include "confdefs.h"
+
+int main() {
+int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
+; return 0; }
+EOF
+if { (eval echo configure:11305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  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
+fi
+rm -f 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
+
+
+fi
+
+echo "$ac_t""$ac_cv_cxx_const_cast" 1>&6
+if test "$ac_cv_cxx_const_cast" = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_CONST_CAST 
+EOF
+
+fi
+
+
+

 SEARCH_INCLUDE="\
     /usr/local/include        \
                               \
 SEARCH_INCLUDE="\
     /usr/local/include        \
                               \


@@ -14092,119 +11394,99 @@ SEARCH_INCLUDE="\
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \

-    /usr/openwin/share/include \
-                               \
-    /usr/include"
+    /usr/openwin/share/include"

 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 

-cat >confcache <<\_ACEOF
+
+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
 # 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.
+# 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.

 #
 #

-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
+# 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.

 #
 #

-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
+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.
 # 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 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 \
+      -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
   if test -w $cache_file; then

-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+    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; then
-    echo "$as_me:14157: 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 14164 "configure"
+if test "$USE_LINUX" = 1; then
+    echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
+echo "configure:11453: 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 11459 "configure"

 #include "confdefs.h"
 #include <features.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14180: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:14183: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14186: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:14189: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+            
+; return 0; }
+EOF
+if { (eval echo configure:11470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                 wx_cv_lib_glibc21=yes
                 wx_cv_lib_glibc21=yes

-
+            

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                 wx_cv_lib_glibc21=no
                 wx_cv_lib_glibc21=no

-
+            
+        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+    

 fi
 fi

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

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

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

 #define wxHAVE_GLIBC2 1
 EOF
 
 #define wxHAVE_GLIBC2 1
 EOF
 


@@ -14213,139 +11495,116 @@ fi
 
 if test "x$wx_cv_lib_glibc21" = "xyes"; then
     if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
 
 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 <<\EOF

 #define _GNU_SOURCE 1
 EOF
 
     fi
 fi
 
 #define _GNU_SOURCE 1
 EOF
 
     fi
 fi
 

+
+

 REGEX_INCLUDE=
 if test "$wxUSE_REGEX" != "no"; then
 REGEX_INCLUDE=
 if test "$wxUSE_REGEX" != "no"; then

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

 #define wxUSE_REGEX 1
 EOF
 
 #define wxUSE_REGEX 1
 EOF
 

+

     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then

-                        echo "$as_me:14230: checking for regex.h" >&5
-echo $ECHO_N "checking for regex.h... $ECHO_C" >&6
-if test "${ac_cv_header_regex_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 14236 "configure"
+                        ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for regex.h""... $ac_c" 1>&6
+echo "configure:11518: 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 11523 "configure"

 #include "confdefs.h"
 #include <regex.h>
 #include "confdefs.h"
 #include <regex.h>

-_ACEOF
-if { (eval echo "$as_me:14240: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:14246: \$? = $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_cv_header_regex_h=yes
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11528: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  ac_cv_header_regex_h=no
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:14265: result: $ac_cv_header_regex_h" >&5
-echo "${ECHO_T}$ac_cv_header_regex_h" >&6
-if test $ac_cv_header_regex_h = yes; then
-
-for ac_func in regcomp
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  for ac_func in regcomp

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14272: 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 14278 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:11547: 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
 else

-  which can conflict with char $ac_func (); below.  */
+  cat > conftest.$ac_ext <<EOF
+#line 11552 "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.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14310: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:14313: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14316: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:14319: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:14329: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:11575: \"$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
+ 
+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 "$as_me:14343: 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; }; }
+                { echo "configure: error: system regex library not found! Use --with-regex to use built-in version" 1>&2; exit 1; }

             else
             else

-                { echo "$as_me:14347: 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;}
+                echo "configure: warning: system regex library not found, will use built-in instead" 1>&2

                 wxUSE_REGEX=builtin
             fi
         else
                 wxUSE_REGEX=builtin
             fi
         else


@@ -14358,115 +11617,149 @@ echo "$as_me: WARNING: system regex library not found, will use built-in instead
     fi
 fi
 
     fi
 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 <<\EOF

 #define wxUSE_ZLIB 1
 EOF
 
 #define wxUSE_ZLIB 1
 EOF
 

+

     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then

-        echo "$as_me:14369: 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
+                                                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:11635: 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

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 14375 "configure"
-#include "confdefs.h"
-#include <zlib.h>
-_ACEOF
-if { (eval echo "$as_me:14379: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:14385: \$? = $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
+  if test "$cross_compiling" = yes; then
+                      unset ac_cv_header_zlib_h
+                

 else
 else

-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_cv_header_zlib_h=yes
+  cat > conftest.$ac_ext <<EOF
+#line 11644 "configure"
+#include "confdefs.h"
+                    
+                        #include <zlib.h>
+                        #include <stdio.h>
+
+                        int main()
+                        {
+                            FILE *f=fopen("conftestval", "w");
+                            if (!f) exit(1);
+                            fprintf(f, "%s",
+                                    ZLIB_VERSION[0] == '1' &&
+                                    (ZLIB_VERSION[2] > '1' ||
+                                    (ZLIB_VERSION[2] == '1' &&
+                                     ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
+                            exit(0);
+                        }
+                    
+EOF
+if { (eval echo configure:11663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_header_zlib_h=`cat conftestval`

 else
 else

-  echo "$as_me: failed program was:" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

+  rm -fr conftest*

   ac_cv_header_zlib_h=no
 fi
   ac_cv_header_zlib_h=no
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -fr conftest*

 fi
 fi

-echo "$as_me:14404: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-if test $ac_cv_header_zlib_h = yes; then
-  echo "$as_me:14407: 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
+
+            
+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:11681: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 14415 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 11686 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

+#include <zlib.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11691: \"$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
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+            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:11718: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lz  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11726 "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 deflate ();
-int
-main ()
-{
-deflate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14434: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:14437: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14440: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:14443: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_z_deflate=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:14454: 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"
+    builtin and then its argument prototype would still apply.  */
+char deflate();
+
+int main() {
+deflate()
+; return 0; }
+EOF
+if { (eval echo configure:11737: \"$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
 
 fi

+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  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
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then

-                { { echo "$as_me:14464: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" >&5
-echo "$as_me: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
+                { echo "configure: error: zlib library not found or too old! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }

             else
             else

-                { echo "$as_me:14468: WARNING: system zlib compression library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system zlib compression library not found, will use built-in instead" >&2;}
+                echo "configure: warning: zlib library not found or too old, will use built-in instead" 1>&2

                 wxUSE_ZLIB=builtin
             fi
         else
                 wxUSE_ZLIB=builtin
             fi
         else


@@ -14479,132 +11772,155 @@ echo "$as_me: WARNING: system zlib compression library not found, will use built
     fi
 fi
 
     fi
 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 <<\EOF

 #define wxUSE_LIBPNG 1
 EOF
 
 #define wxUSE_LIBPNG 1
 EOF
 

+

     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then

-        { echo "$as_me:14490: 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;}
+        echo "configure: warning: wxMGL doesn't work with builtin png library, will use MGL one instead" 1>&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 "$as_me:14496: 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;}
+        echo "configure: warning: system png library doesn't work without system zlib, will use built-in instead" 1>&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 "$as_me:14503: 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
+                                    echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6
+echo "configure:11798: 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
+else
+  if test "$cross_compiling" = yes; then
+                      unset ac_cv_header_png_h
+                

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 14509 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 11807 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <png.h>
-_ACEOF
-if { (eval echo "$as_me:14513: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:14519: \$? = $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
+                    
+                        #include <png.h>
+                        #include <stdio.h>
+
+                        int main()
+                        {
+                            FILE *f=fopen("conftestval", "w");
+                            if (!f) exit(1);
+                            fprintf(f, "%s",
+                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                            exit(0);
+                        }
+                    
+EOF
+if { (eval echo configure:11823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_header_png_h=`cat conftestval`

 else
 else

-  ac_cpp_err=yes
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_png_h=no
+fi
+rm -fr conftest*
+fi
+
+            

 fi
 fi

-if test -z "$ac_cpp_err"; then
-  ac_cv_header_png_h=yes
+
+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:11841: 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
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11846 "configure"
+#include "confdefs.h"
+#include <png.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11851: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  ac_cv_header_png_h=no
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6

 fi
 fi

-echo "$as_me:14538: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-if test $ac_cv_header_png_h = yes; then
-  echo "$as_me:14541: checking for png_check_sig in -lpng" >&5
-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+
+            if test "$ac_cv_header_png_h" = "yes"; then
+                echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+echo "configure:11875: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lpng -lz -lm $LIBS"
 LIBS="-lpng -lz -lm $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 14549 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 11883 "configure"

 #include "confdefs.h"
 #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 png_check_sig ();
-int
-main ()
-{
-png_check_sig ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14568: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:14571: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14574: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:14577: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_png_png_check_sig=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:14588: 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"
+    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:11894: \"$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
+  PNG_LINK=" -lpng"
+else
+  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

+            fi
+

             if test "x$PNG_LINK" = "x" ; then
                 if test "$wxUSE_LIBPNG" = "sys" ; then
             if test "x$PNG_LINK" = "x" ; then
                 if test "$wxUSE_LIBPNG" = "sys" ; then

-                    { { echo "$as_me:14598: error: system png library not found! Use --with-libpng=builtin to use built-in version" >&5
-echo "$as_me: error: system png library not found! Use --with-libpng=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
+                    { echo "configure: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }

                 else
                 else

-                    { echo "$as_me:14602: WARNING: system png library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system png library not found, will use built-in instead" >&2;}
+                    echo "configure: warning: system png library not found or too old, will use built-in instead" 1>&2

                     wxUSE_LIBPNG=builtin
                 fi
             else
                     wxUSE_LIBPNG=builtin
                 fi
             else

-                                wxUSE_LIBPNG=yes
+                                wxUSE_LIBPNG=sys

             fi
         fi
     fi
             fi
         fi
     fi


@@ -14616,132 +11932,104 @@ echo "$as_me: WARNING: system png library not found, will use built-in instead"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 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 <<\EOF

 #define wxUSE_LIBJPEG 1
 EOF
 
 #define wxUSE_LIBJPEG 1
 EOF
 

+

     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then

-        { echo "$as_me:14627: 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;}
+        echo "configure: warning: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" 1>&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 "$as_me:14634: 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
+                                                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:11953: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 14640 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 11958 "configure"

 #include "confdefs.h"
 
                         #undef HAVE_STDLIB_H
                         #include <stdio.h>
                         #include <jpeglib.h>
 #include "confdefs.h"
 
                         #undef HAVE_STDLIB_H
                         #include <stdio.h>
                         #include <jpeglib.h>

+                    
+int main() {

 
 

-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14656: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:14659: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14662: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:14665: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+                    
+; return 0; }
+EOF
+if { (eval echo configure:11970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   ac_cv_header_jpeglib_h=yes
 else
   ac_cv_header_jpeglib_h=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_header_jpeglib_h=no
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_jpeglib_h=no
+                

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+            

 fi
 
 fi
 

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

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

-                echo "$as_me:14682: 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
+                echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+echo "configure:11988: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-ljpeg  $LIBS"
 LIBS="-ljpeg  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 14690 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 11996 "configure"

 #include "confdefs.h"
 #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 jpeg_read_header ();
-int
-main ()
-{
-jpeg_read_header ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14709: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:14712: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14715: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:14718: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_jpeg_jpeg_read_header=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:14729: 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
+    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:12007: \"$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

   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 "$as_me:14739: 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; }; }
+                    { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; }

                 else
                 else

-                    { echo "$as_me:14743: 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;}
+                    echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2

                     wxUSE_LIBJPEG=builtin
                 fi
             else
                     wxUSE_LIBJPEG=builtin
                 fi
             else


@@ -14755,115 +12043,102 @@ echo "$as_me: WARNING: system jpeg library not found, will use built-in instead"
     fi
 fi
 
     fi
 fi
 

+

 TIFF_INCLUDE=
 TIFF_LINK=
 TIFF_INCLUDE=
 TIFF_LINK=

+TIFF_PREREQ_LINKS=-lm

 if test "$wxUSE_LIBTIFF" != "no" ; then
 if test "$wxUSE_LIBTIFF" != "no" ; then

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

 #define wxUSE_LIBTIFF 1
 EOF
 
 #define wxUSE_LIBTIFF 1
 EOF
 

+

     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then

-        echo "$as_me:14766: checking for tiffio.h" >&5
-echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6
-if test "${ac_cv_header_tiffio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 14772 "configure"
+                        if test "$wxUSE_LIBJPEG" = "sys"; then
+            TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_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:12066: 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 12071 "configure"

 #include "confdefs.h"
 #include <tiffio.h>
 #include "confdefs.h"
 #include <tiffio.h>

-_ACEOF
-if { (eval echo "$as_me:14776: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:14782: \$? = $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_cv_header_tiffio_h=yes
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12076: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  ac_cv_header_tiffio_h=no
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:14801: result: $ac_cv_header_tiffio_h" >&5
-echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
-if test $ac_cv_header_tiffio_h = yes; then
-  echo "$as_me:14804: 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
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltiff -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 14812 "configure"
+  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
+  echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
+echo "configure:12093: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12101 "configure"

 #include "confdefs.h"
 #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 TIFFError ();
-int
-main ()
-{
-TIFFError ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14831: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:14834: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14837: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:14840: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_tiff_TIFFError=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:14851: 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
+    builtin and then its argument prototype would still apply.  */
+char TIFFError();
+
+int main() {
+TIFFError()
+; return 0; }
+EOF
+if { (eval echo configure:12112: \"$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

   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 "$as_me:14861: 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; }; }
+                { echo "configure: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" 1>&2; exit 1; }

             else
             else

-                { echo "$as_me:14865: 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;}
+                echo "configure: warning: system tiff library not found, will use built-in instead" 1>&2

                 wxUSE_LIBTIFF=builtin
             fi
         else
                 wxUSE_LIBTIFF=builtin
             fi
         else


@@ -14876,122 +12151,103 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
     fi
 fi
 
     fi
 fi
 

+

 AFMINSTALL=
 AFMINSTALL=

+WIN32INSTALL=

 
 TOOLKIT=
 TOOLKIT_INCLUDE=
 WIDGET_SET=
 
 if test "$USE_WIN32" = 1 ; then
 
 TOOLKIT=
 TOOLKIT_INCLUDE=
 WIDGET_SET=
 
 if test "$USE_WIN32" = 1 ; then

-
-for ac_header in w32api.h
+    for ac_hdr in w32api.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14890: 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 14896 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12168: 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 12173 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:14900: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:14906: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12178: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:14925: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-    echo "$as_me:14935: 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
+    ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+echo "configure:12206: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 14941 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 12211 "configure"

 #include "confdefs.h"
 #include <windows.h>
 #include "confdefs.h"
 #include <windows.h>

-_ACEOF
-if { (eval echo "$as_me:14945: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:14951: \$? = $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_cv_header_windows_h=yes
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12216: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  ac_cv_header_windows_h=no
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:14970: result: $ac_cv_header_windows_h" >&5
-echo "${ECHO_T}$ac_cv_header_windows_h" >&6
-if test $ac_cv_header_windows_h = yes; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6

   :
 else
   :
 else

+  echo "$ac_t""no" 1>&6

 
 

-        { { echo "$as_me:14976: 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; }; }
-
+        { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+    

 fi
 
 fi
 

-        echo "$as_me:14982: checking if w32api has good enough MSIE support" >&5
-echo $ECHO_N "checking if w32api has good enough MSIE support... $ECHO_C" >&6
-if test "${wx_cv_w32api_win32_ie+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else

 
 

-      cat >conftest.$ac_ext <<_ACEOF
-#line 14989 "configure"
+        echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6
+echo "configure:12242: 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
+else
+  
+      cat > conftest.$ac_ext <<EOF
+#line 12248 "configure"

 #include "confdefs.h"
 #include <w32api.h>
 #include "confdefs.h"
 #include <w32api.h>

-int
-main ()
-{
+int main() {

 
                        #define wxCHECK_W32API_VERSION( major, minor ) \
                        ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
 
                        #define wxCHECK_W32API_VERSION( major, minor ) \
                        ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \


@@ -15001,56 +12257,66 @@ main ()
                        #if !wxCHECK_W32API_VERSION(1,1)
                        #error You need w32api 1.1 or newer
                        #endif
                        #if !wxCHECK_W32API_VERSION(1,1)
                        #error You need w32api 1.1 or newer
                        #endif

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15010: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:15013: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15016: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15019: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                     
+; return 0; }
+EOF
+if { (eval echo configure:12264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                         wx_cv_w32api_win32_ie=yes
                         wx_cv_w32api_win32_ie=yes

-
+                     

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                         wx_cv_w32api_win32_ie=no
                         wx_cv_w32api_win32_ie=no

-
+                     

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+    

 fi
 fi

-echo "$as_me:15034: result: $wx_cv_w32api_win32_ie" >&5
-echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
+
+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"
 
     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"
 

+    if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
+        LIBS="$LIBS -loleacc"
+    fi
+

     case "${host}" in
         *-*-cygwin* )
                         LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 
     case "${host}" in
         *-*-cygwin* )
                         LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 

-        if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
+        if test "$wxUSE_ODBC" = "sys" ; then
+        wxUSE_ODBC = "yes"

     fi
     fi

+    if test "$wxUSE_ODBC" = "yes" ; then
+        LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
+        cat >> confdefs.h <<\EOF
+#define wxUSE_ODBC 1
+EOF

 
 

+    fi
+    

     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
     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
 fi
 
 if test "$wxUSE_GUI" = "yes"; then


@@ -15066,45 +12332,42 @@ if test "$wxUSE_GUI" = "yes"; then
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
 
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
 

-                                case "${host}" in
-            *-*-mingw32* )
-                LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
-        esac
+                        LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"

     fi
 
     if test "$wxUSE_GTK" = 1; then
     fi
 
     if test "$wxUSE_GTK" = 1; then

-        echo "$as_me:15076: checking for GTK+ version" >&5
-echo $ECHO_N "checking for GTK+ version... $ECHO_C" >&6
+        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:12341: checking for GTK+ version" >&5

 
         gtk_version_cached=1
 
         gtk_version_cached=1

-        if test "${wx_cv_lib_gtk+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-
+  

                                                 gtk_version_cached=0
                                                 gtk_version_cached=0

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

 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then
                     GTK_MODULES=gthread
                 fi
 
 
                                                 GTK_MODULES=
                 if test "$wxUSE_THREADS" = "yes"; then
                     GTK_MODULES=gthread
                 fi
 

-                wx_cv_lib_gtk=
+                                                wx_cv_lib_gtk=

                 if test "x$wxUSE_GTK2" = "xyes"; then
                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"
                 if test "x$wxUSE_GTK2" = "xyes"; then
                     # 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


@@ -15114,42 +12377,41 @@ fi;
 
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2

-echo "$as_me:15117: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:12382: 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

 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.
+  ;;

   *)
   *)

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  if $as_executable_p "$ac_dir/$ac_word"; then
-   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:15134: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
+  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"

   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 "$as_me:15146: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  echo "$ac_t""$PKG_CONFIG" 1>&6

 else
 else

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

 fi
 
 fi
 

+

   if test x$PKG_CONFIG != xno ; then
     if pkg-config --atleast-pkgconfig-version 0.7 ; then
       :
   if test x$PKG_CONFIG != xno ; then
     if pkg-config --atleast-pkgconfig-version 0.7 ; then
       :


@@ -15163,8 +12425,8 @@ fi
   fi
 
   min_gtk_version=2.0.0
   fi
 
   min_gtk_version=2.0.0

-  echo "$as_me:15166: checking for GTK+ - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
+  echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:12430: checking for GTK+ - version >= $min_gtk_version" >&5

 
   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


@@ -15198,15 +12460,15 @@ echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
       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 <<_ACEOF
-#line 15202 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 12465 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 

-int
+int 

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -15225,7 +12487,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");


@@ -15235,7 +12497,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))


@@ -15273,38 +12535,28 @@ main ()
   return 1;
 }
 
   return 1;
 }
 

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15278: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15281: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15283: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15286: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:12540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then

   :
 else
   :
 else

-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-no_gtk=yes
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  no_gtk=yes

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*

 fi
 fi

+

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     echo "$as_me:15302: 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
+     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     

   else
   else

-     echo "$as_me:15306: result: no" >&5
-echo "${ECHO_T}no" >&6
+     echo "$ac_t""no" 1>&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"


@@ -15317,33 +12569,19 @@ echo "${ECHO_T}no" >&6
          ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
          ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"

-          cat >conftest.$ac_ext <<_ACEOF
-#line 15321 "configure"
+          cat > conftest.$ac_ext <<EOF
+#line 12574 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 

-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:15336: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15339: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15342: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15345: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+; return 0; }
+EOF
+if { (eval echo configure:12584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

    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"


@@ -15352,14 +12590,15 @@ if { (eval echo "$as_me:15336: \"$ac_link\"") >&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 "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
- echo "*** The test program failed to compile or link. See the file config.log for the"
+  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 "*** 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.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi


@@ -15368,20 +12607,18 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      GTK_LIBS=""
      :
   fi
      GTK_LIBS=""
      :
   fi

-
+  
+  

   rm -f conf.gtktest
 
   rm -f conf.gtktest
 

-                fi
-
-                if test -z "$wx_cv_lib_gtk"; then
-
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+                else
+                    # 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


@@ -15389,19 +12626,21 @@ 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


@@ -15422,45 +12661,43 @@ fi;
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2

-echo "$as_me:15425: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:12666: 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

 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.
+  ;;

   *)
   *)

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  if $as_executable_p "$ac_dir/$ac_word"; then
-   ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:15442: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
+  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"

   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 "$as_me:15454: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6
+  echo "$ac_t""$GTK_CONFIG" 1>&6

 else
 else

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

 fi
 
   min_gtk_version=1.2.7
 fi
 
   min_gtk_version=1.2.7

-  echo "$as_me:15462: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:12701: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes


@@ -15482,15 +12719,15 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
       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 <<_ACEOF
-#line 15486 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 12724 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 

-int
+int 

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -15509,7 +12746,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");


@@ -15520,7 +12757,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) ||


@@ -15560,38 +12797,28 @@ main ()
   return 1;
 }
 
   return 1;
 }
 

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15565: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15568: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15570: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15573: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:12802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then

   :
 else
   :
 else

-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-no_gtk=yes
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  no_gtk=yes

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*

 fi
 fi

+

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     echo "$as_me:15589: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-     wx_cv_lib_gtk=1.2.7
+     echo "$ac_t""yes" 1>&6
+     wx_cv_lib_gtk=1.2.7     

   else
   else

-     echo "$as_me:15593: result: no" >&5
-echo "${ECHO_T}no" >&6
+     echo "$ac_t""no" 1>&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"


@@ -15604,33 +12831,19 @@ echo "${ECHO_T}no" >&6
           echo "*** Could not run GTK test program, checking why..."
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           echo "*** Could not run GTK test program, checking why..."
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"

-          cat >conftest.$ac_ext <<_ACEOF
-#line 15608 "configure"
+          cat > conftest.$ac_ext <<EOF
+#line 12836 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 

-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:15623: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15626: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15629: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15632: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+; return 0; }
+EOF
+if { (eval echo configure:12846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

    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"


@@ -15644,16 +12857,17 @@ if { (eval echo "$as_me:15623: \"$ac_link\"") >&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 "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
- echo "*** The test program failed to compile or link. See the file config.log for the"
+  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 "*** 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.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi


@@ -15662,20 +12876,19 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      GTK_LIBS=""
      :
   fi
      GTK_LIBS=""
      :
   fi

-
+  
+  

   rm -f conf.gtktest
 
   rm -f conf.gtktest
 

-                fi
-
-                if test -z "$wx_cv_lib_gtk"; then

 
 

-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+                    if test -z "$wx_cv_lib_gtk"; then
+                        # 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


@@ -15683,19 +12896,21 @@ 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


@@ -15716,45 +12931,43 @@ fi;
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2

-echo "$as_me:15719: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:12936: 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

 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.
+  ;;

   *)
   *)

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  if $as_executable_p "$ac_dir/$ac_word"; then
-   ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:15736: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
+  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"

   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 "$as_me:15748: result: $GTK_CONFIG" >&5
-echo "${ECHO_T}$GTK_CONFIG" >&6
+  echo "$ac_t""$GTK_CONFIG" 1>&6

 else
 else

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

 fi
 
   min_gtk_version=1.2.3
 fi
 
   min_gtk_version=1.2.3

-  echo "$as_me:15756: checking for GTK - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:12971: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes


@@ -15776,15 +12989,15 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
       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 <<_ACEOF
-#line 15780 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 12994 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 

-int
+int 

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -15803,7 +13016,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");


@@ -15814,7 +13027,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) ||


@@ -15854,38 +13067,28 @@ main ()
   return 1;
 }
 
   return 1;
 }
 

-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15859: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15862: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15864: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15867: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+EOF
+if { (eval echo configure:13072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then

   :
 else
   :
 else

-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-no_gtk=yes
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  no_gtk=yes

 fi
 fi

-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -fr conftest*

 fi
 fi

+

        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
      fi
   fi
   if test "x$no_gtk" = x ; then

-     echo "$as_me:15883: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-     wx_cv_lib_gtk=1.2.3
+     echo "$ac_t""yes" 1>&6
+     wx_cv_lib_gtk=1.2.3     

   else
   else

-     echo "$as_me:15887: result: no" >&5
-echo "${ECHO_T}no" >&6
+     echo "$ac_t""no" 1>&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"


@@ -15898,33 +13101,19 @@ echo "${ECHO_T}no" >&6
           echo "*** Could not run GTK test program, checking why..."
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           echo "*** Could not run GTK test program, checking why..."
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"

-          cat >conftest.$ac_ext <<_ACEOF
-#line 15902 "configure"
+          cat > conftest.$ac_ext <<EOF
+#line 13106 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 

-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:15917: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15920: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15923: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15926: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+; return 0; }
+EOF
+if { (eval echo configure:13116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

    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"


@@ -15938,16 +13127,17 @@ if { (eval echo "$as_me:15917: \"$ac_link\"") >&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 "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
- echo "*** The test program failed to compile or link. See the file config.log for the"
+  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 "*** 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.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi


@@ -15956,9 +13146,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      GTK_LIBS=""
      :
   fi
      GTK_LIBS=""
      :
   fi

-
+  
+  

   rm -f conf.gtktest
 
   rm -f conf.gtktest
 

+                    fi

                 fi
 
                 if test -z "$wx_cv_lib_gtk"; then
                 fi
 
                 if test -z "$wx_cv_lib_gtk"; then


@@ -15967,80 +13159,73 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
                                                             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
 
 fi
 

+

                         if test "$gtk_version_cached" = 1; then
                         if test "$gtk_version_cached" = 1; then

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

         fi
 
         case "$wx_cv_lib_gtk" in
             2.0)    WXGTK20=1
         fi
 
         case "$wx_cv_lib_gtk" in
             2.0)    WXGTK20=1

+                    TOOLKIT_VERSION=2

                     ;;
             1.2.7)  WXGTK127=1
                     WXGTK12=1
                     ;;
             1.2.3)  WXGTK12=1
                     ;;
                     ;;
             1.2.7)  WXGTK127=1
                     WXGTK12=1
                     ;;
             1.2.3)  WXGTK12=1
                     ;;

-            *)      { { echo "$as_me:15986: 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:
+            *)      { echo "configure: 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.

-                            " >&2;}
-   { (exit 1); exit 1; }; }
+                            " 1>&2; 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 "$as_me:16010: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:13199: 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

 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.
+  ;;

   *)
   *)

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  if $as_executable_p "$ac_dir/$ac_word"; then
-   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:16027: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
+  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"

   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 "$as_me:16039: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  echo "$ac_t""$PKG_CONFIG" 1>&6

 else
 else

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

 fi
 
   fi
 fi
 
   fi


@@ -16053,34 +13238,33 @@ 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 "$as_me:16056: checking for pangoft2" >&5
-echo $ECHO_N "checking for pangoft2... $ECHO_C" >&6
+        echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
+echo "configure:13243: checking for pangoft2" >&5

 
         if $PKG_CONFIG --exists "pangoft2" ; then
 
         if $PKG_CONFIG --exists "pangoft2" ; then

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

             succeeded=yes
 
             succeeded=yes
 

-            echo "$as_me:16064: checking PANGOFT2_CFLAGS" >&5
-echo $ECHO_N "checking PANGOFT2_CFLAGS... $ECHO_C" >&6
+            echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
+echo "configure:13250: checking PANGOFT2_CFLAGS" >&5

             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
             PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`

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

 
 

-            echo "$as_me:16070: checking PANGOFT2_LIBS" >&5
-echo $ECHO_N "checking PANGOFT2_LIBS... $ECHO_C" >&6
+            echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
+echo "configure:13255: checking PANGOFT2_LIBS" >&5

             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
             PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`

-            echo "$as_me:16073: result: $PANGOFT2_LIBS" >&5
-echo "${ECHO_T}$PANGOFT2_LIBS" >&6
+            echo "$ac_t""$PANGOFT2_LIBS" 1>&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"


@@ -16088,19 +13272,82 @@ echo "${ECHO_T}$PANGOFT2_LIBS" >&6
   fi
 
   if test $succeeded = yes; then
   fi
 
   if test $succeeded = yes; then

-
+     

                         CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
                         LIBS="$LIBS $PANGOFT2_LIBS"
                         CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
                         LIBS="$LIBS $PANGOFT2_LIBS"

-
+                    

   else
   else

-
-                        { echo "$as_me:16097: 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;}
+     
+                        echo "configure: warning: pangoft2 library not found, library will be compiled without printing support" 1>&2

                         wxUSE_PRINTING_ARCHITECTURE="no"
                         wxUSE_PRINTING_ARCHITECTURE="no"

-
+                    
+                

   fi
 
             fi
   fi
 
             fi

+        else
+            if test "$wxUSE_UNICODE" = "yes"; then
+                echo "configure: warning: Unicode configuration not supported with GTK+ 1.x" 1>&2
+                wxUSE_UNICODE=no
+            fi
+        fi
+
+                        if test "$USE_DARWIN" != 1; then
+            for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13300: 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 13305 "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();
+
+int main() {
+
+/* 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:13328: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+

         fi
 
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
         fi
 
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"


@@ -16110,109 +13357,105 @@ echo "$as_me: WARNING: pangoft2 library not found, library will be compiled with
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 

-                echo "$as_me:16113: 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
+                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:13362: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lgdk  $LIBS"
 LIBS="-lgdk  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16121 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 13370 "configure"

 #include "confdefs.h"
 #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 gdk_im_open ();
-int
-main ()
-{
-gdk_im_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16140: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16143: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16146: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16149: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gdk_gdk_im_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:16160: 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 <<\EOF
+    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:13381: \"$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

 #define HAVE_XIM 1
 EOF
 
 #define HAVE_XIM 1
 EOF
 

+else
+  echo "$ac_t""no" 1>&6

 fi
 
     fi
 
     if test "$wxUSE_MGL" = 1; then
 fi
 
     fi
 
     if test "$wxUSE_MGL" = 1; then

-        echo "$as_me:16172: checking for SciTech MGL library" >&5
-echo $ECHO_N "checking for SciTech MGL library... $ECHO_C" >&6
+       echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:13408: checking for SciTech MGL library" >&5

         if test "x$MGL_ROOT" = x ; then
         if test "x$MGL_ROOT" = x ; then

-            echo "$as_me:16175: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-            { { echo "$as_me:16177: 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; }; }
+            echo "$ac_t""not found" 1>&6
+            { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }

         else
         else

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

         fi
 
         fi
 

+        echo $ac_n "checking for libmgl location""... $ac_c" 1>&6
+echo "configure:13417: checking for libmgl location" >&5

                         case "${host}" in
             *-*-linux* )
                         case "${host}" in
             *-*-linux* )

-              mgl_os=linux/gcc/glibc
+              if test "x$wxUSE_SHARED" = xyes ; then
+                  mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
+              else
+                  mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
+              fi

               ;;
             *-pc-msdosdjgpp )
               ;;
             *-pc-msdosdjgpp )

-              mgl_os=dos32/dj2
+              mgl_os_candidates="dos32/dj2"

               ;;
             *)
               ;;
             *)

-              { { echo "$as_me:16193: 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; }; }
+              { echo "configure: error: This system type ${host} is not yet supported by wxMGL." 1>&2; exit 1; }

         esac
 
         mgl_lib_type=""
         esac
 
         mgl_lib_type=""

-
-        if test "$wxUSE_DEBUG_FLAG" = yes ; then
-            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
-                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
-                mgl_lib_type=debug
-            fi
-        fi
-        if test "x$mgl_lib_type" = x ; then
-            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
-                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
-                mgl_lib_type=release
-            else
-                { { echo "$as_me:16211: 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; }; }
+        mgl_os=""
+
+        for mgl_os_i in $mgl_os_candidates ; do
+            if test "x$mgl_os" = x ; then
+                if test "$wxUSE_DEBUG_FLAG" = yes ; then
+                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
+                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
+                        mgl_lib_type=debug
+                        mgl_os=$mgl_os_i
+                    fi
+                fi
+                if test "x$mgl_lib_type" = x ; then
+                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
+                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
+                        mgl_lib_type=release
+                        mgl_os=$mgl_os_i
+                    fi
+                fi

             fi
             fi

+        done
+
+        if test "x$mgl_os" = x ; then
+            echo "$ac_t""not found" 1>&6
+            { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }

         fi
         fi

+        echo "$ac_t"""$MGL_ROOT/lib/$mgl_lib_type/$mgl_os"" 1>&6

 
         wxUSE_UNIVERSAL="yes"
 
 
         wxUSE_UNIVERSAL="yes"
 


@@ -16225,26 +13468,19 @@ echo "$as_me: error: Cannot find MGL libraries, make sure they are compiled." >&
     fi
 
     if test "$wxUSE_MICROWIN" = 1; then
     fi
 
     if test "$wxUSE_MICROWIN" = 1; then

-        echo "$as_me:16228: checking for MicroWindows" >&5
-echo $ECHO_N "checking for MicroWindows... $ECHO_C" >&6
+        echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6
+echo "configure:13473: checking for MicroWindows" >&5

         if test "x$MICROWINDOWS" = x ; then
         if test "x$MICROWINDOWS" = x ; then

-            echo "$as_me:16231: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-            { { echo "$as_me:16233: 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; }; }
+            echo "$ac_t""not found" 1>&6
+            { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; }

         else
         else

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

         fi
 
         if test -f $MICROWINDOWS/lib/libmwin.a; then
         fi
 
         if test -f $MICROWINDOWS/lib/libmwin.a; then

-            echo "$as_me:16242: result: MicroWindows' libraries found." >&5
-echo "${ECHO_T}MicroWindows' libraries found." >&6
+            echo "$ac_t""MicroWindows' libraries found." 1>&6

         else
         else

-            { { echo "$as_me:16245: 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; }; }
+            { echo "configure: error: Cannot find MicroWindows libraries, make sure they are compiled." 1>&2; exit 1; }

         fi
 
         TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"
         fi
 
         TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"


@@ -16260,14 +13496,19 @@ echo "$as_me: error: Cannot find MicroWindows libraries, make sure they are comp
     fi
 
     if test "$wxUSE_X11" = 1; then
     fi
 
     if test "$wxUSE_X11" = 1; then

-                        echo "$as_me:16263: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+                        # 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:13505: checking for X" >&5

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


@@ -16277,16 +13518,16 @@ else
     # Both variables are already set.
     have_x=yes
   else
     # Both variables are already set.
     have_x=yes
   else

-    if test "${ac_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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 conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
+ac_x_includes=NO ac_x_libraries=NO
+rm -fr conftestdir
+if mkdir conftestdir; then
+  cd conftestdir

   # 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 <<'EOF'

 acfindx:
        @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
 EOF
 acfindx:
        @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
 EOF


@@ -16296,155 +13537,174 @@ EOF
     # 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 &&
     # 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 conftest.dir
+  rm -fr conftestdir

 fi
 
 fi
 

-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/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.
+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
+

   # First, try using that file with no special directory specified.
   # First, try using that file with no special directory specified.

-  cat >conftest.$ac_ext <<_ACEOF
-#line 16360 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 13567 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <X11/Intrinsic.h>
-_ACEOF
-if { (eval echo "$as_me:16364: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:16370: \$? = $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
+#include <$x_direct_test_include>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:13572: \"$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*

   # 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 "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat 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
+  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

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
+rm -f conftest*
+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="-lXt $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-#line 16403 "configure"
+  ac_save_LIBS="$LIBS"
+  LIBS="-l$x_direct_test_library $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13641 "configure"

 #include "confdefs.h"
 #include "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:16415: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16418: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16424: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  LIBS=$ac_save_LIBS
+
+int main() {
+${x_direct_test_function}()
+; return 0; }
+EOF
+if { (eval echo configure:13648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  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 "$as_me: failed program was:" >&5
-cat 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`
+  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 \
+    ; \

 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/libXt.$ac_extension; then
+    if test -r $ac_dir/lib${x_direct_test_library}.$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.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
+rm -f conftest*
+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


@@ -16453,14 +13713,12 @@ 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 "$as_me:16462: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+  echo "$ac_t""$have_x" 1>&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.


@@ -16469,14 +13727,12 @@ 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 "$as_me:16472: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&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 <<\EOF

 #define X_DISPLAY_MISSING 1
 EOF
 
 #define X_DISPLAY_MISSING 1
 EOF
 


@@ -16491,89 +13747,60 @@ 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 "$as_me:16496: 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 16500 "configure"
+      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+echo "configure:13754: 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 13757 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-int
-main ()
-{
+int main() {

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16512: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16515: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16518: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16521: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:13764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

   ac_R_nospace=yes
 else
   ac_R_nospace=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_R_nospace=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_nospace=no

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

       if test $ac_R_nospace = yes; then
       if test $ac_R_nospace = yes; then

-       echo "$as_me:16531: result: no" >&5
-echo "${ECHO_T}no" >&6
+       echo "$ac_t""no" 1>&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 <<_ACEOF
-#line 16537 "configure"
+       cat > conftest.$ac_ext <<EOF
+#line 13780 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-int
-main ()
-{
+int main() {

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16549: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16552: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16555: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16558: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:13787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

   ac_R_space=yes
 else
   ac_R_space=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_R_space=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_space=no

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

        if test $ac_R_space = yes; then
        if test $ac_R_space = yes; then

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

          X_LIBS="$X_LIBS -R $x_libraries"
        else
          X_LIBS="$X_LIBS -R $x_libraries"
        else

-         echo "$as_me:16572: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
+         echo "$ac_t""neither works" 1>&6

        fi
       fi
        fi
       fi

-      LIBS=$ac_xsave_LIBS
+      LIBS="$ac_xsave_LIBS"

     esac
   fi
 
     esac
   fi
 


@@ -16584,760 +13811,528 @@ echo "${ECHO_T}neither works" >&6
   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 says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
+    # 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

     # the Alpha needs dnet_stub (dnet does not exist).
     # the Alpha needs dnet_stub (dnet does not exist).

-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-#line 16592 "configure"
-#include "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 XOpenDisplay ();
-int
-main ()
-{
-XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16611: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16614: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16617: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16620: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+echo "configure:13819: 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
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-echo "$as_me:16626: 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
+  ac_save_LIBS="$LIBS"

 LIBS="-ldnet  $LIBS"
 LIBS="-ldnet  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16634 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 13827 "configure"

 #include "confdefs.h"
 #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 dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16653: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16656: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16659: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16662: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:16673: 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
+    builtin and then its argument prototype would still apply.  */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:13838: \"$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

   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 "$as_me:16680: 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
+      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+echo "configure:13860: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-ldnet_stub  $LIBS"
 LIBS="-ldnet_stub  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16688 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 13868 "configure"

 #include "confdefs.h"
 #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 dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16707: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16710: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16713: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16716: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:16727: 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
+    builtin and then its argument prototype would still apply.  */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:13879: \"$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

   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 R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # chad@anasazi.com 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 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:16746: 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 16752 "configure"
+    # on Irix 5.2, according to dickey@clark.net.
+    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:13908: 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 13913 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char gethostbyname (); below.  */
+    which can conflict with char gethostbyname(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = gethostbyname;
+gethostbyname();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16783: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16786: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16789: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16792: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:16802: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+; return 0; }
+EOF
+if { (eval echo configure:13936: \"$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

 
     if test $ac_cv_func_gethostbyname = no; then
 
     if test $ac_cv_func_gethostbyname = no; then

-      echo "$as_me:16806: 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
+      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:13957: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lnsl  $LIBS"
 LIBS="-lnsl  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16814 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 13965 "configure"

 #include "confdefs.h"
 #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 gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16833: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16836: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16839: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16842: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:16853: 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
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();

 
 

-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:16860: 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
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:13976: \"$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
 else

-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 16868 "configure"
-#include "confdefs.h"
+  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"

 
 

-/* 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:16887: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16890: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16893: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16896: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:16907: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+else
+  echo "$ac_t""no" 1>&6

 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 Leinen: 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 "$as_me:16923: 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 16929 "configure"
+    # 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:14006: 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 14011 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char connect (); below.  */
+    which can conflict with char connect(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char connect ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char connect();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = connect;
+connect();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16960: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:16963: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16966: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:16969: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:16979: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
+; return 0; }
+EOF
+if { (eval echo configure:14034: \"$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

 
     if test $ac_cv_func_connect = no; then
 
     if test $ac_cv_func_connect = no; then

-      echo "$as_me:16983: 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
+      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+echo "configure:14055: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 16991 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 14063 "configure"

 #include "confdefs.h"
 #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 connect ();
-int
-main ()
-{
-connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17013: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17019: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17030: 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
+    builtin and then its argument prototype would still apply.  */
+char connect();
+
+int main() {
+connect()
+; return 0; }
+EOF
+if { (eval echo configure:14074: \"$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

   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
 

-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:17039: 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
+    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+    echo $ac_n "checking for remove""... $ac_c" 1>&6
+echo "configure:14098: checking for remove" >&5
+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 17045 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14103 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char remove (); below.  */
+    which can conflict with char remove(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char remove ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char remove();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = remove;
+remove();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17076: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17079: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17082: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17085: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17095: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
+; return 0; }
+EOF
+if { (eval echo configure:14126: \"$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

 
     if test $ac_cv_func_remove = no; then
 
     if test $ac_cv_func_remove = no; then

-      echo "$as_me:17099: 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
+      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:14147: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lposix  $LIBS"
 LIBS="-lposix  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17107 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 14155 "configure"

 #include "confdefs.h"
 #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 remove ();
-int
-main ()
-{
-remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17126: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17129: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17132: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17135: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_posix_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17146: 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
+    builtin and then its argument prototype would still apply.  */
+char remove();
+
+int main() {
+remove()
+; return 0; }
+EOF
+if { (eval echo configure:14166: \"$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

   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 "$as_me:17155: 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
+    echo $ac_n "checking for shmat""... $ac_c" 1>&6
+echo "configure:14190: checking for shmat" >&5
+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 17161 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14195 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char shmat (); below.  */
+    which can conflict with char shmat(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char shmat ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char shmat();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = shmat;
+shmat();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17192: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17195: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17198: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17201: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17211: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
+; return 0; }
+EOF
+if { (eval echo configure:14218: \"$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

 
     if test $ac_cv_func_shmat = no; then
 
     if test $ac_cv_func_shmat = no; then

-      echo "$as_me:17215: 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
+      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:14239: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lipc  $LIBS"
 LIBS="-lipc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17223 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 14247 "configure"

 #include "confdefs.h"
 #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 shmat ();
-int
-main ()
-{
-shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17242: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17245: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17248: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17251: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ipc_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17262: 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
+    builtin and then its argument prototype would still apply.  */
+char shmat();
+
+int main() {
+shmat()
+; return 0; }
+EOF
+if { (eval echo configure:14258: \"$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

   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.

-  # John Interrante, Karl Berry
-  echo "$as_me:17280: 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
+  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+echo "configure:14291: 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"

 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17288 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 14299 "configure"

 #include "confdefs.h"
 #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 IceConnectionNumber ();
-int
-main ()
-{
-IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17307: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17310: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17313: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17316: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17327: 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
+    builtin and then its argument prototype would still apply.  */
+char IceConnectionNumber();
+
+int main() {
+IceConnectionNumber()
+; return 0; }
+EOF
+if { (eval echo configure:14310: \"$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

   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
 
 
 fi
 

+

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

-          { { echo "$as_me:17338: 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; }; }
+          { echo "configure: error: X11 not found" 1>&2; exit 1; }

         fi
 
         GUI_TK_LIBRARY="$X_LIBS"
         fi
 
         GUI_TK_LIBRARY="$X_LIBS"


@@ -17346,18 +14341,14 @@ echo "$as_me: error: X11 not found" >&2;}
         COMPILED_X_PROGRAM=0
 
         if test "$wxUSE_NANOX" = "yes"; then
         COMPILED_X_PROGRAM=0
 
         if test "$wxUSE_NANOX" = "yes"; then

-            echo "$as_me:17349: checking for MicroWindows/NanoX distribution" >&5
-echo $ECHO_N "checking for MicroWindows/NanoX distribution... $ECHO_C" >&6
+            echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
+echo "configure:14346: checking for MicroWindows/NanoX distribution" >&5

             if test "x$MICROWIN" = x ; then
             if test "x$MICROWIN" = x ; then

-                echo "$as_me:17352: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-                { { echo "$as_me:17354: 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; }; }
+                echo "$ac_t""not found" 1>&6
+                { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; }

             else
             else

-                echo "$as_me:17358: result: $MICROWIN" >&5
-echo "${ECHO_T}$MICROWIN" >&6
-                cat >>confdefs.h <<\EOF
+                echo "$ac_t""$MICROWIN" 1>&6
+                cat >> confdefs.h <<\EOF

 #define wxUSE_NANOX 1
 EOF
 
 #define wxUSE_NANOX 1
 EOF
 


@@ -17365,11 +14356,11 @@ EOF
         fi
 
         xpm_link=
         fi
 
         xpm_link=

-        echo "$as_me:17368: checking for Xpm library" >&5
-echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
-
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:14361: checking for Xpm library" >&5
+        

 ac_find_libraries=
 ac_find_libraries=

-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;

   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then


@@ -17380,7 +14371,7 @@ for ac_dir in $SEARCH_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


@@ -17391,293 +14382,469 @@ for ac_dir in $SEARCH_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 <<\EOF

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-            echo "$as_me:17398: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
+            echo "$ac_t""found at $ac_find_libraries" 1>&6

         else
         else

-            cat >conftest.$ac_ext <<_ACEOF
-#line 17402 "configure"
+            cat > conftest.$ac_ext <<EOF
+#line 14393 "configure"

 #include "confdefs.h"
 
                     #include <X11/xpm.h>
 #include "confdefs.h"
 
                     #include <X11/xpm.h>

-
-int
-main ()
-{
+                
+int main() {

 
                     int version;
                     version = XpmLibraryVersion();
 
                     int version;
                     version = XpmLibraryVersion();

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17419: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:17422: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17425: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17428: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                
+; return 0; }
+EOF
+if { (eval echo configure:14405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                     xpm_link=" -lXpm"
                     xpm_link=" -lXpm"

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

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-                    echo "$as_me:17436: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6
+                    echo "$ac_t""found in default search path" 1>&6

                     COMPILED_X_PROGRAM=0
                     COMPILED_X_PROGRAM=0

-
+                

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                    echo "$as_me:17444: result: no" >&5
-echo "${ECHO_T}no" >&6
-                    { echo "$as_me:17446: 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;}
-
+  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
+                
+            

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-        fi
-
-        wxUSE_UNIVERSAL="yes"
-
-        if test "$wxUSE_NANOX" = "yes"; then
-            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
-        else
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+rm -f conftest*

         fi
 
         fi
 

-        TOOLKIT_VPATH="\${top_srcdir}/src/x11"
-        TOOLKIT=X11
-        GUIDIST=X11_DIST
-    fi
-
-    if test "$wxUSE_WINE" = 1; then
-        echo "$as_me:17469: 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
+        echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
+echo "configure:14430: 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

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 17475 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14438 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <windows.h>
-_ACEOF
-if { (eval echo "$as_me:17479: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:17485: \$? = $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_cv_header_windows_h=yes
+/* 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 XShapeQueryExtension();
+
+int main() {
+XShapeQueryExtension()
+; return 0; }
+EOF
+if { (eval echo configure:14449: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  ac_cv_header_windows_h=no
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+

 fi
 fi

-echo "$as_me:17504: result: $ac_cv_header_windows_h" >&5
-echo "${ECHO_T}$ac_cv_header_windows_h" >&6
-if test $ac_cv_header_windows_h = yes; then
-  :
+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
+                     

 else
 else

-
-            { { echo "$as_me:17510: 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; }; }
-
+  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-        xpm_link=
-        echo "$as_me:17517: checking for Xpm library" >&5
-echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6

 
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib; do
-      if test -f "$ac_dir/libXpm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
+        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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14481: 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
+else
+  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 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
   done

+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+  echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi

 
 

-        if test "$ac_find_libraries" != "" ; then
-            GUI_TK_LIBRARY="-L$ac_find_libraries"
-            xpm_link=" -lXpm"
-            cat >>confdefs.h <<\EOF
-#define wxHAVE_LIB_XPM 1
-EOF
+  fi

 
 

-            echo "$as_me:17538: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
-        else
-            echo "$as_me:17541: result: no" >&5
-echo "${ECHO_T}no" >&6
-            { echo "$as_me:17543: 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
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  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:14525: checking for pangox" >&5

 
 

-        mesa_link=
-        echo "$as_me:17548: checking for Mesa library" >&5
-echo $ECHO_N "checking for Mesa library... $ECHO_C" >&6
+        if $PKG_CONFIG --exists "pangox" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes

 
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib; do
-      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+            echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6
+echo "configure:14532: checking PANGOX_CFLAGS" >&5
+            PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"`
+            echo "$ac_t""$PANGOX_CFLAGS" 1>&6

 
 

-        if test "$ac_find_libraries" != "" ; then
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-            mesa_link=" -lMesaGL"
-            echo "$as_me:17565: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
+            echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6
+echo "configure:14537: checking PANGOX_LIBS" >&5
+            PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`
+            echo "$ac_t""$PANGOX_LIBS" 1>&6

         else
         else

-            { { echo "$as_me:17568: error: no" >&5
-echo "$as_me: error: no" >&2;}
-   { (exit 1); exit 1; }; }
+            PANGOX_CFLAGS=""
+            PANGOX_LIBS=""
+            ## 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"`
+            

         fi
 
         fi
 

-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
-        TOOLKIT=MSW
-        GUIDIST=MSW_DIST
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
-    fi
-
-    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
-#define X_DISPLAY_MISSING 1
-EOF
+        
+        
+     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"
+     fi
+  fi

 
 

-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  if test $succeeded = yes; then
+     
+                        CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
+                        LIBS="$LIBS $PANGOX_LIBS"
+                    
+  else
+     
+                        { echo "configure: error: pangox library not found, library cannot be compiled in Unicode mode" 1>&2; exit 1; }
+                    
+                

   fi
 
   fi
 

-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    case `(uname -sr) 2>/dev/null` in
-    "SunOS 5"*)
-      echo "$as_me:17600: 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 17604 "configure"
-#include "confdefs.h"
+                
+  succeeded=no

 
 

-int
-main ()
-{
+  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:14576: 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
+else
+  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 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"
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+  echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17616: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17619: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17622: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17625: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  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:14620: checking for pangoft2" >&5
+
+        if $PKG_CONFIG --exists "pangoft2" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes
+
+            echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
+echo "configure:14627: checking PANGOFT2_CFLAGS" >&5
+            PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
+            echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6
+
+            echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
+echo "configure:14632: checking PANGOFT2_LIBS" >&5
+            PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
+            echo "$ac_t""$PANGOFT2_LIBS" 1>&6
+        else
+            PANGOFT2_CFLAGS=""
+            PANGOFT2_LIBS=""
+            ## 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"`
+            
+        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"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     
+                        CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
+                        LIBS="$LIBS $PANGOFT2_LIBS"
+                    
+  else
+     
+                        echo "configure: warning: pangoft2 library not found, library will be compiled without printing support" 1>&2
+                        wxUSE_PRINTING_ARCHITECTURE="no"
+                    
+                
+  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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14672: 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
+else
+  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 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"
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+  echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  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:14716: checking for pangoxft" >&5
+
+        if $PKG_CONFIG --exists "pangoxft" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes
+
+            echo $ac_n "checking PANGOXFT_CFLAGS""... $ac_c" 1>&6
+echo "configure:14723: checking PANGOXFT_CFLAGS" >&5
+            PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"`
+            echo "$ac_t""$PANGOXFT_CFLAGS" 1>&6
+
+            echo $ac_n "checking PANGOXFT_LIBS""... $ac_c" 1>&6
+echo "configure:14728: checking PANGOXFT_LIBS" >&5
+            PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"`
+            echo "$ac_t""$PANGOXFT_LIBS" 1>&6
+        else
+            PANGOXFT_CFLAGS=""
+            PANGOXFT_LIBS=""
+            ## 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"`
+            
+        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"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     
+                        CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
+                        LIBS="$LIBS $PANGOXFT_LIBS"
+                    
+  else
+     
+                        echo "configure: warning: pangoxft library not found, library will be compiled without anti-aliasing support" 1>&2
+                    
+                
+  fi
+
+        fi
+
+        wxUSE_UNIVERSAL="yes"
+
+        if test "$wxUSE_NANOX" = "yes"; then
+            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
+        else
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+        fi
+
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11"
+        TOOLKIT=X11
+        GUIDIST=X11_DIST
+    fi
+
+    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
+#define X_DISPLAY_MISSING 1
+EOF
+
+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+  if test -n "$x_includes"; then
+    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  fi
+
+  # It would also be nice to do this for all -L options, not just this one.
+  if test -n "$x_libraries"; then
+    X_LIBS="$X_LIBS -L$x_libraries"
+    # For Solaris; some versions of Sun CC require a space after -R and
+    # others require no space.  Words are not sufficient . . . .
+    case "`(uname -sr) 2>/dev/null`" in
+    "SunOS 5"*)
+      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+echo "configure:14798: 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 14801 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:14808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

   ac_R_nospace=yes
 else
   ac_R_nospace=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_R_nospace=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_nospace=no

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

       if test $ac_R_nospace = yes; then
       if test $ac_R_nospace = yes; then

-       echo "$as_me:17635: result: no" >&5
-echo "${ECHO_T}no" >&6
+       echo "$ac_t""no" 1>&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 <<_ACEOF
-#line 17641 "configure"
+       cat > conftest.$ac_ext <<EOF
+#line 14824 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-int
-main ()
-{
+int main() {

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17653: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17656: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17659: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17662: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:14831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

   ac_R_space=yes
 else
   ac_R_space=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_R_space=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_space=no

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

        if test $ac_R_space = yes; then
        if test $ac_R_space = yes; then

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

          X_LIBS="$X_LIBS -R $x_libraries"
        else
          X_LIBS="$X_LIBS -R $x_libraries"
        else

-         echo "$as_me:17676: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
+         echo "$ac_t""neither works" 1>&6

        fi
       fi
        fi
       fi

-      LIBS=$ac_xsave_LIBS
+      LIBS="$ac_xsave_LIBS"

     esac
   fi
 
     esac
   fi
 


@@ -17688,772 +14855,540 @@ echo "${ECHO_T}neither works" >&6
   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 says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
+    # 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

     # the Alpha needs dnet_stub (dnet does not exist).
     # the Alpha needs dnet_stub (dnet does not exist).

-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-#line 17696 "configure"
-#include "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 XOpenDisplay ();
-int
-main ()
-{
-XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17715: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17718: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17721: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17724: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
+    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+echo "configure:14863: 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
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-echo "$as_me:17730: 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
+  ac_save_LIBS="$LIBS"

 LIBS="-ldnet  $LIBS"
 LIBS="-ldnet  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17738 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 14871 "configure"

 #include "confdefs.h"
 #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 dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17757: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17760: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17763: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17766: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17777: 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
+    builtin and then its argument prototype would still apply.  */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:14882: \"$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

   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 "$as_me:17784: 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
+      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+echo "configure:14904: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-ldnet_stub  $LIBS"
 LIBS="-ldnet_stub  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17792 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 14912 "configure"

 #include "confdefs.h"
 #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 dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17811: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17814: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17817: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17820: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17831: 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
+    builtin and then its argument prototype would still apply.  */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:14923: \"$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

   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 R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # chad@anasazi.com 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 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:17850: 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 17856 "configure"
+    # on Irix 5.2, according to dickey@clark.net.
+    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:14952: 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 14957 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char gethostbyname (); below.  */
+    which can conflict with char gethostbyname(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char gethostbyname ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = gethostbyname;
+gethostbyname();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17887: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17890: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17893: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17896: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17906: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+; return 0; }
+EOF
+if { (eval echo configure:14980: \"$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

 
     if test $ac_cv_func_gethostbyname = no; then
 
     if test $ac_cv_func_gethostbyname = no; then

-      echo "$as_me:17910: 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
+      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:15001: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lnsl  $LIBS"
 LIBS="-lnsl  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 17918 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 15009 "configure"

 #include "confdefs.h"
 #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 gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17937: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17940: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17943: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:17946: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:17957: 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
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();

 
 

-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:17964: 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
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:15020: \"$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
 else

-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 17972 "configure"
-#include "confdefs.h"
+  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"

 
 

-/* 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:17991: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:17994: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17997: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18000: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18011: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+else
+  echo "$ac_t""no" 1>&6

 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 Leinen: 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 "$as_me:18027: 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 18033 "configure"
+    # 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:15050: 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 15055 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char connect (); below.  */
+    which can conflict with char connect(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char connect ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char connect();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = connect;
+connect();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18064: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18067: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18070: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18073: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18083: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
+; return 0; }
+EOF
+if { (eval echo configure:15078: \"$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 test $ac_cv_func_connect = no; then
-      echo "$as_me:18087: 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
+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_connect = no; then
+      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+echo "configure:15099: 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
+else
+  ac_save_LIBS="$LIBS"

 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18095 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 15107 "configure"

 #include "confdefs.h"
 #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 connect ();
-int
-main ()
-{
-connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18114: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18117: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18120: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18123: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18134: 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
+    builtin and then its argument prototype would still apply.  */
+char connect();
+
+int main() {
+connect()
+; return 0; }
+EOF
+if { (eval echo configure:15118: \"$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

   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
 

-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:18143: 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
+    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+    echo $ac_n "checking for remove""... $ac_c" 1>&6
+echo "configure:15142: checking for remove" >&5
+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 18149 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 15147 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char remove (); below.  */
+    which can conflict with char remove(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char remove ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char remove();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = remove;
+remove();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18180: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18183: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18186: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18189: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18199: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
+; return 0; }
+EOF
+if { (eval echo configure:15170: \"$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

 
     if test $ac_cv_func_remove = no; then
 
     if test $ac_cv_func_remove = no; then

-      echo "$as_me:18203: 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
+      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:15191: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lposix  $LIBS"
 LIBS="-lposix  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18211 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 15199 "configure"

 #include "confdefs.h"
 #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 remove ();
-int
-main ()
-{
-remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18230: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18233: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18236: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18239: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_posix_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18250: 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
+    builtin and then its argument prototype would still apply.  */
+char remove();
+
+int main() {
+remove()
+; return 0; }
+EOF
+if { (eval echo configure:15210: \"$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

   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 "$as_me:18259: 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
+    echo $ac_n "checking for shmat""... $ac_c" 1>&6
+echo "configure:15234: checking for shmat" >&5
+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 18265 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 15239 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char shmat (); below.  */
+    which can conflict with char shmat(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char shmat ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char shmat();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = shmat;
+shmat();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18296: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18299: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18302: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18305: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18315: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
+; return 0; }
+EOF
+if { (eval echo configure:15262: \"$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

 
     if test $ac_cv_func_shmat = no; then
 
     if test $ac_cv_func_shmat = no; then

-      echo "$as_me:18319: 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
+      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:15283: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lipc  $LIBS"
 LIBS="-lipc  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18327 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 15291 "configure"

 #include "confdefs.h"
 #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 shmat ();
-int
-main ()
-{
-shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18346: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18349: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18352: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18355: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ipc_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18366: 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
+    builtin and then its argument prototype would still apply.  */
+char shmat();
+
+int main() {
+shmat()
+; return 0; }
+EOF
+if { (eval echo configure:15302: \"$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

   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.

-  # John Interrante, Karl Berry
-  echo "$as_me:18384: 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
+  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+echo "configure:15335: 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"

 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 18392 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 15343 "configure"

 #include "confdefs.h"
 #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 IceConnectionNumber ();
-int
-main ()
-{
-IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18411: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18414: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18417: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18420: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:18431: 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
+    builtin and then its argument prototype would still apply.  */
+char IceConnectionNumber();
+
+int main() {
+IceConnectionNumber()
+; return 0; }
+EOF
+if { (eval echo configure:15354: \"$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

   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
 
 
 fi
 

+

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

-          { { echo "$as_me:18442: 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; }; }
+          { echo "configure: error: X11 not found" 1>&2; exit 1; }

         fi
 
         fi
 

-        GUI_TK_LIBRARY="$X_LIBS"
-        TOOLKIT_INCLUDE="$X_CFLAGS"
+                        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
+        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`

         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 

-        echo "$as_me:18452: checking for Motif/Lesstif headers" >&5
-echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6
-
+        echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:15389: checking for Motif/Lesstif headers" >&5
+        

 ac_find_includes=
 ac_find_includes=

-for ac_dir in $SEARCH_INCLUDE;
+for ac_dir in $SEARCH_INCLUDE /usr/include;

   do
     if test -f "$ac_dir/Xm/Xm.h"; then
       ac_find_includes=$ac_dir
   do
     if test -f "$ac_dir/Xm/Xm.h"; then
       ac_find_includes=$ac_dir


@@ -18462,63 +15397,60 @@ for ac_dir in $SEARCH_INCLUDE;
   done
 
         if test "$ac_find_includes" != "" ; then
   done
 
         if test "$ac_find_includes" != "" ; then

-            echo "$as_me:18465: result: found $ac_find_includes" >&5
-echo "${ECHO_T}found $ac_find_includes" >&6
+            echo "$ac_t""found in $ac_find_includes" 1>&6
+            
+    if test "x$ac_find_includes" = "x/usr/include"; then
+    ac_path_to_include=""
+  else
+    echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_include=""
+    else
+      ac_path_to_include=" -I$ac_find_includes"
+    fi
+  fi
+
+            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"

         else
         else

-            cat >conftest.$ac_ext <<_ACEOF
-#line 18469 "configure"
+            cat > conftest.$ac_ext <<EOF
+#line 15418 "configure"

 #include "confdefs.h"
 
                     #include <Xm/Xm.h>
 #include "confdefs.h"
 
                     #include <Xm/Xm.h>

-
-int
-main ()
-{
+                
+int main() {

 
                     int version;
                     version = xmUseVersion;
 
                     int version;
                     version = xmUseVersion;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18486: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:18489: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18492: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18495: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-                    echo "$as_me:18498: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6
+                
+; return 0; }
+EOF
+if { (eval echo configure:15430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    echo "$ac_t""found in default search path" 1>&6

                     COMPILED_X_PROGRAM=1
                     COMPILED_X_PROGRAM=1

-
+                

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                    echo "$as_me:18506: result: no" >&5
-echo "${ECHO_T}no" >&6
-                    { { echo "$as_me:18508: 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; }; }
-
+  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; }
+                
+            

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

         fi
 
         if test "$COMPILED_X_PROGRAM" = 0; then
         fi
 
         if test "$COMPILED_X_PROGRAM" = 0; then

-            echo "$as_me:18517: checking for Motif/Lesstif library" >&5
-echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6
-
+            echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:15451: checking for Motif/Lesstif library" >&5
+            

 ac_find_libraries=
 ac_find_libraries=

-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;

   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXm.$ac_extension"; then


@@ -18529,16 +15461,9 @@ for ac_dir in $SEARCH_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

 
 

-  ac_path_to_include=$ac_find_includes
-  echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_include=""
-  else
-    ac_path_to_include=" -I$ac_find_includes"
-  fi
-
+                

   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


@@ -18548,65 +15473,51 @@ for ac_dir in $SEARCH_LIB;
   fi
 
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
   fi
 
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"

-                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
-                echo "$as_me:18552: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6

             else
             else

-                                                                cat >conftest.$ac_ext <<_ACEOF
-#line 18556 "configure"
+                                                                save_CFLAGS=$CFLAGS
+                CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+                cat > conftest.$ac_ext <<EOF
+#line 15482 "configure"

 #include "confdefs.h"
 
                         #include <Xm/Xm.h>
 #include "confdefs.h"
 
                         #include <Xm/Xm.h>

-
-int
-main ()
-{
+                    
+int main() {

 
                         int version;
                         version = xmUseVersion;
 
                         int version;
                         version = xmUseVersion;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18573: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:18576: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18579: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18582: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-                        echo "$as_me:18585: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6
+                    
+; return 0; }
+EOF
+if { (eval echo configure:15494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        echo "$ac_t""found in default search path" 1>&6

                         COMPILED_X_PROGRAM=1
                         COMPILED_X_PROGRAM=1

-
+                    

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                        echo "$as_me:18593: result: no" >&5
-echo "${ECHO_T}no" >&6
-                        { { echo "$as_me:18595: 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; }; }
-
+  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; }
+                    
+                

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
+                CFLAGS=$save_CFLAGS

             fi
         fi
 
         xpm_link=
             fi
         fi
 
         xpm_link=

-        echo "$as_me:18605: checking for Xpm library" >&5
-echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
-
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:15518: checking for Xpm library" >&5
+        

 ac_find_libraries=
 ac_find_libraries=

-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;

   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then


@@ -18617,7 +15528,7 @@ for ac_dir in $SEARCH_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


@@ -18627,68 +15538,58 @@ for ac_dir in $SEARCH_LIB;
   fi
 
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
   fi
 
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"

+

             xpm_link=" -lXpm"
             xpm_link=" -lXpm"

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

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-            echo "$as_me:18635: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
+            echo "$ac_t""found at $ac_find_libraries" 1>&6

         else
         else

-            cat >conftest.$ac_ext <<_ACEOF
-#line 18639 "configure"
+            save_CFLAGS=$CFLAGS
+            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+            cat > conftest.$ac_ext <<EOF
+#line 15554 "configure"

 #include "confdefs.h"
 
                     #include <X11/xpm.h>
 #include "confdefs.h"
 
                     #include <X11/xpm.h>

-
-int
-main ()
-{
+                
+int main() {

 
                     int version;
                     version = XpmLibraryVersion();
 
                     int version;
                     version = XpmLibraryVersion();

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18656: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:18659: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18662: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18665: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                
+; return 0; }
+EOF
+if { (eval echo configure:15566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                     xpm_link=" -lXpm"
                     xpm_link=" -lXpm"

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

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-                    echo "$as_me:18673: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6
+                    echo "$ac_t""found in default search path" 1>&6

                     COMPILED_X_PROGRAM=0
                     COMPILED_X_PROGRAM=0

-
+                

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                    echo "$as_me:18681: result: no" >&5
-echo "${ECHO_T}no" >&6
-                    { echo "$as_me:18683: 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;}
-
+  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
+                
+            

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
+            CFLAGS=$save_CFLAGS

         fi
 
         fi
 

-        echo "$as_me:18690: checking if we need -lXp and/or -lSM -lICE" >&5
-echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6
+        echo $ac_n "checking if we need -lXp and/or -lSM -lICE""... $ac_c" 1>&6
+echo "configure:15593: checking if we need -lXp and/or -lSM -lICE" >&5

         libp_link=""
         libsm_ice_link=""
         libs_found=0
         libp_link=""
         libsm_ice_link=""
         libs_found=0


@@ -18698,89 +15599,165 @@ echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"

-                        cat >conftest.$ac_ext <<_ACEOF
-#line 18702 "configure"
+                        save_CFLAGS=$CFLAGS
+                        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+                        cat > conftest.$ac_ext <<EOF
+#line 15607 "configure"

 #include "confdefs.h"
 
                                 #include <Xm/Xm.h>
                                 #include <Xm/List.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18722: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:18725: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18728: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:18731: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                            
+; return 0; }
+EOF
+if { (eval echo configure:15622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  

                                 libp_link="$libp"
                                 libsm_ice_link="$libsm_ice"
                                 libp_link="$libp"
                                 libsm_ice_link="$libsm_ice"

-                                echo "$as_me:18736: result: need${libp_link}${libsm_ice_link}" >&5
-echo "${ECHO_T}need${libp_link}${libsm_ice_link}" >&6
+                                echo "$ac_t""need${libp_link}${libsm_ice_link}" 1>&6

                                 libs_found=1
                                 libs_found=1

-
+                            

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*
+

                         LIBS="$save_LIBS"
                         LIBS="$save_LIBS"

+                        CFLAGS=$save_CFLAGS

                     fi
                 done
             fi
         done
 
         if test "$libs_found" = "0"; then
                     fi
                 done
             fi
         done
 
         if test "$libs_found" = "0"; then

-            echo "$as_me:18753: result: can't find the right libraries" >&5
-echo "${ECHO_T}can't find the right libraries" >&6
-            { { echo "$as_me:18755: 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; }; }
+            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; }

         fi
 
         fi
 

+        save_CFLAGS=$CFLAGS
+        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+        echo $ac_n "checking for Motif 2""... $ac_c" 1>&6
+echo "configure:15654: checking for Motif 2" >&5
+        cat > conftest.$ac_ext <<EOF
+#line 15656 "configure"
+#include "confdefs.h"
+
+                        #include <Xm/Xm.h>
+                       
+int main() {
+
+                        #if XmVersion < 2000
+                        #error "Not Motif 2"
+                        #endif
+                       
+; return 0; }
+EOF
+if { (eval echo configure:15669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        cat >> confdefs.h <<\EOF
+#define __WXMOTIF20__ 1
+EOF
+
+                        echo "$ac_t""found" 1>&6
+                       
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        cat >> confdefs.h <<\EOF
+#define __WXMOTIF20__ 0
+EOF
+
+                        echo "$ac_t""not found" 1>&6
+                       
+fi
+rm -f conftest*
+        CFLAGS=$save_CFLAGS
+

         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"

-        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"

         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST
         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST

+        wxHAVE_XEXT_LIB=1
+    fi
+
+    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1 &&
+       test "$wxHAVE_XEXT_LIB" = 1; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+        echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
+echo "configure:15706: checking for X11/extensions/shape.h" >&5
+        cat > conftest.$ac_ext <<EOF
+#line 15708 "configure"
+#include "confdefs.h"
+
+                        #include <X11/Xlib.h> 
+                        #include <X11/extensions/shape.h>
+                       
+int main() {
+
+                        int dummy1, dummy2;
+                        XShapeQueryExtension((Display*)NULL,
+                                             (int*)NULL, (int*)NULL);
+                       
+; return 0; }
+EOF
+if { (eval echo configure:15722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        cat >> confdefs.h <<\EOF
+#define HAVE_XSHAPE 1
+EOF
+
+                        echo "$ac_t""found" 1>&6
+                       
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        echo "$ac_t""not found" 1>&6
+                       
+fi
+rm -f conftest*
+        CFLAGS="$save_CFLAGS"

     fi
 
     if test "$wxUSE_MAC" = 1; then
     fi
 
     if test "$wxUSE_MAC" = 1; then

-        if test "$wxUSE_PRECOMP" = "yes"; then
-            CPPFLAGS="$CPPFLAGS -cpp-precomp"
-        else
-            CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
-        fi
-        CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
-        CFLAGS="$CFLAGS -fpascal-strings"
-        CXXFLAGS="$CXXFLAGS -fpascal-strings"
+        CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"

 
 

-        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
+        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"

         TOOLKIT=MAC
                 GUIDIST=MACX_DIST
     fi
 
         TOOLKIT=MAC
                 GUIDIST=MACX_DIST
     fi
 

+    if test "$wxUSE_COCOA" = 1; then
+        TOOLKIT_VPATH="\${top_srcdir}/src/cocoa"
+        TOOLKIT=COCOA
+        GUIDIST=COCOA_DIST
+    fi
+

     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
+        wxUSE_THREADS="no"

     fi
 
         if test "$TOOLKIT" = "PM" ; then
     fi
 
         if test "$TOOLKIT" = "PM" ; then


@@ -18857,67 +15834,183 @@ else
     DISTDIR="wxBase"
 fi
 
     DISTDIR="wxBase"
 fi
 

-if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
-    ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
-fi

 
 

-if test "$wxUSE_REGEX" = "builtin" ; then
-    ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+
+
+IODBC_C_SRC=""
+
+
+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:15860: 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 15865 "configure"
+#include "confdefs.h"
+#include <sql.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15870: \"$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

-if test "$wxUSE_ZLIB" = "builtin" ; then
-    ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+rm -f conftest*
+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

 fi
 
 fi
 

-if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
-        OPENGL_LIBS="-framework OpenGL -framework AGL"
-    elif test "$wxUSE_MSW" = 1; then
-        OPENGL_LIBS="-lopengl32 -lglu32"
-    else
-        echo "$as_me:18877: 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
+            
+echo $ac_n "checking for library containing SQLAllocEnv""... $ac_c" 1>&6
+echo "configure:15893: 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

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 18883 "configure"
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_SQLAllocEnv="no"
+cat > conftest.$ac_ext <<EOF
+#line 15900 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <GL/gl.h>
-_ACEOF
-if { (eval echo "$as_me:18887: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:18893: \$? = $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
+/* 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 SQLAllocEnv();
+
+int main() {
+SQLAllocEnv()
+; return 0; }
+EOF
+if { (eval echo configure:15911: \"$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
 else

-  ac_cpp_err=yes
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5

 fi
 fi

-if test -z "$ac_cpp_err"; then
-  ac_cv_header_GL_gl_h=yes
+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 15922 "configure"
+#include "confdefs.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 SQLAllocEnv();
+
+int main() {
+SQLAllocEnv()
+; return 0; }
+EOF
+if { (eval echo configure:15933: \"$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

 else
 else

-  echo "$as_me: failed program was:" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  ac_cv_header_GL_gl_h=no

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"

 fi
 fi

-echo "$as_me:18912: result: $ac_cv_header_GL_gl_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
-if test $ac_cv_header_GL_gl_h = yes; then

 
 

-                echo "$as_me:18916: checking for -lGL" >&5
-echo $ECHO_N "checking for -lGL... $ECHO_C" >&6
-
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+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
+                if test "$wxUSE_ODBC" != "sys" ; then
+            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+        fi
+
+    fi
+    
+fi
+
+if test "$wxUSE_REGEX" = "builtin" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+fi
+if test "$wxUSE_ZLIB" = "builtin" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+fi
+
+
+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:15981: 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 15986 "configure"
+#include "confdefs.h"
+#include <GL/gl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15991: \"$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
+  
+                found_gl=0
+
+                echo $ac_n "checking for -lGL""... $ac_c" 1>&6
+echo "configure:16011: checking for -lGL" >&5
+                
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB /usr/lib;

   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libGL.$ac_extension"; then


@@ -18928,7 +16021,33 @@ for ac_dir in $SEARCH_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
+    ac_path_to_link=""
+  else
+    ac_path_to_link=" -L$ac_find_libraries"
+  fi
+
+                    if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                        LDFLAGS_GL="$ac_path_to_link"
+                    fi
+
+                                                                                
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB /usr/lib;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libGLU.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  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


@@ -18937,22 +16056,24 @@ for ac_dir in $SEARCH_LIB;
     ac_path_to_link=" -L$ac_find_libraries"
   fi
 
     ac_path_to_link=" -L$ac_find_libraries"
   fi
 

-                    if test "$ac_path_to_link" = " -L/usr/lib" ; then
-                        LDFLAGS_GL="$LDFLAGS"
-                    else
-                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                        if test "$ac_path_to_link" != " -L/usr/lib" -a \
+                                    "$ac_path_to_link" != "$LDFLAGS_GL"; then
+                            LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                        fi
+
+                        found_gl=1
+                        OPENGL_LIBS="-lGL -lGLU"
+                        echo "$ac_t""yes" 1>&6

                     fi
                     fi

-                    OPENGL_LIBS="-lGL -lGLU"
-                    echo "$as_me:18946: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-                else
-                    echo "$as_me:18949: result: no" >&5
-echo "${ECHO_T}no" >&6
-                    echo "$as_me:18951: checking for -lMesaGL" >&5
-echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6
+                fi

 
 

+                if "$found_gl" != 1; then
+                    echo "$ac_t""no" 1>&6
+                    echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
+echo "configure:16074: checking for -lMesaGL" >&5
+                    

 ac_find_libraries=
 ac_find_libraries=

-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;

   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then


@@ -18963,7 +16084,7 @@ for ac_dir in $SEARCH_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


@@ -18974,29 +16095,28 @@ for ac_dir in $SEARCH_LIB;
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
                         OPENGL_LIBS="-lMesaGL -lMesaGLU"
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
                         OPENGL_LIBS="-lMesaGL -lMesaGLU"

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

                     else
                     else

-                        echo "$as_me:18980: result: no" >&5
-echo "${ECHO_T}no" >&6
+                        echo "$ac_t""no" 1>&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 "$as_me:18988: error: OpenGL libraries not available" >&5
-echo "$as_me: error: OpenGL libraries not available" >&2;}
-   { (exit 1); exit 1; }; }
+                                                { echo "configure: error: OpenGL libraries not available" 1>&2; exit 1; }

         fi
     fi
 
     if test "$wxUSE_OPENGL" = "yes"; then
         fi
     fi
 
     if test "$wxUSE_OPENGL" = "yes"; then

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

 #define wxUSE_OPENGL 1
 EOF
 
 #define wxUSE_OPENGL 1
 EOF
 

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

 #define wxUSE_GLCANVAS 1
 EOF
 
 #define wxUSE_GLCANVAS 1
 EOF
 


@@ -19022,8 +16142,10 @@ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d
 fi
 
     lib_debug_suffix=d
 fi
 

-TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${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}"

 
 if test "$cross_compiling" = "yes"; then
     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
 
 if test "$cross_compiling" = "yes"; then
     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"


@@ -19032,6 +16154,7 @@ fi
 
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
 
 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_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}"


@@ -19044,6 +16167,8 @@ 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}"
         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}"


@@ -19056,9 +16181,18 @@ case "${host}" in
         ;;
 
     *-*-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_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+

                         if test "$wxUSE_MAC" = 1; then
                         if test "$wxUSE_MAC" = 1; then

-                        WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
-            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+                                    WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
+            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"

         fi
         ;;
 esac
         fi
         ;;
 esac


@@ -19074,13 +16208,14 @@ if test "$wxUSE_OPENGL" = "yes"; then
     WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
 fi
 
     WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
 fi
 

+
+

 if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx | \
       *-pc-msdosdjgpp )
                 wxUSE_SHARED=no
 if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx | \
       *-pc-msdosdjgpp )
                 wxUSE_SHARED=no

-        { echo "$as_me:19082: WARNING: Host system doesn't support shared libraries, disabling" >&5
-echo "$as_me: WARNING: Host system doesn't support shared libraries, disabling" >&2;}
+        echo "configure: warning: Host system doesn't support shared libraries, disabling" 1>&2

       ;;
     esac
 fi
       ;;
     esac
 fi


@@ -19099,12 +16234,49 @@ if test "$wxUSE_SHARED" = "yes"; then
                 PIC_FLAG="-fPIC"
     fi
 
                 PIC_FLAG="-fPIC"
     fi
 

+
+        
+  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:16245: 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:16255: \"$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* )
         SHARED_LD="${CXX} -shared -o"
 
     case "${host}" in
       *-hp-hpux* )

-                if test "$GCC" == "yes"; then
-            SHARED_LD="${SHARED_LD} ${PIC_FLAG}"
+                if test "$GCC" = "yes"; then
+                        SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"

         else
                         LDFLAGS="$LDFLAGS -L/usr/lib"
 
         else
                         LDFLAGS="$LDFLAGS -L/usr/lib"
 


@@ -19122,52 +16294,39 @@ if test "$wxUSE_SHARED" = "yes"; then
 
       *-*-linux* )
         if test "$GCC" != "yes"; then
 
       *-*-linux* )
         if test "$GCC" != "yes"; then

-            echo "$as_me:19125: checking for Intel compiler" >&5
-echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6
-if test "${wx_cv_prog_icc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                cat >conftest.$ac_ext <<_ACEOF
-#line 19132 "configure"
+            echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
+echo "configure:16299: 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 16305 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-int
-main ()
-{
+int main() {

 
                         #ifndef __INTEL_COMPILER
                         #error Not icc
                         #endif
 
                         #ifndef __INTEL_COMPILER
                         #error Not icc
                         #endif

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19148: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19151: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19154: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19157: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+                    
+; return 0; }
+EOF
+if { (eval echo configure:16316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_prog_icc=yes
 else
   wx_cv_prog_icc=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_prog_icc=no
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_prog_icc=no
+                

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+            

 fi
 fi

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

             if test "$wx_cv_prog_icc" = "yes"; then
                 PIC_FLAG="-KPIC"
             fi
             if test "$wx_cv_prog_icc" = "yes"; then
                 PIC_FLAG="-KPIC"
             fi


@@ -19192,53 +16351,53 @@ echo "${ECHO_T}$wx_cv_prog_icc" >&6
       ;;
 
       *-*-darwin* )
       ;;
 
       *-*-darwin* )

-                        CFLAGS="$CFLAGS -fno-common -DWXMAKINGDLL"
-        CXXFLAGS="$CXXFLAGS -fno-common -DWXMAKINGDLL"
+                        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"
                                         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}"
-        SONAME_FLAGS_GL=${SONAME_FLAGS}
+                                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* )
       ;;
 
       *-*-aix* )

-                        # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
+                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
 set dummy makeC++SharedLib; ac_word=$2

-echo "$as_me:19206: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16369: 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
 else
   if test -n "$AIX_CXX_LD"; then
   ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test.
 else

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
-echo "$as_me:19221: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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
   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 "$as_me:19230: result: $AIX_CXX_LD" >&5
-echo "${ECHO_T}$AIX_CXX_LD" >&6
+  echo "$ac_t""$AIX_CXX_LD" 1>&6

 else
 else

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

 fi
 
 fi
 

-        SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+
+            SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+        fi

       ;;
 
       *-*-cygwin* | *-*-mingw32* )
       ;;
 
       *-*-cygwin* | *-*-mingw32* )

-

         WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
         WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"


@@ -19246,11 +16405,11 @@ fi
 
         PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
 
         PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 

-                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}"
+                WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+
+        if test "$wxUSE_OPENGL" = "yes"; then
+            LIBS="${LIBS} ${OPENGL_LIBS}"

         fi
       ;;
 
         fi
       ;;
 


@@ -19258,18 +16417,21 @@ fi
                         SHARED_LD="${LD} -shared -o"
       ;;
 
                         SHARED_LD="${LD} -shared -o"
       ;;
 

+      *-*-irix* )
+                if test "$GCC" != "yes"; then
+            PIC_FLAG="-KPIC"
+        fi
+      ;;
+

       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
       *-*-sunos4* | \
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
       *-*-sunos4* | \

-      *-*-irix5* | *-*-irix6* | \

       *-*-osf* | \
       *-*-dgux5* | \
       *-*-sysv5* )
               ;;
 
       *)
       *-*-osf* | \
       *-*-dgux5* | \
       *-*-sysv5* )
               ;;
 
       *)

-        { { echo "$as_me:19270: error: unknown system type $host." >&5
-echo "$as_me: error: unknown system type $host." >&2;}
-   { (exit 1); exit 1; }; }
+        { 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


@@ -19287,7 +16449,7 @@ if test "$wxUSE_SHARED" = "no"; then
                 WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
     fi
 
                 WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
     fi
 

-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then

         WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
     fi
 
         WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
     fi
 


@@ -19303,444 +16465,573 @@ if test "$wxUSE_SHARED" = "no"; then
 
     WX_TARGET_LIBRARY_TYPE="a"
     INSTALL_LIBRARY='$(INSTALL_DATA)'
 
     WX_TARGET_LIBRARY_TYPE="a"
     INSTALL_LIBRARY='$(INSTALL_DATA)'

+
+            STATIC_FLAG="yes"
+else
+    STATIC_FLAG="no"

 fi
 
 fi
 

+MACRESCOMP="@#"
+MACSETFILE="@#"
+MACRESWXCONFIG="#"

 if test "$wxUSE_MAC" = 1; then
         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
 if test "$wxUSE_MAC" = 1; then
         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

-echo "$as_me:19314: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16485: 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
 else
   if test -n "$RESCOMP"; then
   ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
 else

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_RESCOMP="Rez"
-echo "$as_me:19329: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

   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 "$as_me:19338: result: $RESCOMP" >&5
-echo "${ECHO_T}$RESCOMP" >&6
+  echo "$ac_t""$RESCOMP" 1>&6

 else
 else

-  echo "$as_me:19341: result: no" >&5
-echo "${ECHO_T}no" >&6
+  echo "$ac_t""no" 1>&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 "$as_me:19347: 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
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16515: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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

-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  $as_executable_p "$ac_dir/$ac_word" || continue
-ac_cv_prog_DEREZ="DeRez"
-echo "$as_me:19362: found $ac_dir/$ac_word" >&5
-break
-done
-
+  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"

   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 "$as_me:19371: result: $DEREZ" >&5
-echo "${ECHO_T}$DEREZ" >&6
+  echo "$ac_t""$DEREZ" 1>&6

 else
 else

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

 fi
 
 fi
 

-    MACOSX_BUNDLE="bundle"
-    if test "$wxUSE_SHARED" = "yes"; then
-                LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r -o \$(BIN_PROGRAM)"
-        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r -o"
-    else
-                LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
-        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
-    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:16545: 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
 else

-    if test "$wxUSE_PM" = 1; then
-        LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
+  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
     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
 
 fi
 

-echo "$as_me:19392: 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
+    MACOSX_BUNDLE="bundle"
+            MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
+    MACSETFILE="\$(SETFILE)"
+    MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o"
+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:16580: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19398 "configure"
-#include "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:19413: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19416: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19419: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19422: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_mode_t=yes
+  if test -n "$RESCOMP"; then
+  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_mode_t=no
+  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"
+  test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"

 fi
 fi

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

 fi
 fi

-echo "$as_me:19432: 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
-  :
+RESCOMP="$ac_cv_prog_RESCOMP"
+if test -n "$RESCOMP"; then
+  echo "$ac_t""$RESCOMP" 1>&6

 else
 else

-
-cat >>confdefs.h <<EOF
-#define mode_t int
-EOF
-
+  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-echo "$as_me:19444: 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
+    # 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:16610: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19450 "configure"
-#include "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:19465: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19468: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19471: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19474: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_off_t=yes
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_off_t=no
+  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"
+  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"

 fi
 fi

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

 fi
 fi

-echo "$as_me:19484: 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
-  :
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+  echo "$ac_t""$DEREZ" 1>&6

 else
 else

-
-cat >>confdefs.h <<EOF
-#define off_t long
-EOF
-
+  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-echo "$as_me:19496: 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
+    # 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:16640: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19502 "configure"
-#include "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:19517: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19520: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19523: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19526: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
+  if test -n "$SETFILE"; then
+  ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_pid_t=no
+  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"
+  test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"

 fi
 fi

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

 fi
 fi

-echo "$as_me:19536: 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
-  :
+SETFILE="$ac_cv_prog_SETFILE"
+if test -n "$SETFILE"; then
+  echo "$ac_t""$SETFILE" 1>&6

 else
 else

+  echo "$ac_t""no" 1>&6
+fi

 
 

-cat >>confdefs.h <<EOF
-#define pid_t int
-EOF
-
+    MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
+    MACSETFILE="\$(SETFILE)"
+    MACRESWXCONFIG="echo -n | ${RESCOMP} -d __DARWIN__ -t APPL \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o"
+else
+    if test "$wxUSE_PM" = 1; then
+        MACRESCOMP="emxbind -ep"
+    fi

 fi
 
 fi
 

-echo "$as_me:19548: 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
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:16678: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19554 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 16683 "configure"

 #include "confdefs.h"
 #include "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:19569: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19572: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19575: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19578: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
+#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:16691: \"$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

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_type_size_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no

 fi
 fi

-echo "$as_me:19588: 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
+rm -f conftest*

 
 

-cat >>confdefs.h <<EOF
-#define size_t unsigned
+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 16708 "configure"
+#include "confdefs.h"
+#include <string.h>

 EOF
 EOF

+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*

 
 fi
 
 
 fi
 

-echo "$as_me:19600: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 19606 "configure"
+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 16726 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <sys/types.h>
-
-_ACEOF
+#include <stdlib.h>
+EOF

 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
-  ac_cv_type_uid_t=yes
+  egrep "free" >/dev/null 2>&1; then
+  :

 else
 else

-  ac_cv_type_uid_t=no
+  rm -rf conftest*
+  ac_cv_header_stdc=no

 fi
 rm -f conftest*
 
 fi
 fi
 rm -f conftest*
 
 fi

-echo "$as_me:19620: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
-if test $ac_cv_type_uid_t = no; then

 
 

-cat >>confdefs.h <<\EOF
-#define uid_t int
-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
+  cat > conftest.$ac_ext <<EOF
+#line 16747 "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); }

 
 

-cat >>confdefs.h <<\EOF
-#define gid_t int

 EOF
 EOF

+if { (eval echo configure:16758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+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
 
 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
+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
+
+fi

 
 

-echo "$as_me:19640: 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
+echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+echo "configure:16782: 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

 else
 else

-                          cat >conftest.$ac_ext <<_ACEOF
-#line 19646 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 16787 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>

 #include <stddef.h>
 #include <stddef.h>

-int
-main ()
-{
+#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
+else
+  rm -rf conftest*
+  ac_cv_type_mode_t=no
+fi
+rm -f conftest*
+
+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
+
+fi
+
+echo $ac_n "checking for off_t""... $ac_c" 1>&6
+echo "configure:16815: 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 16820 "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
+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
+#define off_t long
+EOF
+
+fi
+
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "configure:16848: 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
+else
+  cat > conftest.$ac_ext <<EOF
+#line 16853 "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*
+  ac_cv_type_pid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_pid_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define pid_t int
+EOF
+
+fi
+
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:16881: 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
+else
+  cat > conftest.$ac_ext <<EOF
+#line 16886 "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*
+  ac_cv_type_size_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_size_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
+#define size_t unsigned
+EOF
+
+fi
+
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:16914: 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
+else
+  cat > conftest.$ac_ext <<EOF
+#line 16919 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "uid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_uid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_uid_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define uid_t int
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define gid_t int
+EOF
+
+fi
+
+
+
+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 size_t is unsigned int""... $ac_c" 1>&6
+echo "configure:16957: 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 16963 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19664: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19667: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19670: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19673: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+        
+; return 0; }
+EOF
+if { (eval echo configure:16976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_size_t_is_uint=no
 else
   wx_cv_size_t_is_uint=no
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_size_t_is_uint=yes
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=yes
+    

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+    

 
 fi
 
 fi

-echo "$as_me:19685: result: $wx_cv_size_t_is_uint" >&5
-echo "${ECHO_T}$wx_cv_size_t_is_uint" >&6
+
+echo "$ac_t""$wx_cv_size_t_is_uint" 1>&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 <<\EOF

 #define wxSIZE_T_IS_UINT 1
 EOF
 
 else
 #define wxSIZE_T_IS_UINT 1
 EOF
 
 else

-    echo "$as_me:19694: 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
+    echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
+echo "configure:17000: 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

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 19700 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 17005 "configure"

 #include "confdefs.h"
 #include <stddef.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19718: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19721: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19724: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19727: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+            
+; return 0; }
+EOF
+if { (eval echo configure:17018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_size_t_is_ulong=no
 else
   wx_cv_size_t_is_ulong=no
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_size_t_is_ulong=yes
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=yes
+        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+    

 fi
 fi

-echo "$as_me:19739: result: $wx_cv_size_t_is_ulong" >&5
-echo "${ECHO_T}$wx_cv_size_t_is_ulong" >&6
+
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&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 <<\EOF

 #define wxSIZE_T_IS_ULONG 1
 EOF
 
 #define wxSIZE_T_IS_ULONG 1
 EOF
 


@@ -19748,805 +17039,584 @@ EOF
 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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 "$as_me:19756: 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

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 19763 "configure"
+echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
+echo "configure:17052: 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
+else
+  
+        cat > conftest.$ac_ext <<EOF
+#line 17058 "configure"

 #include "confdefs.h"
 #include <pwd.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19779: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:19782: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19785: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19788: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+             
+; return 0; }
+EOF
+if { (eval echo configure:17069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                 wx_cv_struct_pw_gecos=yes
                 wx_cv_struct_pw_gecos=yes

-
+             

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                 wx_cv_struct_pw_gecos=no
                 wx_cv_struct_pw_gecos=no

-
+             
+        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+    

 
 fi
 
 fi

-echo "$as_me:19803: result: $wx_cv_struct_pw_gecos" >&5
-echo "${ECHO_T}$wx_cv_struct_pw_gecos" >&6
+
+echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&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 <<\EOF

 #define HAVE_PW_GECOS 1
 EOF
 
 fi
 
 #define HAVE_PW_GECOS 1
 EOF
 
 fi
 

-WCHAR_OK=0
+

 if test "$wx_cv_sizeof_wchar_t" != "0"; then
 if test "$wx_cv_sizeof_wchar_t" != "0"; then

-        WCHAR_LINK=
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
+EOF

 
 

-for ac_func in wcslen
+
+        WCSLEN_FOUND=0
+    WCHAR_LINK=
+    for ac_func in wcslen

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:19820: 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 19826 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17109: 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 17114 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19857: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:19860: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19863: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19866: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:19876: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-                    cat >>confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:17137: \"$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

 
 

-                    WCHAR_OK=1
-
+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
+ WCSLEN_FOUND=1
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-    if test "$WCHAR_OK" = 0; then
+
+    if test "$WCSLEN_FOUND" = 0; then

         if test "$TOOLKIT" = "MSW"; then
         if test "$TOOLKIT" = "MSW"; then

-            echo "$as_me:19894: 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
+            echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
+echo "configure:17165: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lmsvcrt  $LIBS"
 LIBS="-lmsvcrt  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 19902 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 17173 "configure"

 #include "confdefs.h"
 #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 wcslen ();
-int
-main ()
-{
-wcslen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19921: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:19924: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19927: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19930: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_msvcrt_wcslen=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:19941: 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
-
-                cat >>confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
+    builtin and then its argument prototype would still apply.  */
+char wcslen();

 
 

-                WCHAR_OK=1
+int main() {
+wcslen()
+; return 0; }
+EOF
+if { (eval echo configure:17184: \"$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
+  WCHAR_OK=1
+else
+  echo "$ac_t""no" 1>&6

 fi
 
         else
 fi
 
         else

-            echo "$as_me:19954: 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
+            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
+echo "configure:17206: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lw  $LIBS"
 LIBS="-lw  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 19962 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 17214 "configure"

 #include "confdefs.h"
 #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 wcslen ();
-int
-main ()
-{
-wcslen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19981: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:19984: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19987: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:19990: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_w_wcslen=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:20001: 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
-
-                            cat >>confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
+    builtin and then its argument prototype would still apply.  */
+char wcslen();
+
+int main() {
+wcslen()
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:17225: \"$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
+  

                             WCHAR_LINK=" -lw"
                             WCHAR_LINK=" -lw"

-                            WCHAR_OK=1
-
+                            WCSLEN_FOUND=1
+                        
+else
+  echo "$ac_t""no" 1>&6

 fi
 
         fi
     fi
 fi
 
         fi
     fi

-fi

 
 

-if test "$WCHAR_OK" = 1; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_WCHAR_T 1
+    if test "$WCSLEN_FOUND" = 1; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1

 EOF
 
 EOF
 

-for ac_func in wcsrtombs
+    fi
+
+            for ac_func in wcsrtombs

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20026: 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 20032 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17261: 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 17266 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20063: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20066: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20069: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20072: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:20082: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:17289: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 else
 fi
 done
 
 else

-        if test "$USE_DARWIN" = 1; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_WCHAR_T 1
-EOF
-
-    else
-        { echo "$as_me:20099: WARNING: Wide character support is unavailable" >&5
-echo "$as_me: WARNING: Wide character support is unavailable" >&2;}
-    fi
+    echo "configure: warning: Wide character support is unavailable" 1>&2

 fi
 
 fi
 

-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20107: 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 20113 "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.  */
-#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 ();
-char (*f) ();

 
 

-int
-main ()
-{
-/* 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
-f = $ac_func;
-#endif
+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

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20144: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20147: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20150: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20153: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:20163: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-echo "$as_me:20170: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 20176 "configure"
+
+for ac_func in vsnprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17329: 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 17334 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char _doprnt (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.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
 #include <assert.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 _doprnt ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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.  */
 /* 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__doprnt) || defined (__stub____doprnt)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

 choke me
 #else
 choke me
 #else

-f = _doprnt;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20207: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20210: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20213: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20216: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func__doprnt=yes
+; return 0; }
+EOF
+if { (eval echo configure:17360: \"$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
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func__doprnt=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:20226: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-if test $ac_cv_func__doprnt = yes; then

 
 

-cat >>confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
+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
 EOF

-
-fi
-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-echo "$as_me:20239: checking for vsnprintf" >&5
-echo $ECHO_N "checking for vsnprintf... $ECHO_C" >&6
-if test "${wx_cv_func_vsnprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else

 
 

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20246 "configure"
+if test "$ac_cv_func_vsnprintf" = "yes"; then
+        echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6
+echo "configure:17387: 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
+else
+  
+            cat > conftest.$ac_ext <<EOF
+#line 17393 "configure"

 #include "confdefs.h"
 
                     #include <stdio.h>
                     #include <stdarg.h>
 #include "confdefs.h"
 
                     #include <stdio.h>
                     #include <stdarg.h>

+                
+int main() {

 
 

-int
-main ()
-{
-
-                    int wx_test_vsnprintf(const char *, ...);
+                    char *buf;
+                    va_list ap;
+                    vsnprintf(buf, 10u, "%s", ap);
+                
+; return 0; }
+EOF
+if { (eval echo configure:17407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  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*
+        
+    
+fi

 
 

-                    wx_test_vsnprintf("%s");
-                    return 0;
-                 }
+echo "$ac_t""$wx_cv_func_vsnprintf_decl" 1>&6

 
 

-                 int wx_test_vsnprintf(const char *fmt, ...)
-                 {
-                    char *s;
+    if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF_DECL 1
+EOF

 
 

-                    va_list argp;
-                    va_start(argp, fmt);
-                    vsnprintf(s, 42, fmt, argp);
-                    va_end(argp);
+    fi
+fi

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20276: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20279: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20282: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20285: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-                    wx_cv_func_vsnprintf=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                    cat >conftest.$ac_ext <<_ACEOF
-#line 20295 "configure"
+if test "$wxUSE_UNICODE" = yes; then
+        for ac_func in fputwc wprintf vswprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17436: 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 17441 "configure"

 #include "confdefs.h"
 #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.  */
+#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();

 
 

-                                      #include <stdio.h>
-                                      #include <stdarg.h>
-
-int
-main ()
-{
-
-                                      int wx_test_vsnprintf(const char *, ...);
-
-                                      wx_test_vsnprintf("%s");
-                                      return 0;
-                                   }
-
-                                   int wx_test_vsnprintf(const char *fmt, ...)
-                                   {
-                                      char *s;
-
-                                      va_list argp;
-                                      va_start(argp, fmt);
-                                      _vsnprintf(s, 42, fmt, argp);
-                                      va_end(argp);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20325: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20328: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20331: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20334: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+int main() {

 
 

-                                      wx_cv_func_vsnprintf=yes
+/* 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:17467: \"$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
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                                      wx_cv_func_vsnprintf=no
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
+rm -f conftest*

 fi
 fi

-echo "$as_me:20352: result: $wx_cv_func_vsnprintf" >&5
-echo "${ECHO_T}$wx_cv_func_vsnprintf" >&6

 
 

-if test "$wx_cv_func_vsnprintf" = yes; then
-    cat >>confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
+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
 EOF

-
+ 

 else
 else

-    { echo "$as_me:20361: WARNING: unsafe function vsprintf will be used instead of vsnprintf" >&5
-echo "$as_me: WARNING: unsafe function vsprintf will be used instead of vsnprintf" >&2;}
+  echo "$ac_t""no" 1>&6

 fi
 fi

+done

 
 

-echo "$as_me:20365: checking for vsscanf" >&5
-echo $ECHO_N "checking for vsscanf... $ECHO_C" >&6
-if test "${wx_cv_func_vsscanf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else

 
 

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20372 "configure"
+                echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6
+echo "configure:17493: checking for _vsnwprintf" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 17495 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-
-                    #include <stdio.h>
-                    #include <stdarg.h>
-
-int
-main ()
-{
-
-                    int wx_test_vsscanf(const char *, ...);
-
-                    wx_test_vsscanf("%d");
-                    return 0;
-                }
-
-                int wx_test_vsscanf(const char *fmt, ...)
-                {
-                    va_list argp;
-                    va_start(argp, fmt);
-                    vsscanf("42", fmt, argp);
-                    va_end(argp);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20400: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:20403: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20406: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20409: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-                    wx_cv_func_vsscanf=yes
+#include <wchar.h>
+int main() {
+&_vsnwprintf;
+; return 0; }
+EOF
+if { (eval echo configure:17502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+                    cat >> confdefs.h <<\EOF
+#define HAVE__VSNWPRINTF 1
+EOF

 
 else
 
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                    wx_cv_func_vsscanf=no
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*;

 fi
 fi

-echo "$as_me:20424: result: $wx_cv_func_vsscanf" >&5
-echo "${ECHO_T}$wx_cv_func_vsscanf" >&6

 
 

-if test "$wx_cv_func_vsscanf" = yes; then
-    cat >>confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
+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

 
 if test "$TOOLKIT" != "MSW"; then
 
 
 if test "$TOOLKIT" != "MSW"; then
 

-ac_ext=cc
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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
+

 
 

-# 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 "$as_me:20453: 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
+  echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:17554: checking for iconv" >&5
+if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&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 <<_ACEOF
-#line 20462 "configure"
+    cat > conftest.$ac_ext <<EOF
+#line 17562 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20477: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20480: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20483: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20486: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:17572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

   am_cv_func_iconv=yes
 else
   am_cv_func_iconv=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"

-      cat >conftest.$ac_ext <<_ACEOF
-#line 20498 "configure"
+      cat > conftest.$ac_ext <<EOF
+#line 17584 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20513: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20516: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20519: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20522: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:17594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

       LIBS="$am_save_LIBS"
     fi
       LIBS="$am_save_LIBS"
     fi

-
+  

 fi
 fi

-echo "$as_me:20535: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
-  if test "$am_cv_func_iconv" = yes; then

 
 

-cat >>confdefs.h <<\EOF
+echo "$ac_t""$am_cv_func_iconv" 1>&6
+  if test "$am_cv_func_iconv" = yes; then
+    cat >> confdefs.h <<\EOF

 #define HAVE_ICONV 1
 EOF
 
 #define HAVE_ICONV 1
 EOF
 

-    echo "$as_me:20543: 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
+    echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6
+echo "configure:17615: 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

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20549 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 17620 "configure"

 #include "confdefs.h"
 
 #include <stdlib.h>
 #include "confdefs.h"
 
 #include <stdlib.h>


@@ -20560,46 +17630,33 @@ 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() {

 
 

-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20573: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:20576: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20579: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20582: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:17639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_func_iconv_const="no"
 else
   wx_cv_func_iconv_const="no"
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_func_iconv_const="yes"
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_func_iconv_const="yes"
+      

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+    

 fi
 fi

-echo "$as_me:20594: result: $wx_cv_func_iconv_const" >&5
-echo "${ECHO_T}$wx_cv_func_iconv_const" >&6
+
+echo "$ac_t""$wx_cv_func_iconv_const" 1>&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 <<EOF

 #define ICONV_CONST $iconv_const
 EOF
 
 #define ICONV_CONST $iconv_const
 EOF
 


@@ -20608,308 +17665,205 @@ EOF
   if test "$am_cv_lib_iconv" = yes; then
     LIBICONV="-liconv"
   fi
   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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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

 
 

-if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then

 
 

-for ac_func in sigaction
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+    for ac_func in sigaction

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20624: 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 20630 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17684: 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 17689 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20661: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20664: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20667: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20670: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:20680: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:17712: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

+

     if test "$ac_cv_func_sigaction" = "no"; then
     if test "$ac_cv_func_sigaction" = "no"; then

-        { echo "$as_me:20691: 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;}
+        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&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=cc
+      
+      ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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 "$as_me:20704: 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

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 20711 "configure"
+      echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
+echo "configure:17753: 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
+else
+  
+        cat > conftest.$ac_ext <<EOF
+#line 17759 "configure"

 #include "confdefs.h"
 #include <signal.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20728: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:20731: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20734: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20737: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                     
+; return 0; }
+EOF
+if { (eval echo configure:17771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                         wx_cv_type_sa_handler=int
                         wx_cv_type_sa_handler=int

-
+                     

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                         wx_cv_type_sa_handler=void
                         wx_cv_type_sa_handler=void

-
+                     

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+      

 fi
 fi

-echo "$as_me:20752: result: $wx_cv_type_sa_handler" >&5
-echo "${ECHO_T}$wx_cv_type_sa_handler" >&6
+
+echo "$ac_t""$wx_cv_type_sa_handler" 1>&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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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

 
 

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

 #define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
 EOF
 
     fi
 fi
 
 #define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
 EOF
 
     fi
 fi
 

-for ac_func in vfork
+for ac_func in mkstemp mktemp

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20771: 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 20777 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17808: 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 17813 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20808: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20811: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20814: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20817: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:20827: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

-
+if { (eval echo configure:17836: \"$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
 fi

-done
-
-for ac_func in mkstemp mktemp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20840: 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 20846 "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.  */
-#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 ();
-char (*f) ();
-
-int
-main ()
-{
-/* 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
-f = $ac_func;
-#endif

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20877: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:20880: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20883: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20886: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:20896: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+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
  break
 EOF
  break

+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-echo "$as_me:20906: 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
+
+echo $ac_n "checking for statfs""... $ac_c" 1>&6
+echo "configure:17862: checking for statfs" >&5
+if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20912 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 17867 "configure"

 #include "confdefs.h"
 
              #if defined(__BSD__)
 #include "confdefs.h"
 
              #if defined(__BSD__)


@@ -20918,10 +17872,8 @@ 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;


@@ -20929,329 +17881,353 @@ 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20938: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:20941: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20944: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20947: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+        
+; return 0; }
+EOF
+if { (eval echo configure:17888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

              wx_cv_func_statfs=yes
              wx_cv_func_statfs=yes

-
+        

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

              wx_cv_func_statfs=no
              wx_cv_func_statfs=no

-
+        
+    

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 
 fi
 
 fi

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

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

-    cat >>confdefs.h <<\EOF
+    wx_cv_type_statvfs_t="struct statfs"
+    cat >> confdefs.h <<\EOF

 #define HAVE_STATFS 1
 EOF
 
 else
 #define HAVE_STATFS 1
 EOF
 
 else

-    echo "$as_me:20971: 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
+    echo $ac_n "checking for statvfs""... $ac_c" 1>&6
+echo "configure:17916: checking for statvfs" >&5
+if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 20977 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 17921 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-                 #include <sys/statvfs.h>
+                #include <stddef.h>
+                #include <sys/statvfs.h>
+            
+int main() {

 
 

-int
-main ()
-{
+                statvfs("/", NULL);
+            
+; return 0; }
+EOF
+if { (eval echo configure:17933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  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*
+    
+fi

 
 

-                 long l;
-                 struct statvfs fs;
-                 statvfs("/", &fs);
-                 l = fs.f_bsize;
-                 l += fs.f_blocks;
-                 l += fs.f_bavail;
+echo "$ac_t""$wx_cv_func_statvfs" 1>&6

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20998: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:21001: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21004: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21007: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; 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_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

 
 

-                 wx_cv_func_statvfs=yes

 
 

+        echo $ac_n "checking for statvfs argument type""... $ac_c" 1>&6
+echo "configure:17960: 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

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+  cat > conftest.$ac_ext <<EOF
+#line 17965 "configure"
+#include "confdefs.h"

 
 

-                 wx_cv_func_statvfs=no
+                    #include <sys/statvfs.h>
+                
+int main() {

 
 

-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+                    long l;
+                    statvfs_t fs;
+                    statvfs("/", &fs);
+                    l = fs.f_bsize;
+                    l += fs.f_blocks;
+                    l += fs.f_bavail;
+                
+; return 0; }
+EOF
+if { (eval echo configure:17981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  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 17990 "configure"
+#include "confdefs.h"

 
 

+                            #include <sys/statvfs.h>
+                        
+int main() {
+
+                            long l;
+                            struct statvfs fs;
+                            statvfs("/", &fs);
+                            l = fs.f_bsize;
+                            l += fs.f_blocks;
+                            l += fs.f_bavail;
+                        
+; return 0; }
+EOF
+if { (eval echo configure:18006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  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*
+                
+            
+fi
+rm -f conftest*
+        

 fi
 fi

-echo "$as_me:21022: result: $wx_cv_func_statvfs" >&5
-echo "${ECHO_T}$wx_cv_func_statvfs" >&6

 
 

-    if test "$wx_cv_func_statvfs" = "yes"; then
-        cat >>confdefs.h <<\EOF
+echo "$ac_t""$wx_cv_type_statvfs_t" 1>&6
+
+        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
+
+
+        if test "$wx_cv_type_statvfs_t" != "unknown"; then
+            cat >> confdefs.h <<\EOF

 #define HAVE_STATVFS 1
 EOF
 
 #define HAVE_STATVFS 1
 EOF
 

+        fi

     else
     else

-        { echo "$as_me:21031: WARNING: wxGetDiskSpace() function won't work without statfs()" >&5
-echo "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;}
+                wx_cv_type_statvfs_t="unknown"

     fi
 fi
 
     fi
 fi
 

-if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+if test "$wx_cv_type_statvfs_t" != "unknown"; then
+    cat >> confdefs.h <<EOF
+#define WX_STATFS_T $wx_cv_type_statvfs_t
+EOF

 
 

-for ac_func in fcntl flock
+else
+    echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+fi
+
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+    for ac_func in fcntl flock

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21041: 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 21047 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18058: 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 18063 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21078: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21081: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21084: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21087: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21097: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }
+EOF
+if { (eval echo configure:18086: \"$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
  break
 EOF
  break

+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

+

     if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
     if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then

-        { echo "$as_me:21108: WARNING: wxSingleInstanceChecker not available" >&5
-echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;}
+        echo "configure: warning: wxSingleInstanceChecker not available" 1>&2

         wxUSE_SNGLINST_CHECKER=no
     fi
 fi
 
 for ac_func in timegm
 do
         wxUSE_SNGLINST_CHECKER=no
     fi
 fi
 
 for ac_func in timegm
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21117: 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 21123 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18120: 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 18125 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21154: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21157: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21160: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21163: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21173: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

-
+if { (eval echo configure:18148: \"$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
+ 
+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

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21186: 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 21192 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18176: 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 18181 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21223: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21226: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21229: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21232: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21242: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }
+EOF
+if { (eval echo configure:18204: \"$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
  break
 EOF
  break

+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

+

 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then
 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then

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

 #define HAVE_SLEEP 1
 EOF
 
 #define HAVE_SLEEP 1
 EOF
 


@@ -21259,7 +18235,7 @@ EOF
 fi
 
 if test "$USE_DARWIN" = 1; then
 fi
 
 if test "$USE_DARWIN" = 1; then

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

 #define HAVE_USLEEP 1
 EOF
 
 #define HAVE_USLEEP 1
 EOF
 


@@ -21268,215 +18244,172 @@ fi
 
 if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
         POSIX4_LINK=
 
 if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
         POSIX4_LINK=

-
-for ac_func in nanosleep
+    for ac_func in nanosleep

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21275: 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 21281 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18251: 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 18256 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21312: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21315: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21318: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21321: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21331: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
- cat >>confdefs.h <<\EOF
+; return 0; }
+EOF
+if { (eval echo configure:18279: \"$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

 #define HAVE_NANOSLEEP 1
 EOF
 
 else
 #define HAVE_NANOSLEEP 1
 EOF
 
 else

-
-            echo "$as_me:21343: 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
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
+echo "configure:18304: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lposix4  $LIBS"
 LIBS="-lposix4  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21351 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 18312 "configure"

 #include "confdefs.h"
 #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 nanosleep ();
-int
-main ()
-{
-nanosleep ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21370: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21373: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21376: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21379: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_posix4_nanosleep=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21390: 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 <<\EOF
+    builtin and then its argument prototype would still apply.  */
+char nanosleep();
+
+int main() {
+nanosleep()
+; return 0; }
+EOF
+if { (eval echo configure:18323: \"$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

 #define HAVE_NANOSLEEP 1
 EOF
 
                     POSIX4_LINK=" -lposix4"
 #define HAVE_NANOSLEEP 1
 EOF
 
                     POSIX4_LINK=" -lposix4"

-
+                

 else
 else

+  echo "$ac_t""no" 1>&6

 
 

-for ac_func in usleep
+                    for ac_func in usleep

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21405: 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 21411 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18351: 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 18356 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21442: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21445: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21448: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21451: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21461: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
- cat >>confdefs.h <<\EOF
+; return 0; }
+EOF
+if { (eval echo configure:18379: \"$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

 #define HAVE_USLEEP 1
 EOF
 
 else
 #define HAVE_USLEEP 1
 EOF
 
 else

-  { echo "$as_me:21472: WARNING: wxSleep() function will not work" >&5
-echo "$as_me: WARNING: wxSleep() function will not work" >&2;}
-
+  echo "$ac_t""no" 1>&6
+echo "configure: warning: wxSleep() function will not work" 1>&2
+                    

 fi
 done
 
 fi
 done
 

+                
+            

 fi
 
 fi
 

+        
+    

 fi
 done
 
 fi
 done
 


@@ -21484,525 +18417,426 @@ fi
 
 for ac_func in uname gethostname
 do
 
 for ac_func in uname gethostname
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21488: 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 21494 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18422: 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 18427 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21525: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21528: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21531: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21534: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21544: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }
+EOF
+if { (eval echo configure:18450: \"$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
  break
 EOF
  break

+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-ac_ext=cc
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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
+

 
 for ac_func in strtok_r
 do
 
 for ac_func in strtok_r
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21563: 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 21569 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18487: 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 18492 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.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
 #include <assert.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 $ac_func ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21600: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21603: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21606: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21609: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21619: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:18518: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

+

 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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

 
 

-INET_LINK=

 
 

+INET_LINK=

 for ac_func in inet_addr
 do
 for ac_func in inet_addr
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21640: 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 21646 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18555: 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 18560 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21677: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21680: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21683: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21686: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21696: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
- cat >>confdefs.h <<\EOF
+; return 0; }
+EOF
+if { (eval echo configure:18583: \"$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

 #define HAVE_INET_ADDR 1
 EOF
 
 else
 #define HAVE_INET_ADDR 1
 EOF
 
 else

-
-        echo "$as_me:21708: 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
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
+echo "configure:18608: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lnsl  $LIBS"
 LIBS="-lnsl  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21716 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 18616 "configure"

 #include "confdefs.h"
 #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 inet_addr ();
-int
-main ()
-{
-inet_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21735: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21738: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21741: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21744: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_inet_addr=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21755: 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
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
+
+int main() {
+inet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:18627: \"$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

   INET_LINK="nsl"
 else
   INET_LINK="nsl"
 else

-  echo "$as_me:21760: 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
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
+echo "configure:18646: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lresolv  $LIBS"
 LIBS="-lresolv  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21768 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 18654 "configure"

 #include "confdefs.h"
 #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 inet_addr ();
-int
-main ()
-{
-inet_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21787: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21790: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21793: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21796: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_resolv_inet_addr=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21807: 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
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
+
+int main() {
+inet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:18665: \"$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

   INET_LINK="resolv"
 else
   INET_LINK="resolv"
 else

-  echo "$as_me:21812: 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
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6
+echo "configure:18684: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lsocket  $LIBS"
 LIBS="-lsocket  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21820 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 18692 "configure"

 #include "confdefs.h"
 #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 inet_addr ();
-int
-main ()
-{
-inet_addr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21839: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21842: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21845: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21848: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_inet_addr=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21859: 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"
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
+
+int main() {
+inet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:18703: \"$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
 
 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

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21876: 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 21882 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:18739: 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 18744 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21913: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21916: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21919: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21922: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21932: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
- cat >>confdefs.h <<\EOF
+; return 0; }
+EOF
+if { (eval echo configure:18767: \"$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

 #define HAVE_INET_ATON 1
 EOF
 
 else
 #define HAVE_INET_ATON 1
 EOF
 
 else

-
-                        as_ac_Lib=`echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh`
-echo "$as_me:21945: 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
+  echo "$ac_t""no" 1>&6
+            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
+echo "configure:18792: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-l$INET_LINK  $LIBS"
 LIBS="-l$INET_LINK  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 21953 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 18800 "configure"

 #include "confdefs.h"
 #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 inet_aton ();
-int
-main ()
-{
-inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21972: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:21975: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21978: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:21981: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:21992: 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 <<\EOF
+    builtin and then its argument prototype would still apply.  */
+char inet_aton();
+
+int main() {
+inet_aton()
+; return 0; }
+EOF
+if { (eval echo configure:18811: \"$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

 #define HAVE_INET_ATON 1
 EOF
 
 #define HAVE_INET_ATON 1
 EOF
 

+else
+  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

+        

 fi
 done
 
 fi
 done
 

+

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

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

 #define HAVE_INET_ADDR 1
 EOF
 
 #define HAVE_INET_ADDR 1
 EOF
 


@@ -22011,81 +18845,73 @@ fi
 
 fi
 
 
 fi
 

-cat >confcache <<\_ACEOF
+
+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
 # 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.
+# 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.

 #
 #

-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
+# 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.

 #
 #

-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
+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.
 # 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 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 \
+      -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
   if test -w $cache_file; then

-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+    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
 

+
+

 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
     THREADS_LINK=
     THREADS_CFLAGS=
 
     if test "$wxUSE_THREADS" = "yes" ; then

-        if test "$wxUSE_WINE" = 1 ; then
-            { echo "$as_me:22077: WARNING: Threads are not supported under WINE... disabled" >&5
-echo "$as_me: WARNING: Threads are not supported under WINE... disabled" >&2;}
-            wxUSE_THREADS="no"
-        elif test "$USE_BEOS" = 1; then
-            { echo "$as_me:22081: WARNING: BeOS threads are not yet supported... disabled" >&5
-echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
+        if test "$USE_BEOS" = 1; then
+            echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&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* )


@@ -22104,6 +18930,23 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
           *-*-aix*)
                                 THREAD_OPTS="pthreads"
                 ;;
           *-*-aix*)
                                 THREAD_OPTS="pthreads"
                 ;;

+          *-hp-hpux* )
+                                                                if test "x$GCC" != "xyes"; then
+                    THREAD_OPTS=""
+                fi
+                ;;
+
+          *-*-irix* )
+                                                                if test "x$GCC" = "xyes"; then
+                    THREAD_OPTS=""
+                fi
+                ;;
+
+          *-*-*UnixWare*)
+                                if test "x$GCC" != "xyes"; then
+                    THREAD_OPTS="-Ethread"
+                fi
+                ;;

         esac
 
                                 THREAD_OPTS="$THREAD_OPTS pthread none"
         esac
 
                                 THREAD_OPTS="$THREAD_OPTS pthread none"


@@ -22112,19 +18955,19 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
         for flag in $THREAD_OPTS; do
             case $flag in
                 none)
         for flag in $THREAD_OPTS; do
             case $flag in
                 none)

-                    echo "$as_me:22115: 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 without any flags""... $ac_c" 1>&6
+echo "configure:18960: checking whether pthreads work without any flags" >&5

                     ;;
 
                 -*)
                     ;;
 
                 -*)

-                    echo "$as_me:22120: checking whether pthreads work with $flag" >&5
-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
+                    echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
+echo "configure:18965: checking whether pthreads work with $flag" >&5

                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)
                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)

-                    echo "$as_me:22126: checking for the pthreads library -l$flag" >&5
-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6
+                    echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
+echo "configure:18971: checking for the pthreads library -l$flag" >&5

                     THREADS_LINK="-l$flag"
                     ;;
               esac
                     THREADS_LINK="-l$flag"
                     ;;
               esac


@@ -22134,42 +18977,27 @@ echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6
               LIBS="$THREADS_LINK $LIBS"
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 
               LIBS="$THREADS_LINK $LIBS"
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 

-              cat >conftest.$ac_ext <<_ACEOF
-#line 22138 "configure"
+              cat > conftest.$ac_ext <<EOF
+#line 18982 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 #include "confdefs.h"
 #include <pthread.h>

-int
-main ()
-{
+int main() {

 pthread_create(0,0,0,0);
 pthread_create(0,0,0,0);

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22150: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22153: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22156: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22159: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+; return 0; }
+EOF
+if { (eval echo configure:18989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*

   THREADS_OK=yes
 else
   THREADS_OK=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5

 fi
 fi

-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest*

 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 
 
               LIBS="$save_LIBS"
               CFLAGS="$save_CFLAGS"
 

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

               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi
               if test "x$THREADS_OK" = "xyes"; then
                       break;
               fi


@@ -22180,24 +19008,33 @@ echo "${ECHO_T}$THREADS_OK" >&6
 
       if test "x$THREADS_OK" != "xyes"; then
           wxUSE_THREADS=no
 
       if test "x$THREADS_OK" != "xyes"; then
           wxUSE_THREADS=no

-          { echo "$as_me:22183: WARNING: No thread support on this system... disabled" >&5
-echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
+          echo "configure: warning: No thread support on this system... disabled" 1>&2

       else
       else

-                              LIBS="$THREADS_LINK $THREADS_CFLAGS $LIBS"
+                              LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+          LIBS="$THREADS_LINK $LIBS"

 
 

-          echo "$as_me:22188: checking if more special flags are required for pthreads" >&5
-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6
+          echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
+echo "configure:19018: checking if more special flags are required for pthreads" >&5

           flag=no
           case "${host}" in
           flag=no
           case "${host}" in

-            *-aix* | *-freebsd*)
+            *-aix*)
+                                                                                                                LDFLAGS="-L/usr/lib/threads $LDFLAGS"

                 flag="-D_THREAD_SAFE"
                 ;;
                 flag="-D_THREAD_SAFE"
                 ;;

+            *-freebsd*)
+                flag="-D_THREAD_SAFE"
+                ;;
+            *-hp-hpux* )
+                flag="-D_REENTRANT"
+                if test "x$GCC" != "xyes"; then
+                                        flag="$flag -D_RWSTD_MULTI_THREAD"
+                fi
+                ;;

             *solaris* | alpha*-osf*)
                 flag="-D_REENTRANT"
                 ;;
           esac
             *solaris* | alpha*-osf*)
                 flag="-D_REENTRANT"
                 ;;
           esac

-          echo "$as_me:22199: result: ${flag}" >&5
-echo "${ECHO_T}${flag}" >&6
+          echo "$ac_t""${flag}" 1>&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


@@ -22210,771 +19047,660 @@ echo "${ECHO_T}${flag}" >&6
     fi
 
         if test "$wxUSE_THREADS" = "yes" ; then
     fi
 
         if test "$wxUSE_THREADS" = "yes" ; then

-
-for ac_func in thr_setconcurrency
+      for ac_func in thr_setconcurrency

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22217: 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 22223 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:19054: 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 19059 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22254: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22257: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22260: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22263: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22273: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

-
-fi
+if { (eval echo configure:19082: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi

 done
 
 done
 

-for ac_header in sched.h
+
+      for ac_hdr in sched.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22286: 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 22292 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:19111: 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 19116 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:22296: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:22302: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:19121: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:22321: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
       if test "$ac_cv_header_sched_h" = "yes"; then
 fi
 done
 
       if test "$ac_cv_header_sched_h" = "yes"; then

-          echo "$as_me:22332: 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
+          echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
+echo "configure:19149: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 22338 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 19154 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char sched_yield (); below.  */
+    which can conflict with char sched_yield(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char sched_yield();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = sched_yield;
+sched_yield();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22369: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22372: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22375: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22378: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_sched_yield=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22388: 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 <<\EOF
+; return 0; }
+EOF
+if { (eval echo configure:19177: \"$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

 #define HAVE_SCHED_YIELD 1
 EOF
 
 else
 #define HAVE_SCHED_YIELD 1
 EOF
 
 else

+  echo "$ac_t""no" 1>&6

 
 

-                echo "$as_me:22397: 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
+                echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:19199: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lposix4  $LIBS"
 LIBS="-lposix4  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 22405 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 19207 "configure"

 #include "confdefs.h"
 #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 sched_yield ();
-int
-main ()
-{
-sched_yield ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22424: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22427: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22430: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22433: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_posix4_sched_yield=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22444: 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 <<\EOF
+    builtin and then its argument prototype would still apply.  */
+char sched_yield();
+
+int main() {
+sched_yield()
+; return 0; }
+EOF
+if { (eval echo configure:19218: \"$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

 #define HAVE_SCHED_YIELD 1
 EOF
  POSIX4_LINK=" -lposix4"
 else
 #define HAVE_SCHED_YIELD 1
 EOF
  POSIX4_LINK=" -lposix4"
 else

-  { echo "$as_me:22452: WARNING: wxThread::Yield will not work properly" >&5
-echo "$as_me: WARNING: wxThread::Yield will not work properly" >&2;}
-
+  echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Yield will not work properly" 1>&2
+                

 fi
 
 fi
 

+            
+          

 fi
 
       fi
 
                                           HAVE_PRIOR_FUNCS=0
 fi
 
       fi
 
                                           HAVE_PRIOR_FUNCS=0

-      echo "$as_me:22462: 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
+      echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6
+echo "configure:19251: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 22468 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 19256 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char pthread_attr_getschedpolicy (); below.  */
+    which can conflict with char pthread_attr_getschedpolicy(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char pthread_attr_getschedpolicy();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = pthread_attr_getschedpolicy;
+pthread_attr_getschedpolicy();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22499: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22502: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22505: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22508: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_pthread_attr_getschedpolicy=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22518: 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:22521: 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 22527 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes
+; return 0; }
+EOF
+if { (eval echo configure:19279: \"$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:19294: 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
 else

-  which can conflict with char pthread_attr_setschedparam (); below.  */
+  cat > conftest.$ac_ext <<EOF
+#line 19299 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char pthread_attr_setschedparam(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char pthread_attr_setschedparam();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = pthread_attr_setschedparam;
+pthread_attr_setschedparam();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22559: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22562: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22565: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22568: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_pthread_attr_setschedparam=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22578: 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:22581: 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 22587 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes
+; return 0; }
+EOF
+if { (eval echo configure:19322: \"$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:19337: 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
 else

-  which can conflict with char sched_get_priority_max (); below.  */
+  cat > conftest.$ac_ext <<EOF
+#line 19342 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char sched_get_priority_max(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char sched_get_priority_max();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = sched_get_priority_max;
+sched_get_priority_max();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22619: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22622: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22625: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22628: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_sched_get_priority_max=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22638: 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
+; return 0; }
+EOF
+if { (eval echo configure:19365: \"$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

   HAVE_PRIOR_FUNCS=1
 else
   HAVE_PRIOR_FUNCS=1
 else

-  echo "$as_me:22643: 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
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:19383: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lposix4  $LIBS"
 LIBS="-lposix4  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 22651 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 19391 "configure"

 #include "confdefs.h"
 #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 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:22670: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22673: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22676: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22679: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_posix4_sched_get_priority_max=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22690: 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
+    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:19402: \"$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
+  

                                 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
 
 fi
 

+

       if test "$HAVE_PRIOR_FUNCS" = 1; then
       if test "$HAVE_PRIOR_FUNCS" = 1; then

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

 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 EOF
 
       else
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 EOF
 
       else

-        { echo "$as_me:22711: WARNING: Setting thread priority will not work" >&5
-echo "$as_me: WARNING: Setting thread priority will not work" >&2;}
+        echo "configure: warning: Setting thread priority will not work" 1>&2

       fi
 
       fi
 

-      echo "$as_me:22715: 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
+      echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6
+echo "configure:19449: 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
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 22721 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 19454 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char pthread_cancel (); below.  */
+    which can conflict with char pthread_cancel(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char pthread_cancel();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = pthread_cancel;
+pthread_cancel();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22752: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:22755: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22758: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22761: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_pthread_cancel=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:22771: 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 <<\EOF
+; return 0; }
+EOF
+if { (eval echo configure:19477: \"$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

 #define HAVE_PTHREAD_CANCEL 1
 EOF
 
 else
 #define HAVE_PTHREAD_CANCEL 1
 EOF
 
 else

-  { echo "$as_me:22779: WARNING: wxThread::Kill() will not work properly" >&5
-echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;}
+  echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Kill() will not work properly" 1>&2

 fi
 
 fi
 

-      echo "$as_me:22783: 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

 
 

-        cat >conftest.$ac_ext <<_ACEOF
-#line 22790 "configure"
+      echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
+echo "configure:19502: 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
+else
+  
+        cat > conftest.$ac_ext <<EOF
+#line 19508 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22805: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:22808: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22811: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22814: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                     
+; return 0; }
+EOF
+if { (eval echo configure:19518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                         wx_cv_func_pthread_cleanup_push=yes
                         wx_cv_func_pthread_cleanup_push=yes

-
+                     

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                         wx_cv_func_pthread_cleanup_push=no
                         wx_cv_func_pthread_cleanup_push=no

-
+                     

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+      

 fi
 fi

-echo "$as_me:22829: result: $wx_cv_func_pthread_cleanup_push" >&5
-echo "${ECHO_T}$wx_cv_func_pthread_cleanup_push" >&6
+
+echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&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 <<\EOF

 #define HAVE_THREAD_CLEANUP_FUNCTIONS 1
 EOF
 
       fi
 
 #define HAVE_THREAD_CLEANUP_FUNCTIONS 1
 EOF
 
       fi
 

-      echo "$as_me:22839: 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
+                                                
+      echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
+echo "configure:19546: 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

 else
 else

-
-        cat >conftest.$ac_ext <<_ACEOF
-#line 22846 "configure"
+  
+        cat > conftest.$ac_ext <<EOF
+#line 19552 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22861: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:22864: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22867: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22870: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+            
+; return 0; }
+EOF
+if { (eval echo configure:19562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                wx_cv_type_pthread_mutexattr_t=yes
                wx_cv_type_pthread_mutexattr_t=yes

-
+            

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                wx_cv_type_pthread_mutexattr_t=no
                wx_cv_type_pthread_mutexattr_t=no

-
+            
+        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+      

 fi
 fi

-echo "$as_me:22885: result: $wx_cv_type_pthread_mutexattr_t" >&5
-echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6
+
+echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&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 <<\EOF

 #define HAVE_PTHREAD_MUTEXATTR_T 1
 EOF
 
       else
 #define HAVE_PTHREAD_MUTEXATTR_T 1
 EOF
 
       else

-                echo "$as_me:22894: 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 22901 "configure"
+                echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
+echo "configure:19589: 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 19595 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22915: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:22918: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22921: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:22924: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                
+; return 0; }
+EOF
+if { (eval echo configure:19604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                     wx_cv_type_pthread_rec_mutex_init=yes
                     wx_cv_type_pthread_rec_mutex_init=yes

-
+                

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                     wx_cv_type_pthread_rec_mutex_init=no
                     wx_cv_type_pthread_rec_mutex_init=no

-
+                
+            

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+        

 fi
 fi

-echo "$as_me:22939: result: $wx_cv_type_pthread_rec_mutex_init" >&5
-echo "${ECHO_T}$wx_cv_type_pthread_rec_mutex_init" >&6
+
+echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&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 <<\EOF

 #define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
 EOF
 
         else
 #define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
 EOF
 
         else

-                    { echo "$as_me:22947: WARNING: wxMutex won't be recursive on this platform" >&5
-echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
+                    echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2

         fi
       fi
     fi
 
         fi
       fi
     fi
 

+else
+    if test "$wxUSE_THREADS" = "yes" ; then
+      case "${host}" in
+        *-*-mingw32* )
+                        echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6
+echo "configure:19639: 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
+else
+  
+                    CFLAGS_OLD="$CFLAGS"
+                    CFLAGS="$CFLAGS -mthreads"
+                    cat > conftest.$ac_ext <<EOF
+#line 19647 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:19654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  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*
+                
+            
+fi
+
+echo "$ac_t""$wx_cv_cflags_mthread" 1>&6
+
+            if test "$wx_cv_cflags_mthread" = "yes"; then
+                                CXXFLAGS="$CXXFLAGS -mthreads"
+                TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -mthreads"
+                LDFLAGS="$LDFLAGS -mthreads"
+            else
+                                CFLAGS="$CFLAGS_OLD"
+            fi
+        ;;
+      esac
+    fi

 fi
 
 if test "$wxUSE_THREADS" = "yes"; then
 fi
 
 if test "$wxUSE_THREADS" = "yes"; then

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

 #define wxUSE_THREADS 1
 EOF
 
 #define wxUSE_THREADS 1
 EOF
 

+

   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 "$as_me:22963: checking if -D_REENTRANT is needed" >&5
-echo $ECHO_N "checking if -D_REENTRANT is needed... $ECHO_C" >&6
+    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
+echo "configure:19693: checking if -D_REENTRANT is needed" >&5

     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 "$as_me:22967: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+        echo "$ac_t""yes" 1>&6

     else
     else

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

     fi
   fi
 fi
 
 if test "$WXGTK20" = 1 ; then
     fi
   fi
 fi
 
 if test "$WXGTK20" = 1 ; then

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

 #define __WXGTK20__ $WXGTK20
 EOF
 
 #define __WXGTK20__ $WXGTK20
 EOF
 


@@ -22982,14 +19708,14 @@ EOF
 fi
 
 if test "$WXGTK12" = 1 ; then
 fi
 
 if test "$WXGTK12" = 1 ; then

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

 #define __WXGTK12__ $WXGTK12
 EOF
 
 fi
 
 if test "$WXGTK127" = 1 ; then
 #define __WXGTK12__ $WXGTK12
 EOF
 
 fi
 
 if test "$WXGTK127" = 1 ; then

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

 #define __WXGTK127__ $WXGTK127
 EOF
 
 #define __WXGTK127__ $WXGTK127
 EOF
 


@@ -23008,7 +19734,7 @@ 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 <<\EOF

 #define WXDEBUG 1
 EOF
 
 #define WXDEBUG 1
 EOF
 


@@ -23020,15 +19746,15 @@ else
 fi
 
 if test "$wxUSE_MEM_TRACING" = "yes" ; then
 fi
 
 if test "$wxUSE_MEM_TRACING" = "yes" ; then

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

 #define wxUSE_MEMORY_TRACING 1
 EOF
 
 #define wxUSE_MEMORY_TRACING 1
 EOF
 

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

 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 EOF
 
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 EOF
 

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

 #define wxUSE_DEBUG_NEW_ALWAYS 1
 EOF
 
 #define wxUSE_DEBUG_NEW_ALWAYS 1
 EOF
 


@@ -23063,19 +19789,26 @@ if test "$GCC" = "yes" ; then
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
     fi
 
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
     fi
 

-                            case "${host}" in
+                                                case "${host}" in

       powerpc*-*-aix* )
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -mminimal-toc"
         ;;
       powerpc*-*-aix* )
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -mminimal-toc"
         ;;

+      *-hppa* )
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections"
+        ;;

     esac
 fi
 
     esac
 fi
 

+OPTIMISE=

 if test "$wxUSE_OPTIMISE" = "no" ; then
 if test "$wxUSE_OPTIMISE" = "no" ; then

-    OPTIMISE=
+    if test "$GCC" = yes ; then
+                        OPTIMISE="-O0"
+    fi

 else
     if test "$GCC" = yes ; then
         OPTIMISE="-O2"
 else
     if test "$GCC" = yes ; then
         OPTIMISE="-O2"

-        case "${host}" in
+
+                case "${host}" in

             i586-*-*|i686-*-* )
             OPTIMISE="${OPTIMISE} "
         ;;
             i586-*-*|i686-*-* )
             OPTIMISE="${OPTIMISE} "
         ;;


@@ -23085,161 +19818,169 @@ else
     fi
 fi
 
     fi
 fi
 

+

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

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

 #define WXWIN_COMPATIBILITY_2 1
 EOF
 
 #define WXWIN_COMPATIBILITY_2 1
 EOF
 

+

     WXWIN_COMPATIBILITY_2_2="yes"
 fi
 
     WXWIN_COMPATIBILITY_2_2="yes"
 fi
 

-if test "x$WXWIN_COMPATIBILITY_2_2" != "xno"; then
-    cat >>confdefs.h <<\EOF
+if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
+    cat >> confdefs.h <<\EOF

 #define WXWIN_COMPATIBILITY_2_2 1
 EOF
 
 #define WXWIN_COMPATIBILITY_2_2 1
 EOF
 

+
+    WXWIN_COMPATIBILITY_2_4="yes"
+fi
+
+if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2_4 1
+EOF
+

 fi
 
 fi
 

+

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

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

 #define wxUSE_GUI 1
 EOF
 
 #define wxUSE_GUI 1
 EOF
 

+

                       else
                       else

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

 #define wxUSE_NOGUI 1
 EOF
 
 fi
 
 #define wxUSE_NOGUI 1
 EOF
 
 fi
 

+

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

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

 #define wxUSE_UNIX 1
 EOF
 
 fi
 
 #define wxUSE_UNIX 1
 EOF
 
 fi
 

+

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

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

 #define wxUSE_APPLE_IEEE 1
 EOF
 
 fi
 
 if test "$wxUSE_TIMER" = "yes"; then
 #define wxUSE_APPLE_IEEE 1
 EOF
 
 fi
 
 if test "$wxUSE_TIMER" = "yes"; then

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

 #define wxUSE_TIMER 1
 EOF
 
 fi
 
 if test "$wxUSE_WAVE" = "yes"; then
 #define wxUSE_TIMER 1
 EOF
 
 fi
 
 if test "$wxUSE_WAVE" = "yes"; then

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

 #define wxUSE_WAVE 1
 EOF
 
 fi
 
 if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
 #define wxUSE_WAVE 1
 EOF
 
 fi
 
 if test "$wxUSE_CMDLINE_PARSER" = "yes"; then

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

 #define wxUSE_CMDLINE_PARSER 1
 EOF
 
 fi
 
 if test "$wxUSE_STOPWATCH" = "yes"; then
 #define wxUSE_CMDLINE_PARSER 1
 EOF
 
 fi
 
 if test "$wxUSE_STOPWATCH" = "yes"; then

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

 #define wxUSE_STOPWATCH 1
 EOF
 
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then
 #define wxUSE_STOPWATCH 1
 EOF
 
 fi
 
 if test "$wxUSE_DATETIME" = "yes"; then

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

 #define wxUSE_DATETIME 1
 EOF
 
 fi
 
 #define wxUSE_DATETIME 1
 EOF
 
 fi
 

-if test "$wxUSE_TIMEDATE" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
-
-fi
-

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

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

 #define wxUSE_FILE 1
 EOF
 
 fi
 
 if test "$wxUSE_FFILE" = "yes"; then
 #define wxUSE_FILE 1
 EOF
 
 fi
 
 if test "$wxUSE_FFILE" = "yes"; then

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

 #define wxUSE_FFILE 1
 EOF
 
 fi
 
 if test "$wxUSE_FILESYSTEM" = "yes"; then
 #define wxUSE_FFILE 1
 EOF
 
 fi
 
 if test "$wxUSE_FILESYSTEM" = "yes"; then

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

 #define wxUSE_FILESYSTEM 1
 EOF
 
 fi
 
 if test "$wxUSE_FS_INET" = "yes"; then
 #define wxUSE_FILESYSTEM 1
 EOF
 
 fi
 
 if test "$wxUSE_FS_INET" = "yes"; then

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

 #define wxUSE_FS_INET 1
 EOF
 
 fi
 
 if test "$wxUSE_FS_ZIP" = "yes"; then
 #define wxUSE_FS_INET 1
 EOF
 
 fi
 
 if test "$wxUSE_FS_ZIP" = "yes"; then

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

 #define wxUSE_FS_ZIP 1
 EOF
 
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
 #define wxUSE_FS_ZIP 1
 EOF
 
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then

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

 #define wxUSE_ZIPSTREAM 1
 EOF
 
 fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
 #define wxUSE_ZIPSTREAM 1
 EOF
 
 fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then

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

 #define wxUSE_ON_FATAL_EXCEPTION 1
 EOF
 
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
 #define wxUSE_ON_FATAL_EXCEPTION 1
 EOF
 
 fi
 
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then

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

 #define wxUSE_SNGLINST_CHECKER 1
 EOF
 
 fi
 
 if test "$wxUSE_BUSYINFO" = "yes"; then
 #define wxUSE_SNGLINST_CHECKER 1
 EOF
 
 fi
 
 if test "$wxUSE_BUSYINFO" = "yes"; then

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

 #define wxUSE_BUSYINFO 1
 EOF
 
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then
 #define wxUSE_BUSYINFO 1
 EOF
 
 fi
 
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then

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

 #define wxUSE_STD_IOSTREAM 1
 EOF
 
 fi
 
 if test "$wxUSE_TEXTBUFFER" = "yes"; then
 #define wxUSE_STD_IOSTREAM 1
 EOF
 
 fi
 
 if test "$wxUSE_TEXTBUFFER" = "yes"; then

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

 #define wxUSE_TEXTBUFFER 1
 EOF
 
 #define wxUSE_TEXTBUFFER 1
 EOF
 


@@ -23247,10 +19988,9 @@ fi
 
 if test "$wxUSE_TEXTFILE" = "yes"; then
   if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
 
 if test "$wxUSE_TEXTFILE" = "yes"; then
   if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then

-    { echo "$as_me:23250: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5
-echo "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;}
+    echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer... disabled" 1>&2

   else
   else

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

 #define wxUSE_TEXTFILE 1
 EOF
 
 #define wxUSE_TEXTFILE 1
 EOF
 


@@ -23259,10 +19999,9 @@ fi
 
 if test "$wxUSE_CONFIG" = "yes" ; then
   if test "$wxUSE_TEXTFILE" != "yes"; then
 
 if test "$wxUSE_CONFIG" = "yes" ; then
   if test "$wxUSE_TEXTFILE" != "yes"; then

-    { echo "$as_me:23262: WARNING: wxConfig requires wxTextFile... disabled" >&5
-echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;}
+    echo "configure: warning: wxConfig requires wxTextFile... disabled" 1>&2

   else
   else

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

 #define wxUSE_CONFIG 1
 EOF
 
 #define wxUSE_CONFIG 1
 EOF
 


@@ -23272,10 +20011,9 @@ fi
 
 if test "$wxUSE_INTL" = "yes" ; then
   if test "$wxUSE_FILE" != "yes"; then
 
 if test "$wxUSE_INTL" = "yes" ; then
   if test "$wxUSE_FILE" != "yes"; then

-    { echo "$as_me:23275: WARNING: I18n code requires wxFile... disabled" >&5
-echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}
+    echo "configure: warning: I18n code requires wxFile... disabled" 1>&2

   else
   else

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

 #define wxUSE_INTL 1
 EOF
 
 #define wxUSE_INTL 1
 EOF
 


@@ -23285,26 +20023,27 @@ EOF
 fi
 
 if test "$wxUSE_LOG" = "yes"; then
 fi
 
 if test "$wxUSE_LOG" = "yes"; then

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

 #define wxUSE_LOG 1
 EOF
 
 #define wxUSE_LOG 1
 EOF
 

+

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

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

 #define wxUSE_LOGGUI 1
 EOF
 
     fi
 
     if test "$wxUSE_LOGWINDOW" = "yes"; then
 #define wxUSE_LOGGUI 1
 EOF
 
     fi
 
     if test "$wxUSE_LOGWINDOW" = "yes"; then

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

 #define wxUSE_LOGWINDOW 1
 EOF
 
     fi
 
     if test "$wxUSE_LOGDIALOG" = "yes"; then
 #define wxUSE_LOGWINDOW 1
 EOF
 
     fi
 
     if test "$wxUSE_LOGDIALOG" = "yes"; then

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

 #define wxUSE_LOG_DIALOG 1
 EOF
 
 #define wxUSE_LOG_DIALOG 1
 EOF
 


@@ -23312,21 +20051,21 @@ EOF
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then

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

 #define wxUSE_LONGLONG 1
 EOF
 
 fi
 
 if test "$wxUSE_GEOMETRY" = "yes"; then
 #define wxUSE_LONGLONG 1
 EOF
 
 fi
 
 if test "$wxUSE_GEOMETRY" = "yes"; then

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

 #define wxUSE_GEOMETRY 1
 EOF
 
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
 #define wxUSE_GEOMETRY 1
 EOF
 
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then

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

 #define wxUSE_DIALUP_MANAGER 1
 EOF
 
 #define wxUSE_DIALUP_MANAGER 1
 EOF
 


@@ -23334,673 +20073,526 @@ EOF
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then

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

 #define wxUSE_STREAMS 1
 EOF
 
 fi
 
 #define wxUSE_STREAMS 1
 EOF
 
 fi
 

-if test "$wxUSE_DATETIME" = "yes"; then

 
 

-for ac_func in strptime
+if test "$wxUSE_DATETIME" = "yes"; then
+        for ac_func in strptime

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23348: 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 23354 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:20088: 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 20093 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23385: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:23388: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23391: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23394: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:23404: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:20116: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-            echo "$as_me:23414: 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

 
 

-                        cat >conftest.$ac_ext <<_ACEOF
-#line 23421 "configure"
+            echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
+echo "configure:20142: 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
+else
+  
+                        cat > conftest.$ac_ext <<EOF
+#line 20148 "configure"

 #include "confdefs.h"
 
                                 #include <time.h>
 #include "confdefs.h"
 
                                 #include <time.h>

-
-int
-main ()
-{
+                            
+int main() {

 
                                 int tz;
                                 tz = timezone;
 
                                 int tz;
                                 tz = timezone;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23438: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:23441: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23444: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23447: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                            
+; return 0; }
+EOF
+if { (eval echo configure:20160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                                 wx_cv_var_timezone=timezone
                                 wx_cv_var_timezone=timezone

-
+                            

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                                cat >conftest.$ac_ext <<_ACEOF
-#line 23457 "configure"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                                cat > conftest.$ac_ext <<EOF
+#line 20171 "configure"

 #include "confdefs.h"
 
                                         #include <time.h>
 #include "confdefs.h"
 
                                         #include <time.h>

-
-int
-main ()
-{
+                                    
+int main() {

 
                                         int tz;
                                         tz = _timezone;
 
                                         int tz;
                                         tz = _timezone;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23474: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:23477: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23480: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23483: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                                    
+; return 0; }
+EOF
+if { (eval echo configure:20183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                                         wx_cv_var_timezone=_timezone
                                         wx_cv_var_timezone=_timezone

-
+                                    

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                                        cat >conftest.$ac_ext <<_ACEOF
-#line 23493 "configure"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                                        cat > conftest.$ac_ext <<EOF
+#line 20194 "configure"

 #include "confdefs.h"
 
                                                 #include <time.h>
 #include "confdefs.h"
 
                                                 #include <time.h>

-
-int
-main ()
-{
+                                            
+int main() {

 
                                                 int tz;
                                                 tz = __timezone;
 
                                                 int tz;
                                                 tz = __timezone;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23510: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:23513: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23516: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23519: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                                            
+; return 0; }
+EOF
+if { (eval echo configure:20206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                                                 wx_cv_var_timezone=__timezone
                                                 wx_cv_var_timezone=__timezone

-
+                                            

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  

                                                 if test "$USE_DOS" = 0 ; then
                                                 if test "$USE_DOS" = 0 ; then

-                                                    { echo "$as_me:23529: WARNING: no timezone variable" >&5
-echo "$as_me: WARNING: no timezone variable" >&2;}
+                                                    echo "configure: warning: no timezone variable" 1>&2

                                                 fi
                                                 fi

-
+                                            
+                                        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+                                    
+                                

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+                            
+                        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+                   
+    

 fi
 fi

-echo "$as_me:23543: result: $wx_cv_var_timezone" >&5
-echo "${ECHO_T}$wx_cv_var_timezone" >&6
+
+echo "$ac_t""$wx_cv_var_timezone" 1>&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 <<EOF

 #define WX_TIMEZONE $wx_cv_var_timezone
 EOF
 
     fi
 
 #define WX_TIMEZONE $wx_cv_var_timezone
 EOF
 
     fi
 

-for ac_func in localtime
+        for ac_func in localtime

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23556: 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 23562 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:20247: 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 20252 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23593: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:23596: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23599: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23602: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:23612: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }

 EOF
 EOF

+if { (eval echo configure:20275: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-    if test "$ac_cv_func_localtime" = "yes"; then
-        echo "$as_me:23623: 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

 
 

-            cat >conftest.$ac_ext <<_ACEOF
-#line 23630 "configure"
+    if test "$ac_cv_func_localtime" = "yes"; then
+        echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
+echo "configure:20302: 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
+else
+  
+            cat > conftest.$ac_ext <<EOF
+#line 20308 "configure"

 #include "confdefs.h"
 
                     #include <time.h>
 #include "confdefs.h"
 
                     #include <time.h>

-
-int
-main ()
-{
+                
+int main() {

 
                     struct tm tm;
                     tm.tm_gmtoff++;
 
                     struct tm tm;
                     tm.tm_gmtoff++;

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23647: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:23650: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23653: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23656: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
+                
+; return 0; }
+EOF
+if { (eval echo configure:20320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  

                     wx_cv_struct_tm_has_gmtoff=yes
                     wx_cv_struct_tm_has_gmtoff=yes

-
+                

 else
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_struct_tm_has_gmtoff=no
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_struct_tm_has_gmtoff=no
+            

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+        

 fi
 fi

-echo "$as_me:23670: result: $wx_cv_struct_tm_has_gmtoff" >&5
-echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6
+
+echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&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 <<\EOF

 #define WX_GMTOFF_IN_TM 1
 EOF
 
     fi
 
 #define WX_GMTOFF_IN_TM 1
 EOF
 
     fi
 

-for ac_func in gettimeofday ftime
+            for ac_func in gettimeofday ftime

 do
 do

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23684: 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 23690 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:20349: 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 20354 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23721: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:23724: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23727: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23730: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:23740: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+; return 0; }
+EOF
+if { (eval echo configure:20377: \"$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
  break
 EOF
  break

+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
 fi
 done
 

-    if test "$ac_cv_func_gettimeofday" = "yes"; then
-        echo "$as_me:23751: 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
+    if test "$ac_cv_func_gettimeofday" = "yes"; then
+        echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
+echo "configure:20404: 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.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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 <<_ACEOF
-#line 23764 "configure"
+
+            cat > conftest.$ac_ext <<EOF
+#line 20419 "configure"

 #include "confdefs.h"
 
                     #include <sys/time.h>
                     #include <unistd.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23782: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:23785: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23788: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23791: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+                
+; return 0; }
+EOF
+if { (eval echo configure:20432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_func_gettimeofday_has_2_args=yes
 else
   wx_cv_func_gettimeofday_has_2_args=yes
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 23798 "configure"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 20440 "configure"

 #include "confdefs.h"
 
                         #include <sys/time.h>
                         #include <unistd.h>
 #include "confdefs.h"
 
                         #include <sys/time.h>
                         #include <unistd.h>

-
-int
-main ()
-{
+                    
+int main() {

 
                         struct timeval tv;
                         gettimeofday(&tv);
 
                         struct timeval tv;
                         gettimeofday(&tv);

-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23816: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:23819: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23822: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23825: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+                    
+; return 0; }
+EOF
+if { (eval echo configure:20453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_func_gettimeofday_has_2_args=no
 else
   wx_cv_func_gettimeofday_has_2_args=no
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-
-                        { echo "$as_me:23832: WARNING: failed to determine number of gettimeofday() arguments" >&5
-echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
+  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

                         wx_cv_func_gettimeofday_has_2_args=unknown
                         wx_cv_func_gettimeofday_has_2_args=unknown

-
+                    
+                

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+            

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

             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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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

-echo "$as_me:23848: result: $wx_cv_func_gettimeofday_has_2_args" >&5
-echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6
+
+echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&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 <<\EOF

 #define WX_GETTIMEOFDAY_NO_TZ 1
 EOF
 
         fi
     fi
 
 #define WX_GETTIMEOFDAY_NO_TZ 1
 EOF
 
         fi
     fi
 

-    cat >>confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
-

     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 

-if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$wxUSE_X11" = "1"; then
-        { echo "$as_me:23868: WARNING: wxSocket not yet supported under X11... disabled" >&5
-echo "$as_me: WARNING: wxSocket not yet supported under X11... disabled" >&2;}
-        wxUSE_SOCKETS="no"
-    fi

 
 

+if test "$wxUSE_SOCKETS" = "yes"; then

     if test "$wxUSE_MGL" = "1"; then
     if test "$wxUSE_MGL" = "1"; then

-        { echo "$as_me:23874: WARNING: wxSocket not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
+        echo "configure: warning: wxSocket not yet supported under MGL... disabled" 1>&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 "$as_me:23882: 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
+                echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:20504: checking for socket" >&5
+if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6

 else
 else

-  cat >conftest.$ac_ext <<_ACEOF
-#line 23888 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 20509 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char socket (); below.  */
+    which can conflict with char socket(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* We use char because int might match the return type of a gcc2

-   builtin and then its argument prototype would still apply.  */
-char socket ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char socket();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = socket;
+socket();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23919: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:23922: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23925: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23928: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:23938: result: $ac_cv_func_socket" >&5
-echo "${ECHO_T}$ac_cv_func_socket" >&6
-if test $ac_cv_func_socket = yes; then
+; return 0; }
+EOF
+if { (eval echo configure:20532: \"$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

   :
 else
   :
 else

-  echo "$as_me:23943: 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
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:20550: 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

 else
 else

-  ac_check_lib_save_LIBS=$LIBS
+  ac_save_LIBS="$LIBS"

 LIBS="-lsocket  $LIBS"
 LIBS="-lsocket  $LIBS"

-cat >conftest.$ac_ext <<_ACEOF
-#line 23951 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 20558 "configure"

 #include "confdefs.h"
 #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 socket ();
-int
-main ()
-{
-socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23970: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:23973: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23976: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:23979: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:23990: 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
+    builtin and then its argument prototype would still apply.  */
+char socket();
+
+int main() {
+socket()
+; return 0; }
+EOF
+if { (eval echo configure:20569: \"$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

   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 "$as_me:23998: WARNING: socket library not found - sockets will be disabled" >&5
-echo "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;}
+                    echo "configure: warning: socket library not found - sockets will be disabled" 1>&2

                     wxUSE_SOCKETS=no
                     wxUSE_SOCKETS=no

-
+                
+            

 fi
 
 fi
 

+        

 fi
 
     fi
 fi
 
     fi


@@ -24008,147 +20600,112 @@ fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then

-                echo "$as_me:24011: 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
-
-                ac_ext=cc
+                echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
+echo "configure:20605: 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
+else
+  
+                
+                ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.

 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_cpp='$CXXCPP $CPPFLAGS'

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_compile='${CXX-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 <<_ACEOF
-#line 24024 "configure"
+                cat > conftest.$ac_ext <<EOF
+#line 20620 "configure"

 #include "confdefs.h"
 
                         #include <sys/types.h>
                         #include <sys/socket.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24042: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:24045: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24048: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24051: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+                    
+; return 0; }
+EOF
+if { (eval echo configure:20633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_type_getsockname3=socklen_t
 else
   wx_cv_type_getsockname3=socklen_t
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 24058 "configure"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 20641 "configure"

 #include "confdefs.h"
 
                             #include <sys/types.h>
                             #include <sys/socket.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24076: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:24079: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24082: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24085: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+                        
+; return 0; }
+EOF
+if { (eval echo configure:20654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_type_getsockname3=size_t
 else
   wx_cv_type_getsockname3=size_t
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 24092 "configure"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 20662 "configure"

 #include "confdefs.h"
 
                                 #include <sys/types.h>
                                 #include <sys/socket.h>
 #include "confdefs.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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24110: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:24113: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24116: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24119: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+                            
+; return 0; }
+EOF
+if { (eval echo configure:20675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   wx_cv_type_getsockname3=int
 else
   wx_cv_type_getsockname3=int
 else

-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-wx_cv_type_getsockname3=unknown
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_type_getsockname3=unknown
+                        

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+                    

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
-
+rm -f conftest*
+                

 fi
 fi

-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*

 
                 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compile='${CC-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

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

 
         if test "$wx_cv_type_getsockname3" = "unknown"; then
             wxUSE_SOCKETS=no
 
         if test "$wx_cv_type_getsockname3" = "unknown"; then
             wxUSE_SOCKETS=no

-            { echo "$as_me:24148: 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;}
+            echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2

         else
         else

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

 #define SOCKLEN_T $wx_cv_type_getsockname3
 EOF
 
 #define SOCKLEN_T $wx_cv_type_getsockname3
 EOF
 


@@ -24157,92 +20714,80 @@ EOF
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then

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

 #define wxUSE_SOCKETS 1
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
 fi
 
 #define wxUSE_SOCKETS 1
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
 fi
 

+

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

-    if test "$TOOLKIT" = "MAC"; then
-        { echo "$as_me:24170: 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;}
+    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
         wxUSE_JOYSTICK=no
      fi
     if test "$TOOLKIT" = "MOTIF"; then

-        { echo "$as_me:24175: WARNING: Joystick not yet supported under Motif... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under Motif... disabled" >&2;}
+        echo "configure: warning: Joystick not yet supported under Motif... disabled" 1>&2

         wxUSE_JOYSTICK=no
      fi
     if test "$TOOLKIT" = "X11"; then
         wxUSE_JOYSTICK=no
      fi
     if test "$TOOLKIT" = "X11"; then

-        { echo "$as_me:24180: WARNING: Joystick not yet supported under X11... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under X11... disabled" >&2;}
+        echo "configure: warning: Joystick not yet supported under X11... disabled" 1>&2

         wxUSE_JOYSTICK=no
      fi
 
         if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_JOYSTICK" = "yes"; then
         wxUSE_JOYSTICK=no
      fi
 
         if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_JOYSTICK" = "yes"; then

-
-for ac_header in linux/joystick.h
+                        for ac_hdr in linux/joystick.h

 do
 do

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24191: 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 24197 "configure"
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:20747: 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 20752 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:24201: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:24207: \$? = $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
-  eval "$as_ac_Header=yes"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:20757: \"$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
 else

-  echo "$as_me: failed program was:" >&5
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5

   cat conftest.$ac_ext >&5
   cat conftest.$ac_ext >&5

-  eval "$as_ac_Header=no"
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
+rm -f conftest*

 fi
 fi

-echo "$as_me:24226: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+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
 EOF

-
+ 
+else
+  echo "$ac_t""no" 1>&6

 fi
 done
 
             if test "$ac_cv_header_linux_joystick_h" != "yes"; then
                 wxUSE_JOYSTICK=no
 fi
 done
 
             if test "$ac_cv_header_linux_joystick_h" != "yes"; then
                 wxUSE_JOYSTICK=no

-                { echo "$as_me:24238: WARNING: Joystick not supported by this system... disabled" >&5
-echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
+                echo "configure: warning: Joystick not supported by this system... disabled" 1>&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 <<\EOF

 #define wxUSE_JOYSTICK 1
 EOF
 
 #define wxUSE_JOYSTICK 1
 EOF
 


@@ -24250,6 +20795,7 @@ EOF
     fi
 fi
 
     fi
 fi
 

+

 if test "$TOOLKIT" != "MSW"; then
 
     HAVE_DL_FUNCS=0
 if test "$TOOLKIT" != "MSW"; then
 
     HAVE_DL_FUNCS=0


@@ -24258,1623 +20804,1847 @@ 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

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24265: 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 24271 "configure"
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:20811: 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 20816 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,

-    which can conflict with char $ac_func (); below.  */
+    which can conflict with char $ac_func(); below.  */

 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 #include <assert.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
 /* 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 ();
-char (*f) ();
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {

 
 

-int
-main ()
-{

 /* 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

-f = $ac_func;
+$ac_func();

 #endif
 
 #endif
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24302: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:24305: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24308: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24311: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:24321: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-                cat >>confdefs.h <<\EOF
+; return 0; }
+EOF
+if { (eval echo configure:20839: \"$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
+#define HAVE_DLOPEN 1
+EOF
+
+                HAVE_DL_FUNCS=1
+            
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:20867: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 20875 "configure"
+#include "confdefs.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 dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:20886: \"$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

 #define HAVE_DLOPEN 1
 EOF
 
 #define HAVE_DLOPEN 1
 EOF
 

-                HAVE_DL_FUNCS=1
+                                HAVE_DL_FUNCS=1
+                                DL_LINK=" -ldl$DL_LINK"
+                            
+else
+  echo "$ac_t""no" 1>&6
+
+                                for ac_func in shl_load
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:20915: 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 20920 "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();
+
+int main() {
+
+/* 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:20943: \"$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
+#define HAVE_SHL_LOAD 1
+EOF
+
+                                                HAVE_SHL_FUNCS=1
+                                              
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
+echo "configure:20971: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lshl_load  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 20979 "configure"
+#include "confdefs.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 dld();
+
+int main() {
+dld()
+; return 0; }
+EOF
+if { (eval echo configure:20990: \"$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
+  
+                                                                HAVE_SHL_FUNCS=1
+                                                                DL_LINK=" -ldld$DL_LINK"
+                                                             
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+                                              
+fi
+done
+
+                            
+fi
+
+            
+fi
+done
+
+
+                if test "$HAVE_DL_FUNCS" = 1; then
+            for ac_func in dlerror
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:21029: 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 21034 "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();
+
+int main() {
+
+/* 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:21057: \"$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
+#define HAVE_DLERROR 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
+echo "configure:21082: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 21090 "configure"
+#include "confdefs.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 dlerror();
+
+int main() {
+dlerror()
+; return 0; }
+EOF
+if { (eval echo configure:21101: \"$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
+#define HAVE_DLERROR 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+done
+
+        fi
+        fi
+
+        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
+                  wxUSE_DYNAMIC_LOADER=no
+                  wxUSE_DYNLIB_CLASS=no
+              else
+                  echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
+              fi
+            fi
+        fi
+    fi
+fi
+
+if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DYNAMIC_LOADER 1
+EOF
+
+elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DYNLIB_CLASS 1
+EOF
+
+fi
+
+
+if test "$wxUSE_FONTMAP" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FONTMAP 1
+EOF
+
+fi
+
+if test "$wxUSE_UNICODE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_UNICODE 1
+EOF
+
+
+  if test "$wxUSE_MSW" != 1; then
+      wxUSE_UNICODE_MSLU=no
+  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:21176: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lunicows  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 21184 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:21191: \"$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
+#define wxUSE_UNICODE_MSLU 1
+EOF
+
+            
+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
+                wxUSE_UNICODE_MSLU=no
+            
+fi
+
+    fi
+fi
+
+if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_EXPERIMENTAL_PRINTF 1
+EOF
+
+fi
+
+
+if test "$wxUSE_POSTSCRIPT" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_POSTSCRIPT 1
+EOF
+
+fi
+
+cat >> confdefs.h <<\EOF
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+EOF
+
+
+cat >> confdefs.h <<\EOF
+#define wxUSE_NORMALIZED_PS_FONTS 1
+EOF
+
+
+
+if test "$wxUSE_CONSTRAINTS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CONSTRAINTS 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
+fi
+
+if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+
+
+   if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+       cat >> confdefs.h <<\EOF
+#define wxUSE_MDI_ARCHITECTURE 1
+EOF
+
+       SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+   fi
+fi
+
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
+    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
+    fi
+fi
+
+if test "$wxUSE_HELP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_HELP 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+
+    if test "$wxUSE_MSW" = 1; then
+      if test "$wxUSE_MS_HTML_HELP" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_MS_HTML_HELP 1
+EOF
+
+      fi
+    fi
+
+    if test "$wxUSE_WXHTML_HELP" = "yes"; then
+      if test "$wxUSE_HTML" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_WXHTML_HELP 1
+EOF
+
+      else
+        echo "configure: warning: Cannot use wxHTML-based help without wxHTML so it won't be compiled" 1>&2
+        wxUSE_WXHTML_HELP=no
+      fi
+    fi
+fi
+
+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
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PRINTING_ARCHITECTURE 1
+EOF
+
+    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; }
+fi
+
+
+if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
+                          -o "$wxUSE_CLIPBOARD"     = "yes" \
+                          -o "$wxUSE_OLE"     = "yes" \
+                          -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
+    for ac_hdr in ole2.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:21335: 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 21340 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:21345: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+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:21384: checking if g++ requires -fvtable-thunks" >&5
+            cat > conftest.$ac_ext <<EOF
+#line 21386 "configure"
+#include "confdefs.h"
+#include <windows.h>
+                            #include <ole2.h>
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:21394: \"$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
+                            CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+fi
+rm -f 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
+
+            ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
+            LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
+            cat >> confdefs.h <<\EOF
+#define wxUSE_OLE 1
+EOF
+
+
+        fi
+
+                cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
+
+    else
+        echo "configure: warning: Some features disabled because OLE headers not found" 1>&2
+
+        wxUSE_CLIPBOARD=no
+        wxUSE_DRAG_AND_DROP=no
+        wxUSE_DATAOBJ=no
+        wxUSE_OLE=no
+    fi
+
+    if test "$wxUSE_METAFILE" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
+EOF
+
+
+                cat >> confdefs.h <<\EOF
+#define wxUSE_ENH_METAFILE 1
+EOF
+
+    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
+    fi
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IPC 1
+EOF
+
+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
+        wxUSE_CLIPBOARD=no
+    fi
+
+    if test "$wxUSE_CLIPBOARD" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_CLIPBOARD 1
+EOF
+
+
+                cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
+
+    fi
+fi
+
+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
+            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
+        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
+        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
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_DRAG_AND_DROP 1
+EOF
+
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
+    fi
+
+fi
+
+if test "$wxUSE_SPLINES" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_SPLINES 1
+EOF
+
+fi
+
+
+USES_CONTROLS=0
+if test "$wxUSE_CONTROLS" = "yes"; then
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_ACCEL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ACCEL 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CALCTRL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CALENDARCTRL 1
+EOF
+
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
+fi

 
 

-else
+if test "$wxUSE_CARET" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CARET 1
+EOF

 
 

-                echo "$as_me:24336: 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
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 24344 "configure"
-#include "confdefs.h"
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
+fi

 
 

-/* 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 dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24363: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:24366: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24369: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24372: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:24383: 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 <<\EOF
-#define HAVE_DLOPEN 1
+if test "$wxUSE_COMBOBOX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_COMBOBOX 1

 EOF
 
 EOF
 

-                                HAVE_DL_FUNCS=1
-                                DL_LINK=" -ldl$DL_LINK"
-
-else
+  USES_CONTROLS=1
+fi

 
 

-for ac_func in shl_load
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24399: 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 24405 "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.  */
-#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 ();
-char (*f) ();
+if test "$wxUSE_CHOICE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICE 1
+EOF

 
 

-int
-main ()
-{
-/* 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
-f = $ac_func;
-#endif
+  USES_CONTROLS=1
+fi

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24436: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:24439: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24442: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24445: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:24455: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-                                                cat >>confdefs.h <<\EOF
-#define HAVE_SHL_LOAD 1
+if test "$wxUSE_CHECKBOX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHECKBOX 1

 EOF
 
 EOF
 

-                                                HAVE_SHL_FUNCS=1
-
-else
+  USES_CONTROLS=1
+fi

 
 

-                                                echo "$as_me:24470: 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
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lshl_load  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 24478 "configure"
-#include "confdefs.h"
+if test "$wxUSE_CHECKLST" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHECKLISTBOX 1
+EOF

 
 

-/* 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 dld ();
-int
-main ()
-{
-dld ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24497: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:24500: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24503: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24506: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_shl_load_dld=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:24517: 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
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
+fi

 
 

-                                                                HAVE_SHL_FUNCS=1
-                                                                DL_LINK=" -ldld$DL_LINK"
+if test "$wxUSE_DISPLAY" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DISPLAY 1
+EOF

 
 

+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"

 fi
 
 fi
 

-fi
-done
+if test "$wxUSE_GAUGE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GAUGE 1
+EOF

 
 

+  USES_CONTROLS=1

 fi
 
 fi
 

-fi
-done
+if test "$wxUSE_GRID" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GRID 1
+EOF

 
 

-                if test "$HAVE_DL_FUNCS" = 1; then
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
+fi

 
 

-for ac_func in dlerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24539: 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 24545 "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.  */
-#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 ();
-char (*f) ();
+if test "$wxUSE_IMAGLIST" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IMAGLIST 1
+EOF

 
 

-int
-main ()
-{
-/* 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
-f = $ac_func;
-#endif
+fi

 
 

-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24576: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:24579: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24582: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24585: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:24595: 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 <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
- cat >>confdefs.h <<\EOF
-#define HAVE_DLERROR 1
+if test "$wxUSE_LISTBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_LISTBOX 1

 EOF
 
 EOF
 

-else
-  echo "$as_me:24606: 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
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 24614 "configure"
-#include "confdefs.h"
+    USES_CONTROLS=1
+fi

 
 

-/* 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 dlerror ();
-int
-main ()
-{
-dlerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24633: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:24636: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24639: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24642: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlerror=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:24653: 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 <<\EOF
-#define HAVE_DLERROR 1
+if test "$wxUSE_LISTCTRL" = "yes"; then
+    if test "$wxUSE_IMAGLIST" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_LISTCTRL 1

 EOF
 
 EOF
 

+        USES_CONTROLS=1
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
+    else
+        echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
+    fi

 fi
 
 fi
 

+if test "$wxUSE_NOTEBOOK" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NOTEBOOK 1
+EOF
+
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"

 fi
 fi

-done

 
 

-        fi
-        fi

 
 

-        if test "$HAVE_DL_FUNCS" = 0; then
-            if test "$HAVE_SHL_FUNCS" = 0; then
-              if test "$USE_UNIX" = 1; then
-                  { echo "$as_me:24671: 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
-                  { echo "$as_me:24676: 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
+if test "$wxUSE_RADIOBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RADIOBOX 1
+EOF
+
+    USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_DYNAMIC_LOADER 1
+if test "$wxUSE_RADIOBTN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RADIOBTN 1

 EOF
 
 EOF
 

-elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_DYNLIB_CLASS 1
+    USES_CONTROLS=1
+fi
+
+if test "$wxUSE_SASH" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SASH 1

 EOF
 
 EOF
 

+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"

 fi
 
 fi
 

-if test "$wxUSE_FONTMAP" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_FONTMAP 1
+if test "$wxUSE_SCROLLBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SCROLLBAR 1

 EOF
 
 EOF
 

+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"

 fi
 
 fi
 

-if test "$wxUSE_UNICODE" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_UNICODE 1
+if test "$wxUSE_SLIDER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SLIDER 1

 EOF
 
 EOF
 

-  if test "$wxUSE_MSW" != 1; then
-      wxUSE_UNICODE_MSLU=no
-  fi
+    USES_CONTROLS=1
+fi

 
 

-  if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
-        echo "$as_me:24713: 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
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lunicows  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 24721 "configure"
-#include "confdefs.h"
+if test "$wxUSE_SPINBTN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINBTN 1
+EOF

 
 

-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24733: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:24736: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24739: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:24742: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_unicows_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat 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:24753: 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 <<\EOF
-#define wxUSE_UNICODE_MSLU 1
+    USES_CONTROLS=1
+fi
+
+if test "$wxUSE_SPINCTRL" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINCTRL 1

 EOF
 
 EOF
 

-else
+    USES_CONTROLS=1
+fi

 
 

-                { echo "$as_me:24763: 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
+if test "$wxUSE_SPLITTER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPLITTER 1
+EOF

 
 

+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"

 fi
 
 fi
 

-    fi
+if test "$wxUSE_STATBMP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATBMP 1
+EOF
+
+    USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
+if test "$wxUSE_STATBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATBOX 1

 EOF
 
 EOF
 

+    USES_CONTROLS=1

 fi
 
 fi
 

-IODBC_C_SRC=""
-if test "$wxUSE_ODBC" = "yes" ; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_ODBC 1
+if test "$wxUSE_STATTEXT" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATTEXT 1

 EOF
 
 EOF
 

-    WXODBCFLAG="-D_IODBC_"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+    USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_POSTSCRIPT" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_POSTSCRIPT 1
+if test "$wxUSE_STATLINE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATLINE 1

 EOF
 
 EOF
 

+    USES_CONTROLS=1

 fi
 
 fi
 

-cat >>confdefs.h <<\EOF
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
+if test "$wxUSE_STATUSBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATUSBAR 1

 EOF
 
 EOF
 

-cat >>confdefs.h <<\EOF
-#define wxUSE_NORMALIZED_PS_FONTS 1
+    USES_CONTROLS=1
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
+fi
+
+if test "$wxUSE_TABDIALOG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TAB_DIALOG 1

 EOF
 
 EOF
 

-if test "$wxUSE_CONSTRAINTS" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_CONSTRAINTS 1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
+fi
+
+if test "$wxUSE_TEXTCTRL" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTCTRL 1

 EOF
 
 EOF
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"

 fi
 
 fi
 

-if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; 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
+        wxUSE_TOGGLEBTN=no
+    fi

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

-        { echo "$as_me:24816: WARNING: MDI not yet supported for wxUniversal... disabled" >&5
-echo "$as_me: WARNING: MDI not yet supported for wxUniversal... disabled" >&2;}
-        wxUSE_MDI_ARCHITECTURE=no
+        echo "configure: warning: Toggle button not yet supported under wxUniversal... disabled" 1>&2
+        wxUSE_TOGGLEBTN=no

     fi
 
     fi
 

-    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_MDI_ARCHITECTURE 1
+    if test "$wxUSE_TOGGLEBTN" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TOGGLEBTN 1

 EOF
 
 EOF
 

-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+        USES_CONTROLS=1

     fi
 fi
 
     fi
 fi
 

-if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_SIMPLE 1

 EOF
 
 EOF
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
-    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
-    fi
+    wxUSE_TOOLBAR="yes"
+    USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_HELP" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_HELP 1
+if test "$wxUSE_TOOLBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR 1

 EOF
 
 EOF
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
-
-    if test "$wxUSE_MSW" = 1; then
-      if test "$wxUSE_MS_HTML_HELP" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_MS_HTML_HELP 1
-EOF
+    USES_CONTROLS=1

 
 

-      fi
+        if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
+        wxUSE_TOOLBAR_NATIVE="yes"

     fi
 
     fi
 

-    if test "$wxUSE_WXHTML_HELP" = "yes"; then
-      if test "$wxUSE_HTML" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_WXHTML_HELP 1
+    if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_NATIVE 1

 EOF
 
 EOF
 

-      else
-        { echo "$as_me:24864: 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
+        USES_CONTROLS=1

     fi
     fi

+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"

 fi
 
 fi
 

-if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-        { echo "$as_me:24873: 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;}
+if test "$wxUSE_TOOLTIPS" = "yes"; then
+    if test "$wxUSE_MOTIF" = 1; then
+        echo "configure: warning: wxTooltip not supported yet under Motif... disabled" 1>&2

     else
     else

-        cat >>confdefs.h <<\EOF
-#define wxUSE_PRINTING_ARCHITECTURE 1
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+            echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2
+        else
+            cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLTIPS 1

 EOF
 
 EOF
 

+        fi

     fi
     fi

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"

 fi
 
 fi
 

-if test "$wxUSE_PROLOGIO" = "yes" ; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_PROLOGIO 1
+if test "$wxUSE_TREECTRL" = "yes"; then
+    if test "$wxUSE_IMAGLIST" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TREECTRL 1

 EOF
 
 EOF
 

+        USES_CONTROLS=1
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
+    else
+        echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
+    fi

 fi
 
 fi
 

-if test "$wxUSE_RESOURCES" = "yes" ; then
-    if test "$wxUSE_NANOX" = "yes"; then
-        { echo "$as_me:24893: WARNING: Cannot use resource database functions in NanoX" >&5
-echo "$as_me: WARNING: Cannot use resource database functions in NanoX" >&2;}
-       else
-               cat >>confdefs.h <<\EOF
-#define wxUSE_RESOURCES 1
+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
+    else
+        if test "$wxUSE_MOTIF" = 1; then
+            echo "configure: warning: wxPopupWindow not yet supported under Motif... disabled" 1>&2
+        else
+            if test "$wxUSE_PM" = 1; then
+                echo "configure: warning: wxPopupWindow not yet supported under PM... disabled" 1>&2
+            else
+                cat >> confdefs.h <<\EOF
+#define wxUSE_POPUPWIN 1

 EOF
 
 EOF
 

-               SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+
+                USES_CONTROLS=1
+            fi
+        fi

     fi
 fi
 
     fi
 fi
 

-if test "$wxUSE_X_RESOURCES" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_X_RESOURCES 1
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+    if test "$wxUSE_PM" = 1; then
+        echo "configure: warning: wxTipWindow not yet supported under PM... disabled" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TIPWINDOW 1

 EOF
 
 EOF
 

+    fi

 fi
 
 fi
 

-if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
-                          -o "$wxUSE_CLIPBOARD"     = "yes" \
-                          -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
+if test "$USES_CONTROLS" = 1; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CONTROLS 1
+EOF

 
 

-for ac_header in ole2.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:24918: 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 24924 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:24928: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:24934: \$? = $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
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  eval "$as_ac_Header=no"

 fi
 fi

-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:24953: 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 <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+
+
+
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DRAGIMAGE 1

 EOF
 
 EOF
 

+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"

 fi
 fi

-done

 
 

-    if test "$ac_cv_header_ole2_h" = "yes" ; then
-        if test "$GCC" = yes ; then
-            ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
-            CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
-            LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
-            cat >>confdefs.h <<\EOF
-#define wxUSE_OLE 1
+if test "$wxUSE_ACCESSIBILITY" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_ACCESSIBILITY 1

 EOF
 
 EOF
 

-        fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
+fi

 
 

-                cat >>confdefs.h <<\EOF
-#define wxUSE_DATAOBJ 1
+if test "$wxUSE_MENUS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MENUS 1

 EOF
 
 EOF
 

-    else
-        { echo "$as_me:24979: 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_DATAOBJ=no
-    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
+fi

 
 

-    if test "$wxUSE_METAFILE" = "yes"; then
-        cat >>confdefs.h <<\EOF
+if test "$wxUSE_METAFILE" = "yes"; then
+    cat >> confdefs.h <<\EOF

 #define wxUSE_METAFILE 1
 EOF
 
 #define wxUSE_METAFILE 1
 EOF
 

-                cat >>confdefs.h <<\EOF
-#define wxUSE_ENH_METAFILE 1
+fi
+
+if test "$wxUSE_MIMETYPE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MIMETYPE 1

 EOF
 
 EOF
 

-    fi

 fi
 
 fi
 

-if test "$wxUSE_IPC" = "yes"; then
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SYSTEM_OPTIONS 1
+EOF
+
+if test "$TOOLKIT" = "MSW"; then
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
+fi
+
+fi
+
+if test "$wxUSE_PROTOCOL" = "yes"; then

     if test "$wxUSE_SOCKETS" != "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then

-        { echo "$as_me:25001: WARNING: wxWindows IPC classes require sockets... disabled" >&5
-echo "$as_me: WARNING: wxWindows IPC classes require sockets... disabled" >&2;}
+        echo "configure: warning: Protocol classes require sockets... disabled" 1>&2
+        wxUSE_PROTOCOL=no

     fi
 
     fi
 

-    cat >>confdefs.h <<\EOF
-#define wxUSE_IPC 1
+    if test "$wxUSE_PROTOCOL" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL 1

 EOF
 
 EOF
 

-fi

 
 

-if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:25013: 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_PROTOCOL_HTTP" = "yes"; then
+            cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL_HTTP 1
+EOF

 
 

-    if test "$wxUSE_CLIPBOARD" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_CLIPBOARD 1
+        fi
+        if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+            cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL_FTP 1

 EOF
 
 EOF
 

-                cat >>confdefs.h <<\EOF
-#define wxUSE_DATAOBJ 1
+        fi
+        if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+            cat >> confdefs.h <<\EOF
+#define wxUSE_PROTOCOL_FILE 1

 EOF
 
 EOF
 

+        fi

     fi
 fi
 
     fi
 fi
 

-if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_GTK" = 1; then
-        if test "$WXGTK12" != 1; then
-            { echo "$as_me:25033: 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
+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
     fi

+    if test "$wxUSE_URL" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_URL 1
+EOF

 
 

-    if test "$wxUSE_MOTIF" = 1; then
-        { echo "$as_me:25040: 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
     fi

+fi

 
 

-    if test "$wxUSE_X11" = 1; then
-        { echo "$as_me:25046: 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_MINIFRAME" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MINIFRAME 1
+EOF

 
 

-    if test "$wxUSE_MGL" = 1; then
-        { echo "$as_me:25052: 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
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
+fi

 
 

-    if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_DRAG_AND_DROP 1
+if test "$wxUSE_HTML" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_HTML 1

 EOF
 
 EOF
 

-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
-    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
+fi
+
+if test "$wxUSE_VALIDATORS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_VALIDATORS 1
+EOF

 
 

+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"

 fi
 
 fi
 

-if test "$wxUSE_SPLINES" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_SPLINES 1
+if test "$wxUSE_PALETTE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PALETTE 1

 EOF
 
 fi
 
 EOF
 
 fi
 

-USES_CONTROLS=0
-if test "$wxUSE_CONTROLS" = "yes"; then
-  USES_CONTROLS=1
+if test "$wxUSE_IMAGE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_IMAGE 1
+EOF
+

 fi
 
 fi
 

-if test "$wxUSE_ACCEL" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_ACCEL 1
+if test "$wxUSE_GIF" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GIF 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_BUTTON" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_BUTTON 1
+if test "$wxUSE_PCX" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PCX 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_BMPBUTTON" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_BMPBUTTON 1
+if test "$wxUSE_IFF" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_IFF 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_CALCTRL" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_CALENDARCTRL 1
+if test "$wxUSE_PNM" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PNM 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"

 fi
 
 fi
 

-if test "$wxUSE_CARET" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_CARET 1
+if test "$wxUSE_XPM" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_XPM 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"

 fi
 
 fi
 

-if test "$wxUSE_COMBOBOX" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_COMBOBOX 1
+if test "$wxUSE_ICO_CUR" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ICO_CUR 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_CHOICE" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_CHOICE 1
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
+    LIBS=" -lunicows $LIBS"
+fi
+
+
+if test "$wxUSE_CHOICEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICEDLG 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_CHECKBOX" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_CHECKBOX 1
+if test "$wxUSE_COLOURDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_COLOURDLG 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_CHECKLST" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_CHECKLISTBOX 1
+if test "$wxUSE_FILEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FILEDLG 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"

 fi
 
 fi
 

-if test "$wxUSE_GAUGE" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_GAUGE 1
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FINDREPLDLG 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_NEW_GRID" = "yes"; then
-  wxUSE_GRID="yes"
-  cat >>confdefs.h <<\EOF
-#define wxUSE_NEW_GRID 1
+if test "$wxUSE_FONTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FONTDLG 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"

 fi
 
 fi
 

-if test "$wxUSE_GRID" = "yes"; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_GRID 1
+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
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_DIRDLG 1

 EOF
 
 EOF
 

-  USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
+    fi

 fi
 
 fi
 

-if test "$wxUSE_IMAGLIST" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_IMAGLIST 1
+if test "$wxUSE_MSGDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MSGDLG 1

 EOF
 
 fi
 
 EOF
 
 fi
 

-if test "$wxUSE_LISTBOX" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_LISTBOX 1
+if test "$wxUSE_NUMBERDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NUMBERDLG 1

 EOF
 
 EOF
 

-    USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_LISTCTRL" = "yes"; then
-    if test "$wxUSE_IMAGLIST" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_LISTCTRL 1
+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
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PROGRESSDLG 1

 EOF
 
 EOF
 

-        USES_CONTROLS=1
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
-    else
-        { echo "$as_me:25205: 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
 
     fi
 fi
 

-if test "$wxUSE_NOTEBOOK" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_NOTEBOOK 1
+if test "$wxUSE_SPLASH" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPLASH 1

 EOF
 
 EOF
 

-    USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"

 fi
 
 fi
 

-if test "$wxUSE_PROPSHEET" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_PROPSHEET 1
+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
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_STARTUP_TIPS 1

 EOF
 
 EOF
 

-    USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
+    fi

 fi
 
 fi
 

-if test "$wxUSE_RADIOBOX" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_RADIOBOX 1
+if test "$wxUSE_TEXTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTDLG 1

 EOF
 
 EOF
 

-    USES_CONTROLS=1

 fi
 
 fi
 

-if test "$wxUSE_RADIOBTN" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_RADIOBTN 1
+if test "$wxUSE_WIZARDDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WIZARDDLG 1

 EOF
 
 EOF
 

-    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"

 fi
 
 fi
 

-if test "$wxUSE_SASH" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SASH 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
+if test "$cross_compiling" = "yes"; then
+        OSINFO="\"$host\""
+else
+        OSINFO=`uname -s -r -m`
+    OSINFO="\"$OSINFO\""

 fi
 
 fi
 

-if test "$wxUSE_SCROLLBAR" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SCROLLBAR 1
+cat >> confdefs.h <<EOF
+#define WXWIN_OS_DESCRIPTION $OSINFO

 EOF
 
 EOF
 

-    USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
-fi

 
 

-if test "$wxUSE_SLIDER" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SLIDER 1
-EOF

 
 

-    USES_CONTROLS=1
+if test "x$prefix" != "xNONE"; then
+    wxPREFIX=$prefix
+else
+    wxPREFIX=$ac_default_prefix

 fi
 
 fi
 

-if test "$wxUSE_SPINBTN" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SPINBTN 1
+cat >> confdefs.h <<EOF
+#define wxINSTALL_PREFIX "$wxPREFIX"

 EOF
 
 EOF
 

-    USES_CONTROLS=1
-fi

 
 

-if test "$wxUSE_SPINCTRL" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SPINCTRL 1
-EOF
+top_builddir=`pwd`

 
 

-    USES_CONTROLS=1
-fi

 
 

-if test "$wxUSE_SPLITTER" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SPLITTER 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
+
+if test "$wxUSE_MAC" = 1 ; then
+    LDFLAGS="$LDFLAGS -framework Carbon -framework System"
+fi
+if test "$wxUSE_COCOA" = 1 ; then
+    LDFLAGS="$LDFLAGS -framework Cocoa -framework System"

 fi
 
 fi
 

-if test "$wxUSE_STATBMP" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_STATBMP 1
-EOF

 
 

-    USES_CONTROLS=1
-fi
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"

 
 

-if test "$wxUSE_STATBOX" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_STATBOX 1
-EOF
+have_cos=0
+have_floor=0
+for ac_func in cos
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22233: 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 22238 "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();

 
 

-    USES_CONTROLS=1
-fi
+int main() {

 
 

-if test "$wxUSE_STATTEXT" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_STATTEXT 1
-EOF
+/* 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

 
 

-    USES_CONTROLS=1
+; return 0; }
+EOF
+if { (eval echo configure:22261: \"$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
 
 fi
 

-if test "$wxUSE_STATLINE" = "yes"; then
-    if test "$wxUSE_WINE" = 1 ; then
-        { echo "$as_me:25319: WARNING: wxStaticLine is not supported under WINE" >&5
-echo "$as_me: WARNING: wxStaticLine is not supported under WINE" >&2;}
-    else
-        cat >>confdefs.h <<\EOF
-#define wxUSE_STATLINE 1
+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
 EOF

+ have_cos=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+done

 
 

-        USES_CONTROLS=1
-    fi
+for ac_func in floor
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22288: 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 22293 "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();
+
+int main() {
+
+/* 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:22316: \"$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
 
 fi
 

-if test "$wxUSE_STATUSBAR" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_STATUSBAR 1
+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
 EOF

+ have_floor=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+done

 
 

-    USES_CONTROLS=1
+echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6
+echo "configure:22341: checking if floating point functions link without -lm" >&5
+if test "$have_cos" = 1 -a "$have_floor" = 1; then
+    echo "$ac_t""yes" 1>&6
+else
+    echo "$ac_t""no" 1>&6
+    LIBS="$LIBS -lm"
+    # use different functions to avoid configure caching
+    have_sin=0
+    have_ceil=0
+    for ac_func in sin
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22353: 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 22358 "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();

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
-fi
+int main() {

 
 

-if test "$wxUSE_TABDIALOG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_TAB_DIALOG 1
+/* 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
 EOF

+if { (eval echo configure:22381: \"$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

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
+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
+ have_sin=1
+else
+  echo "$ac_t""no" 1>&6

 fi
 fi

+done

 
 

-if test "$wxUSE_TEXTCTRL" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_TEXTCTRL 1
+    for ac_func in ceil
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22408: 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 22413 "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();
+
+int main() {
+
+/* 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
 EOF

+if { (eval echo configure:22436: \"$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

 
 

-    USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+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
+ have_ceil=1
+else
+  echo "$ac_t""no" 1>&6

 fi
 fi

+done

 
 

-if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
-        { echo "$as_me:25359: 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
-        { echo "$as_me:25364: 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
+    echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6
+echo "configure:22461: checking if floating point functions link with -lm" >&5
+    if test "$have_sin" = 1 -a "$have_ceil" = 1; then
+        echo "$ac_t""yes" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+        # not sure we should warn the user, crash, etc.

     fi
     fi

+fi

 
 

-    if test "$wxUSE_TOGGLEBTN" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_TOGGLEBTN 1
-EOF
+if test "$wxUSE_GUI" = "yes"; then
+
+    LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"

 
 

-        USES_CONTROLS=1
-    fi
+        
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
+                     drawing dynamic erase event exec font image \
+                     minimal propsize rotate shaped widgets"
+
+        CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
+else
+    SAMPLES_SUBDIRS="console"

 fi
 
 fi
 

-if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_TOOLBAR_SIMPLE 1
-EOF

 
 

-    wxUSE_TOOLBAR="yes"
-    USES_CONTROLS=1
+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"
+
+if test "$wxUSE_GTK" = 1; then
+    WXCONFIG_INCLUDE=
+else
+    WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"

 fi
 
 fi
 

-if test "$wxUSE_TOOLBAR" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_TOOLBAR 1
-EOF
+if test "$GXX" = yes ; then
+        CXXWARNINGS="-Wall"
+        
+            if test "$wxUSE_NO_DEPS" = "no" ; then
+        CFLAGS="-MMD $CFLAGS"
+        CXXFLAGS="-MMD $CXXFLAGS"
+    fi
+fi

 
 

-    USES_CONTROLS=1
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"

 
 

-        if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
-        wxUSE_TOOLBAR_NATIVE="yes"
-    fi
+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'`

 
 

-    if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_TOOLBAR_NATIVE 1
-EOF
+LDFLAGS="$LDFLAGS $PROFILE"
+
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"

 
 

-        USES_CONTROLS=1
-    fi

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
-fi

 
 

-if test "$wxUSE_TOOLTIPS" = "yes"; then
-    if test "$wxUSE_MOTIF" = 1; then
-        { echo "$as_me:25411: 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_WINE" = 1; then
-            { echo "$as_me:25415: WARNING: wxTooltip not supported under WINE... disabled" >&5
-echo "$as_me: WARNING: wxTooltip not supported under WINE... disabled" >&2;}
-        else
-            if test "$wxUSE_UNIVERSAL" = "yes"; then
-                { echo "$as_me:25419: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5
-echo "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;}
-            else
-                cat >>confdefs.h <<\EOF
-#define wxUSE_TOOLTIPS 1
-EOF

 
 

-            fi
-        fi
-    fi
-fi

 
 

-if test "$wxUSE_TREECTRL" = "yes"; then
-    if test "$wxUSE_IMAGLIST" = "yes"; then
-        cat >>confdefs.h <<\EOF
-#define wxUSE_TREECTRL 1
-EOF

 
 

-        USES_CONTROLS=1
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
-    else
-        { echo "$as_me:25440: 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; then
-        { echo "$as_me:25447: 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
-            { echo "$as_me:25451: 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
-                { echo "$as_me:25455: WARNING: wxPopupWindow not yet supported under PM... disabled" >&5
-echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" >&2;}
-            else
-                cat >>confdefs.h <<\EOF
-#define wxUSE_POPUPWIN 1
-EOF

 
 

-                USES_CONTROLS=1
-            fi
-        fi
-    fi
-fi

 
 

-if test "$wxUSE_TIPWINDOW" = "yes"; then
-    if test "$wxUSE_PM" = 1; then
-        { echo "$as_me:25470: WARNING: wxTipWindow not yet supported under PM... disabled" >&5
-echo "$as_me: WARNING: wxTipWindow not yet supported under PM... disabled" >&2;}
-    else
-        cat >>confdefs.h <<\EOF
-#define wxUSE_TIPWINDOW 1
-EOF

 
 

-    fi
-fi

 
 

-if test "$USES_CONTROLS" = 1; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_CONTROLS 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_TREELAYOUT" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_TREELAYOUT 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
-fi

 
 

-if test "$wxUSE_DRAGIMAGE" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_DRAGIMAGE 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
-fi

 
 

-if test "$wxUSE_MENUS" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_MENUS 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
-fi

 
 

-if test "$wxUSE_METAFILE" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_METAFILE 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_MIMETYPE" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_MIMETYPE 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SYSTEM_OPTIONS 1
-EOF

 
 

-if test "$TOOLKIT" = "MSW"; then
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-fi

 
 

-fi

 
 

-if test "$wxUSE_PROTOCOL" = "yes"; then
-    if test "$wxUSE_SOCKETS" != "yes"; then
-        { echo "$as_me:25538: WARNING: Protocol classes require sockets... disabled" >&5
-echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&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 "$as_me:25571: 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 <<\EOF
-#define wxUSE_URL 1
-EOF

 
 

-    fi
-fi

 
 

-if test "$wxUSE_MINIFRAME" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_MINIFRAME 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
-fi

 
 

-if test "$wxUSE_HTML" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_HTML 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
-fi

 
 

-if test "$wxUSE_VALIDATORS" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_VALIDATORS 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
-fi

 
 

-if test "$wxUSE_PALETTE" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_PALETTE 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_IMAGE" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_IMAGE 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_GIF" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_GIF 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_PCX" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_PCX 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_IFF" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_IFF 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_PNM" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_PNM 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_XPM" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_XPM 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_ICO_CUR" = "yes" ; then
-  cat >>confdefs.h <<\EOF
-#define wxUSE_ICO_CUR 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
-    LIBS=" -lunicows $LIBS"
-fi

 
 

-if test "$wxUSE_CHOICEDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_CHOICEDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_COLOURDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_COLOURDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_FILEDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_FILEDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_FINDREPLDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_FINDREPLDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_FONTDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_FONTDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_DIRDLG" = "yes"; then
-    if test "$wxUSE_TREECTRL" != "yes"; then
-        { echo "$as_me:25704: 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
-        cat >>confdefs.h <<\EOF
-#define wxUSE_DIRDLG 1
-EOF

 
 

-    fi
-fi

 
 

-if test "$wxUSE_MSGDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_MSGDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_NUMBERDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_NUMBERDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_PROGRESSDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       { echo "$as_me:25730: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5
-echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;}
-    else
-        cat >>confdefs.h <<\EOF
-#define wxUSE_PROGRESSDLG 1
-EOF

 
 

-    fi
-fi

 
 

-if test "$wxUSE_SPLASH" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_SPLASH 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_STARTUP_TIPS" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       { echo "$as_me:25749: WARNING: Startup tips requires constraints and won't be compiled without them" >&5
-echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;}
-    else
-        cat >>confdefs.h <<\EOF
-#define wxUSE_STARTUP_TIPS 1
-EOF

 
 

-    fi
-fi

 
 

-if test "$wxUSE_TEXTDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_TEXTDLG 1
-EOF

 
 

-fi

 
 

-if test "$wxUSE_WIZARDDLG" = "yes"; then
-    cat >>confdefs.h <<\EOF
-#define wxUSE_WIZARDDLG 1
-EOF

 
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
-fi

 
 

-if test "$cross_compiling" = "yes"; then
-        OSINFO="\"$host\""
-else
-        OSINFO=`uname -s -r -m`
-    OSINFO="\"$OSINFO\""
-fi

 
 

-cat >>confdefs.h <<EOF
-#define WXWIN_OS_DESCRIPTION $OSINFO
-EOF

 
 

-if test "x$prefix" != "xNONE"; then
-    wxPREFIX=$prefix
-else
-    wxPREFIX=$ac_default_prefix
-fi

 
 

-cat >>confdefs.h <<EOF
-#define wxINSTALL_PREFIX "$wxPREFIX"
-EOF

 
 

-if test "$wxUSE_MAC" = 1 ; then
-    LDFLAGS="$LDFLAGS -framework Carbon -framework System"
-fi

 
 

-LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -lm $LIBS"

 
 

-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 \
-                     minimal richedit rotate widgets"

 
 

-        CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
-else
-    SAMPLES_SUBDIRS="console"
-fi

 
 

-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"

 
 

-if test "$wxUSE_GTK" = 1; then
-    WXCONFIG_INCLUDE=
-else
-    WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
-fi

 
 

-if test "$GXX" = yes ; then
-        CXXWARNINGS="-Wall"

 
 

-            if test "$wxUSE_NO_DEPS" = "no" ; then
-        CFLAGS="-MMD $CFLAGS"
-        CXXFLAGS="-MMD $CXXFLAGS"
-    fi
-fi

 
 

-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"

 
 

-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'`"

 
 

-echo "$as_me:25844: 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
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:22617: 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
 else

-  cat >conftest.make <<\EOF
+  cat > conftestmake <<\EOF

 all:
        @echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 all:
        @echo 'ac_maketemp="${MAKE}"'
 EOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.

-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+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
 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
+rm -f conftestmake

 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 "$as_me:25864: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+  echo "$ac_t""yes" 1>&6

   SET_MAKE=
 else
   SET_MAKE=
 else

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

   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
   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
 
 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:setup.h.in"
+

 
 wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
 wx_cv_if_gnu_make=$IF_GNU_MAKE
 
 wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
 wx_cv_if_gnu_make=$IF_GNU_MAKE


@@ -25883,943 +22653,515 @@ 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_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 \
 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_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

 
 

-subdirs="$subdirs demos samples utils contrib"
+subdirs="demos samples utils contrib"

 
 

-ac_config_files="$ac_config_files wx-config src/make.env src/makeprog.env src/makelib.env Makefile"
-ac_config_commands="$ac_config_commands default"
-cat >confcache <<\_ACEOF
+
+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
 # 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.
+# 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.

 #
 #

-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
+# 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.

 #
 #

-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
+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.
 # 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 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 \
+      -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
   if test -w $cache_file; then

-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+    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
 

+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}'
 
 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).
+# 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
 if test "x$srcdir" = x.; then

-  ac_vpsub='/^[        ]*VPATH[        ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[   ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[     ]*$//;
-}'
+  ac_vpsub='/^[        ]*VPATH[        ]*=[^:]*$/d'

 fi
 
 fi
 

+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+

 DEFS=-DHAVE_CONFIG_H
 
 DEFS=-DHAVE_CONFIG_H
 

+# Without the "./", some shells look in PATH for config.status.

 : ${CONFIG_STATUS=./config.status}
 : ${CONFIG_STATUS=./config.status}

-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:25973: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
+
+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.
 # Generated automatically by configure.
 # 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
-SHELL=\${CONFIG_SHELL-$SHELL}
-ac_cs_invocation="\$0 \$@"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# Name of the executable.
-as_me=`echo "$0" |sed 's,.*[\\/],,'`
-
-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
-
-as_executable_p="test -f"
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-# NLS nuisances.
-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS="  $as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
-
-exec 6>&1
-
-_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 <<\EOF
-
-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
-  -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>."
-EOF
-
-cat >>$CONFIG_STATUS <<EOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.52,
-  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"
-EOF
-
-cat >>$CONFIG_STATUS <<\EOF
-# 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[^=]*=\(.*\)'`
-    shift
-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
-    shift
-    ;;
-  -*);;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_need_defaults=false;;
-  esac
-
-  case $1 in
-  # Handling of the options.
-EOF
-cat >>$CONFIG_STATUS <<EOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-EOF
-cat >>$CONFIG_STATUS <<\EOF
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:26149: 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 )
-    shift
-    CONFIG_FILES="$CONFIG_FILES $1"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
-    ac_need_defaults=false;;
-
-  # This is an error.
-  -*) { { echo "$as_me:26168: 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
-
-exec 5>>config.log
-cat >&5 << _ACEOF
-
-## ----------------------- ##
-## Running config.status.  ##
-## ----------------------- ##
-
-This file was extended by $as_me 2.52, executed with
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  > $ac_cs_invocation
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-
-_ACEOF
-EOF
-
-cat >>$CONFIG_STATUS <<EOF
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:

 #
 #

-# INIT-COMMANDS section.
+# $0 $ac_configure_args

 #
 #

+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.

 
 

-            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
-            LN_S="${LN_S}"
-
-EOF
-
-cat >>$CONFIG_STATUS <<\EOF
-for ac_config_target in $ac_config_targets
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option

 do
 do

-  case "$ac_config_target" in
-  # Handling of arguments.
-  "wx-config" ) CONFIG_FILES="$CONFIG_FILES wx-config" ;;
-  "src/make.env" ) CONFIG_FILES="$CONFIG_FILES src/make.env" ;;
-  "src/makeprog.env" ) CONFIG_FILES="$CONFIG_FILES src/makeprog.env" ;;
-  "src/makelib.env" ) CONFIG_FILES="$CONFIG_FILES src/makelib.env" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-  "setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS setup.h:setup.h.in" ;;
-  *) { { echo "$as_me:26220: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  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 ;;

   esac
 done
 
   esac
 done
 

-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# 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
-
-# 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
-}
-
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=$TMPDIR/cs$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-   { (exit 1); exit 1; }
-}
+ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"

 
 

+trap 'rm -fr `echo "
+            wx-config
+            version-script
+            src/make.env
+            src/makeprog.env
+            src/makelib.env
+            Makefile
+           setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15

 EOF
 EOF

+cat >> $CONFIG_STATUS <<EOF

 
 

-cat >>$CONFIG_STATUS <<EOF
-
-#
-# CONFIG_FILES section.
-#
+# 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%@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%@PIC_FLAG@%$PIC_FLAG%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%@EXTRADEFS@%$EXTRADEFS%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%@INSTALL_DIR@%$INSTALL_DIR%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@subdirs@%$subdirs%g

 
 

-# 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,@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,@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,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@DEFS@,$DEFS,;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,@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,@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,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
-s,@RESCOMP@,$RESCOMP,;t t
-s,@DEREZ@,$DEREZ,;t t
-s,@LIBICONV@,$LIBICONV,;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_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,@PIC_FLAG@,$PIC_FLAG,;t t
-s,@CODE_GEN_FLAGS@,$CODE_GEN_FLAGS,;t t
-s,@CODE_GEN_FLAGS_CXX@,$CODE_GEN_FLAGS_CXX,;t t
-s,@SONAME_FLAGS@,$SONAME_FLAGS,;t t
-s,@SONAME_FLAGS_GL@,$SONAME_FLAGS_GL,;t t
-s,@WX_TARGET_LIBRARY_SONAME@,$WX_TARGET_LIBRARY_SONAME,;t t
-s,@WX_TARGET_LIBRARY_TYPE@,$WX_TARGET_LIBRARY_TYPE,;t t
-s,@WXDEBUG_DEFINE@,$WXDEBUG_DEFINE,;t t
-s,@USE_GUI@,$USE_GUI,;t t
-s,@AFMINSTALL@,$AFMINSTALL,;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,@cross_compiling@,$cross_compiling,;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,@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_EXE@,$LDFLAGS_EXE,;t t
-s,@OPENGL_LIBS@,$OPENGL_LIBS,;t t
-s,@DMALLOC_LIBS@,$DMALLOC_LIBS,;t t
-s,@EXTRADEFS@,$EXTRADEFS,;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,@LIBWXMACRESCOMP@,$LIBWXMACRESCOMP,;t t
-s,@LIBWXMACRESWXCONFIG@,$LIBWXMACRESWXCONFIG,;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,@SET_MAKE@,$SET_MAKE,;t t
-s,@subdirs@,$subdirs,;t t

 CEOF
 CEOF

-

 EOF
 
 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_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
+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"

     else
     else

-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-       ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-       ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"

     fi
     fi

-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`

   fi
   fi

-fi # test -n "$CONFIG_FILES"
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF

 
 

+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"wx-config
+            version-script
+            src/make.env
+            src/makeprog.env
+            src/makelib.env
+            Makefile
+          "}

 EOF
 EOF

-cat >>$CONFIG_STATUS <<\EOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+  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" ;;

   esac
 
   esac
 

-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`$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 test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    { case "$ac_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-    ;;
-  esac
-done; }
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.

 
 

-    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
+  # 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.
     # A "../" for each directory in $ac_dir_suffix.

-    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`

   else
     ac_dir_suffix= ac_dots=
   fi
 
   else
     ac_dir_suffix= ac_dots=
   fi
 

-  case $srcdir in
-  .)  ac_srcdir=.
-      if test -z "$ac_dots"; then
-         ac_top_srcdir=.
-      else
-         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
-      fi ;;
-  [\\/]* | ?:[\\/]* )
-      ac_srcdir=$srcdir$ac_dir_suffix;
-      ac_top_srcdir=$srcdir ;;
+  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" ;;

   *) # Relative path.
   *) # Relative path.

-    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_dots$srcdir ;;
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;

   esac
 
   esac
 

-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_dots$INSTALL ;;
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;

   esac
 
   esac
 

-  if test x"$ac_file" != x-; then
-    { echo "$as_me:26538: 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 automatically by config.status.  */
-  configure_input="Generated automatically 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:26556: 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:26569: 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; }
-EOF
-cat >>$CONFIG_STATUS <<EOF
-  sed "$ac_vpsub
-$extrasub
-EOF
-cat >>$CONFIG_STATUS <<\EOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;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
-EOF
-cat >>$CONFIG_STATUS <<\EOF
+  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= ;;
+  esac

 
 

-#
-# CONFIG_HEADER section.
-#
+  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*

 
 # 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=' '
-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_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_uC=' '
 ac_uC=' '

-ac_uD=',;t'
+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'

 
 

-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+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

   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+  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" ;;

   esac
 
   esac
 

-  test x"$ac_file" != x- && { echo "$as_me:26630: 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:26641: 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:26654: 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
-
-EOF
-
-# 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 <<\EOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[   ]*#[    ]*define[       ][      ]*\(\([^        (][^    (]*\)([^)]*)\)[         ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
-t end
-s,^[   ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-EOF
-# 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
+  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

 
 # 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.undefs <<\EOF
-s,^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+cat >> conftest.vals <<\EOF
+s%^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%

 EOF
 
 EOF
 

-# 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 egrep "^[   ]*#[    ]*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 # egrep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.

 
 

-# 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 grep . conftest.undefs >/dev/null
+while :

 do
 do

-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[    ]*#[    ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+  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

   echo 'CEOF
   echo 'CEOF

-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
+  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

 done
 done

-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\EOF
-  # 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 automatically by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated automatically by configure.  */" >$tmp/config.h
+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

   else
   else

-    echo "/* $ac_file.  Generated automatically by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:26771: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`$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'`
+    # 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
       if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then

-        { case "$ac_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-    ;;
-  esac
-done; }
-
-      fi
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      # The file is in a subdirectory.
+      test ! -d "$ac_dir" && mkdir "$ac_dir"

     fi
     fi

-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
+    rm -f $ac_file
+    mv conftest.h $ac_file

   fi
   fi

-done
+fi; done
+

 EOF
 EOF

-cat >>$CONFIG_STATUS <<\EOF
+cat >> $CONFIG_STATUS <<EOF

 
 

-#
-# 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,[^:]*:,,'`
+            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
+            LN_S="${LN_S}"
+          
+         
+EOF
+cat >> $CONFIG_STATUS <<\EOF

 
 

-  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


@@ -26844,39 +23186,13 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
             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

-           ;;
-  esac
-done
-EOF
-
-cat >>$CONFIG_STATUS <<\EOF
-
-{ (exit 0); exit 0; }
+          
+exit 0

 EOF
 chmod +x $CONFIG_STATUS
 EOF
 chmod +x $CONFIG_STATUS

-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=:
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS || 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
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1

 
 

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


@@ -26887,15 +23203,12 @@ 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=*)
-      ;;
-    --config-cache | -C)
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)

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


@@ -26905,90 +23218,100 @@ if test "$no_recursion" != yes; then
     esac
   done
 
     esac
   done
 

-  for ac_subdir in : $subdirs; do test "x$ac_subdir" = x: && continue
+  for ac_config_dir in demos samples utils contrib; do

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

-    test -d $srcdir/$ac_subdir || continue
+    if test ! -d $srcdir/$ac_config_dir; then
+      continue
+    fi

 
 

-    { echo "$as_me:26914: configuring in $ac_subdir" >&5
-echo "$as_me: configuring in $ac_subdir" >&6;}
-    case $srcdir in
+    echo configuring in $ac_config_dir
+
+    case "$srcdir" in

     .) ;;
     .) ;;

-    *) { case "./$ac_subdir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="./$ac_subdir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;

     *)
     *)

-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-    ;;
-  esac
-done; }
-
-       if test -d ./$ac_subdir; then :;
-       else
-         { { echo "$as_me:26936: error: cannot create \`pwd\`/$ac_subdir" >&5
-echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;}
-   { (exit 1); exit 1; }; }
-       fi
-       ;;
+      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_popdir=`pwd`
     esac
 
     ac_popdir=`pwd`

-    cd $ac_subdir
+    cd $ac_config_dir

 
 

-    # A "../" for each directory in /$ac_subdir.
-    ac_dots=`echo $ac_subdir |
-             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+      # 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
+    case "$srcdir" in

     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;

-    [\\/]* | ?:[\\/]* ) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    /*) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_config_dir ;;

     *) # Relative path.
     *) # Relative path.

-      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;

     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.

-    if test -f $ac_sub_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"
-    elif test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_sub_srcdir/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
       ac_sub_configure=$ac_configure
     else
     elif test -f $ac_sub_srcdir/configure.in; then
       ac_sub_configure=$ac_configure
     else

-      { echo "$as_me:26967: WARNING: no configuration information is in $ac_subdir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
+      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&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_dots$cache_file" ;;

       esac
       esac

+  case "$ac_given_INSTALL" in
+        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+        esac

 
 

-      { echo "$as_me:26981: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;}
+      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"

       # The eval makes quoting arguments work.
       # The eval makes quoting arguments work.

-      eval $ac_sub_configure $ac_sub_configure_args \
-           --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
-        { { echo "$as_me:26986: error: $ac_sub_configure failed for $ac_subdir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;}
-   { (exit 1); exit 1; }; }
+      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

     fi
 
     cd $ac_popdir
   done
 fi
 
     fi
 
     cd $ac_popdir
   done
 fi
 

+
+echo
+echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
+echo ""
+echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"
+
+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 Unicode mode?           ${wxUSE_UNICODE:-no}"
+
+echo "  What level of wxWindows compatibility should be enabled?"
+echo "                                       wxWindows 2.0      ${WXWIN_COMPATIBILITY_2:-no}"
+echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
+echo "                                       wxWindows 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
+
+echo "  Which libraries should wxWindows use?"
+echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
+echo "                                       png                ${wxUSE_LIBPNG-none}"
+echo "                                       regex              ${wxUSE_REGEX}"
+echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
+echo "                                       zlib               ${wxUSE_ZLIB}"
+echo "                                       odbc               ${wxUSE_ODBC}"
+
+echo ""
+