X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf27ef009fe506728deaa6b747338ab88314ad61..470252df3c26d9c2d00cdbba46e43285720240ed:/configure

diff --git a/configure b/configure
index 242d29ed81..70947c6a6c 100755
--- a/configure
+++ b/configure
@@ -31,6 +31,13 @@
 
 
 
+
+
+
+
+
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
 
 
 
@@ -49,11 +56,15 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
---enable-gui            use GUI classes"
+  --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-wine             use WINE"
 ac_help="$ac_help
@@ -63,215 +74,307 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-pm               use OS/2 Presentation Manager"
 ac_help="$ac_help
-  --with-gtk-prefix=PFX   Prefix where GTK is installed"
+  --with-mgl              use SciTech MGL"
+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-freetype         use freetype (font rasterizer)"
+ac_help="$ac_help
+  --with-opengl           use OpenGL (or Mesa)"
+ac_help="$ac_help
+  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+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-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
-  --with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+  --enable-compat22       enable wxWindows 2.2 compatibility"
 ac_help="$ac_help
---with-libpng           use libpng (PNG image format)"
+  --enable-intl           use internationalization system"
 ac_help="$ac_help
---with-libjpeg          use libjpeg (JPEG file format)"
+  --enable-config         use wxConfig (and derived) classes"
 ac_help="$ac_help
---with-libtiff          use libtiff (TIFF file format)"
+  --enable-sockets        use socket/network classes"
 ac_help="$ac_help
---with-opengl           use OpenGL (or Mesa)"
+  --enable-ipc            use interprocess communication (wxSocket etc.)"
 ac_help="$ac_help
---with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+  --enable-cmdline        use wxCmdLineParser class"
 ac_help="$ac_help
---with-zlib             use zlib for LZW compression"
+  --enable-datetime       use wxDateTime class"
 ac_help="$ac_help
---with-odbc             use the IODBC and wxODBC classes"
+  --enable-timedate       use obsolete wxDate/wxTime classes"
 ac_help="$ac_help
---enable-shared         create shared library code"
+  --enable-stopwatch      use wxStopWatch class"
 ac_help="$ac_help
---enable-optimise       create optimised code"
+  --enable-dialupman      use dialup network classes"
 ac_help="$ac_help
---enable-debug          same as debug_flag and debug_info"
+  --enable-apple_ieee     use the Apple IEEE codec"
 ac_help="$ac_help
---enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
+  --enable-timer          use wxTimer class"
 ac_help="$ac_help
---enable-debug_info     create code with debugging information"
+  --enable-wave           use wxWave class"
 ac_help="$ac_help
---enable-debug_gdb      create code with extra GDB debugging information"
+  --enable-fraction       use wxFraction class"
 ac_help="$ac_help
---enable-debug_cntxt    use wxDebugContext"
+  --enable-dynlib         use wxLibrary class for DLL loading"
 ac_help="$ac_help
---enable-mem_tracing    create code with memory tracing"
+  --enable-longlong       use wxLongLong class"
 ac_help="$ac_help
---enable-profile        create code with profiling information"
+  --enable-geometry       use geometry class"
 ac_help="$ac_help
---enable-no_rtti        create code without RTTI information"
+  --enable-log            use logging system"
 ac_help="$ac_help
---enable-no_exceptions  create code without exceptions information"
+  --enable-streams        use wxStream etc classes"
 ac_help="$ac_help
---enable-permissive     compile code disregarding strict ANSI"
+  --enable-file           use wxFile classes"
 ac_help="$ac_help
---enable-no_deps        create code without dependency information"
+  --enable-ffile          use wxFFile classes"
 ac_help="$ac_help
---enable-intl           use internationalization system"
+  --enable-textfile       use wxTextFile classes"
 ac_help="$ac_help
---enable-config         use wxConfig (and derived) classes"
+  --enable-fontmap        use font encodings conversion classes"
 ac_help="$ac_help
---enable-sockets        use socket/network classes"
+  --enable-unicode        compile wxString with Unicode support"
 ac_help="$ac_help
---enable-dialupman      use dialup network classes"
+  --enable-wxprintfv      use wxWindows implementation of vprintf()"
 ac_help="$ac_help
---enable-ipc            use interprocess communication (wxSocket etc.)"
+  --enable-std_iostreams  use standard C++ stream classes"
 ac_help="$ac_help
---enable-apple_ieee     use the Apple IEEE codec"
+  --enable-filesystem     use virtual file systems classes"
 ac_help="$ac_help
---enable-timedate       use date/time classes"
+  --enable-fs_inet        use virtual HTTP/FTP filesystems"
 ac_help="$ac_help
---enable-wave           use wxWave class"
+  --enable-fs_zip         use virtual ZIP filesystems"
 ac_help="$ac_help
---enable-fraction       use wxFraction class"
+  --enable-zipstream      use wxZipInputStream"
 ac_help="$ac_help
---enable-dynlib         use wxLibrary class for DLL loading"
+  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"
 ac_help="$ac_help
---enable-longlong       use wxLongLong class"
+  --enable-snglinst       use wxSingleInstanceChecker class"
 ac_help="$ac_help
---enable-log            use logging system"
+  --enable-mimetypes      use wxMimeTypesManager"
 ac_help="$ac_help
---enable-streams        use wxStream etc classes"
+  --enable-sysoptions     use wxSystemOptions"
 ac_help="$ac_help
---enable-file           use wxFile classes"
+  --enable-threads        use threads"
 ac_help="$ac_help
---enable-textfile       use wxTextFile classes"
+  --enable-serial         use class serialization"
 ac_help="$ac_help
---enable-unicode        compile wxString with Unicode support"
+  --enable-docview        use document view architecture"
 ac_help="$ac_help
---enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
+  --enable-help           use help subsystem"
 ac_help="$ac_help
---enable-wxprintfv      use wxWindows implementation of vprintf()"
+  --enable-mshtmlhelp     use MS HTML Help (win32)"
 ac_help="$ac_help
---enable-joystick       compile in joystick support (Linux only)"
+  --enable-html           use wxHTML sub-library"
 ac_help="$ac_help
---enable-std_iostreams  use standard C++ stream classes"
+  --enable-htmlhelp       use wxHTML-based help"
 ac_help="$ac_help
---enable-fs_inet        use virtual HTTP/FTP filesystems"
+  --enable-constraints    use layout-constraints system"
 ac_help="$ac_help
---enable-fs_zip         use virtual ZIP filesystems"
+  --enable-printarch      use printing architecture"
 ac_help="$ac_help
---enable-zipstream      use wxZipInputStream"
+  --enable-mdi            use multiple document interface architecture"
 ac_help="$ac_help
---enable-threads        use threads"
+  --enable-loggui         use standard GUI logger"
 ac_help="$ac_help
---enable-serial         use class serialization"
+  --enable-logwin         use wxLogWindow"
 ac_help="$ac_help
---enable-docview        use document view architecture"
+  --enable-postscript     use wxPostscriptDC device context (default for gtk+)"
 ac_help="$ac_help
---enable-help           use help (using external browser at present)"
+  --enable-prologio       use Prolog IO library"
 ac_help="$ac_help
---enable-constraints    use layout-constraints system"
+  --enable-resources      use wxWindows resources"
 ac_help="$ac_help
---enable-printarch      use printing architecture"
+  --enable-xresources     use X resources for save (default for gtk+)"
 ac_help="$ac_help
---enable-mdi            use multiple document interface architecture"
+  --enable-clipboard      use wxClipboard classes"
 ac_help="$ac_help
---enable-postscript     use wxPostscriptDC device context (default for gtk+)"
+  --enable-dnd            use Drag'n'Drop classes"
 ac_help="$ac_help
---enable-prologio       use Prolog IO library"
+  --enable-metafile       use win32 metafiles"
 ac_help="$ac_help
---enable-resources      use wxWindows resources"
+  --enable-treelayout     use wxTreeLayout classes"
 ac_help="$ac_help
---enable-xresources     use X resources for save (default for gtk+)"
+  --enable-controls       use all usual controls"
 ac_help="$ac_help
---enable-clipboard      use wxClipboard classes"
+  --enable-accel          use accelerators"
 ac_help="$ac_help
---enable-dnd            use Drag'n'Drop classes"
+  --enable-button         use wxButton class"
 ac_help="$ac_help
---enable-wxtree         make wxTree library"
+  --enable-bmpbutton      use wxBitmapButton class"
 ac_help="$ac_help
---enable-controls       use all usual controls"
+  --enable-calendar       use wxCalendarCtrl class"
 ac_help="$ac_help
---enable-accel          use accelerators"
+  --enable-caret          use wxCaret class"
 ac_help="$ac_help
---enable-caret          use wxCaret class"
+  --enable-checkbox       use wxCheckBox class"
 ac_help="$ac_help
---enable-bmpbutton      use wxBitmapButton class"
+  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
 ac_help="$ac_help
---enable-checkbox       use wxCheckBox class"
+  --enable-choice         use wxChoice class"
 ac_help="$ac_help
---enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
+  --enable-combobox       use wxComboBox classes"
 ac_help="$ac_help
---enable-choice         use wxChoice class"
+  --enable-gauge          use wxGauge class"
 ac_help="$ac_help
---enable-combobox       use wxComboBox classes"
+  --enable-grid           use wxGrid class"
 ac_help="$ac_help
---enable-gauge          use wxGauge class"
+  --enable-newgrid        use new wxGrid class"
 ac_help="$ac_help
---enable-grid           use wxGrid class"
+  --enable-imaglist       use wxImageList class"
 ac_help="$ac_help
---enable-newgrid        use new wxGrid class"
+  --enable-listbox        use wxListBox class"
 ac_help="$ac_help
---enable-imaglist       use wxImageList class"
+  --enable-listctrl       use wxListCtrl class"
 ac_help="$ac_help
---enable-listbox        use wxListBox class"
+  --enable-notebook       use wxNotebook class"
 ac_help="$ac_help
---enable-listctrl       use wxListCtrl class"
+  --enable-propsheet      use wxPropertySheet class"
 ac_help="$ac_help
---enable-notebook       use wxNotebook class"
+  --enable-radiobox       use wxRadioBox class"
 ac_help="$ac_help
---enable-radiobox       use wxRadioBox class"
+  --enable-radiobtn       use wxRadioButton class"
 ac_help="$ac_help
---enable-radiobtn       use wxRadioButton class"
+  --enable-sash           use wxSashWindow class"
 ac_help="$ac_help
---enable-sash           use wxSashWindow class"
+  --enable-scrollbar      use wxScrollBar class and scrollable windows"
 ac_help="$ac_help
---enable-scrollbar      use wxScrollBar class and scrollable windows"
+  --enable-slider         use wxSlider class"
 ac_help="$ac_help
---enable-slider         use wxSlider class"
+  --enable-spinbtn        use wxSpinButton class"
 ac_help="$ac_help
---enable-spinbtn        use wxSpinButton class"
+  --enable-spinctrl       use wxSpinCtrl class"
 ac_help="$ac_help
---enable-spinctrl       use wxSpinCtrl class"
+  --enable-splitter       use wxSplitterWindow class"
 ac_help="$ac_help
---enable-splitter       use wxSplitterWindow class"
+  --enable-statbmp        use wxStaticBitmap class"
 ac_help="$ac_help
---enable-statbmp        use wxStaticBitmap class"
+  --enable-statbox        use wxStaticBox class"
 ac_help="$ac_help
---enable-statbox        use wxStaticBox class"
+  --enable-statline       use wxStaticLine class"
 ac_help="$ac_help
---enable-statline       use wxStaticLine class"
+  --enable-stattext       use wxStaticText class"
 ac_help="$ac_help
---enable-statusbar      use wxStatusBar class"
+  --enable-statusbar      use wxStatusBar class"
 ac_help="$ac_help
---enable-tabdialog      use wxTabControl class"
+  --enable-tabdialog      use wxTabControl class"
 ac_help="$ac_help
---enable-toolbar        use wxToolBar class"
+  --enable-textctrl       use wxTextCtrl class"
 ac_help="$ac_help
---enable-tbarnative     use native wxToolBar class"
+  --enable-togglebtn      use wxToggleButton class"
 ac_help="$ac_help
---enable-tbarsmpl       use wxToolBarSimple class"
+  --enable-toolbar        use wxToolBar class"
 ac_help="$ac_help
---enable-treectrl       use wxTreeCtrl class"
+  --enable-tbarnative     use native wxToolBar class"
 ac_help="$ac_help
---enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+  --enable-tbarsmpl       use wxToolBarSimple class"
 ac_help="$ac_help
---enable-dirdlg         use wxDirDialog"
+  --enable-treectrl       use wxTreeCtrl class"
 ac_help="$ac_help
---enable-textdlg        use wxTextDialog"
+  --enable-popupwin       use wxPopUpWindow class"
 ac_help="$ac_help
---enable-tipdlg         use startup tips"
+  --enable-commondlg      use all common dialogs"
 ac_help="$ac_help
---enable-progressdlg    use wxProgressDialog"
+  --enable-choicedlg      use wxChoiceDialog"
 ac_help="$ac_help
---enable-miniframe      use wxMiniFrame class"
+  --enable-coldlg         use wxColourDialog"
 ac_help="$ac_help
---enable-html           use wxHTML sub-library"
+  --enable-filedlg        use wxFileDialog"
 ac_help="$ac_help
---enable-tooltips       use wxToolTip class"
+  --enable-finddlg        use wxFindReplaceDialog"
 ac_help="$ac_help
---enable-splines        use spline drawing code"
+  --enable-fontdlg        use wxFontDialog"
 ac_help="$ac_help
---enable-validators     use wxValidator and derived classes"
+  --enable-dirdlg         use wxDirDialog"
 ac_help="$ac_help
---enable-busyinfo       use wxBusyInfo"
+  --enable-msgdlg         use wxMessageDialog"
 ac_help="$ac_help
---enable-gif            use gif images (GIF file format)"
+  --enable-numberdlg      use wxNumberEntryDialog"
 ac_help="$ac_help
---enable-pcx            use pcx images (PCX file format)"
+  --enable-splash         use wxSplashScreen"
 ac_help="$ac_help
---enable-pnm            use pnm images (PNM file format)"
+  --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-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-pnm            use pnm images (PNM file format)"
+ac_help="$ac_help
+  --enable-xpm            use xpm images (XPM file format)"
+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"
 
@@ -832,7 +935,7 @@ 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:836: checking host system type" >&5
+echo "configure:939: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -853,7 +956,7 @@ 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:857: checking target system type" >&5
+echo "configure:960: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -871,7 +974,7 @@ 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:875: checking build system type" >&5
+echo "configure:978: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -896,23 +999,22 @@ test "$host_alias" != "$target_alias" &&
 
 
 WX_MAJOR_VERSION_NUMBER=2
-WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=13
-
-WX_INTERFACE_AGE=0
-WX_BINARY_AGE=0
+WX_MINOR_VERSION_NUMBER=3
+WX_RELEASE_NUMBER=2
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
-
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
-WX_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE`
-WX_REVISION=$WX_INTERFACE_AGE
-WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE`
+
+WX_CURRENT=1
+WX_REVISION=0
+WX_AGE=0
+
 
 
 USE_UNIX=1
 USE_WIN32=0
 USE_BEOS=0
+USE_MAC=0
 
 USE_LINUX=
 USE_SGI=
@@ -926,7 +1028,10 @@ USE_SUNOS=
 USE_ALPHA=
 USE_OSF=
 USE_BSD=
+USE_DARWIN=
 USE_FREEBSD=
+USE_OPENBSD=
+USE_NETBSD=
 USE_VMS=
 USE_ULTRIX=
 USE_CYGWIN=
@@ -935,25 +1040,33 @@ USE_DATA_GENERAL=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM"
+ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"
 
 DEFAULT_wxUSE_GTK=0
+DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
-DEFAULT_wxUSE_WINE=0
 DEFAULT_wxUSE_PM=0
+DEFAULT_wxUSE_WINE=0
 
 DEFAULT_DEFAULT_wxUSE_GTK=0
+DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
-DEFAULT_DEFAULT_wxUSE_WINE=0
 DEFAULT_DEFAULT_wxUSE_PM=0
+DEFAULT_DEFAULT_wxUSE_WINE=0
+
+PROGRAM_EXT=
+SO_SUFFIX=so
 
 case "${host}" in
   *-hp-hpux* )
     USE_HPUX=1
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
+    SO_SUFFIX=sl
     cat >> confdefs.h <<\EOF
 #define __HPUX__ 1
 EOF
@@ -1025,7 +1138,7 @@ EOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
-  *-*-freebsd* | *-*-netbsd*)
+  *-*-freebsd*)
     USE_BSD=1
     USE_FREEBSD=1
     cat >> confdefs.h <<\EOF
@@ -1034,6 +1147,32 @@ EOF
 
     cat >> confdefs.h <<\EOF
 #define __BSD__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
+  *-*-openbsd*)
+    USE_BSD=1
+    USE_OPENBSD=1
+    cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __OPENBSD__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
+  *-*-netbsd*)
+    USE_BSD=1
+    USE_NETBSD=1
+    cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __NETBSD__ 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
@@ -1050,6 +1189,7 @@ EOF
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1
   ;;
   *-*-dgux5* )
     USE_ALPHA=1
@@ -1096,9 +1236,10 @@ EOF
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
-  *-*-cygwin32* | *-*-mingw32* )
+  *-*-cygwin* | *-*-mingw32* )
     USE_UNIX=0
     USE_WIN32=1
+    SO_SUFFIX=dll
     cat >> confdefs.h <<\EOF
 #define __WIN32__ 1
 EOF
@@ -1124,6 +1265,7 @@ EOF
 EOF
 
     PROGRAM_EXT=".exe"
+    RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
@@ -1136,6 +1278,25 @@ EOF
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
+  powerpc-*-darwin* )
+        USE_BSD=1
+    USE_DARWIN=1
+    SO_SUFFIX=dylib
+    cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __DARWIN__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __POWERPC__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MAC=1
+  ;;
+
   *-*-beos* )
         USE_BEOS=1
     cat >> confdefs.h <<\EOF
@@ -1154,60 +1315,51 @@ if test "$USE_UNIX" = 1 ; then
 #define __UNIX__ 1
 EOF
 
-
-    SRC_SUBDIRS="$SRC_SUBDIRS unix"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
-fi
-
-if test "$USE_BEOS" = 1; then
-    SRC_SUBDIRS="$SRC_SUBDIRS be"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
 fi
 
 if test "$USE_LINUX" = 1; then
-  echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1170: checking for gettext in -lc" >&5
-ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+    echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
+echo "configure:1323: checking for glibc 2.1 or later" >&5
+if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1178 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1328 "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 gettext();
-
+#include <features.h>
 int main() {
-gettext()
+
+                #if !__GLIBC_PREREQ(2, 1)
+                    #error not glibc2.1
+                #endif
+            
 ; return 0; }
 EOF
-if { (eval echo configure:1189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                wx_lib_glibc21=yes
+            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+                wx_lib_glibc21=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
+
+echo "$ac_t""$wx_lib_glibc21" 1>&6
+    if test "$wx_lib_glibc21" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define wxHAVE_GLIBC2 1
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+    fi
 fi
 
 
@@ -1222,10 +1374,13 @@ fi
 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
+  DEFAULT_wxUSE_UNIVERSAL=no
+
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
-  DEFAULT_wxUSE_OPTIMISE=yes
+  DEFAULT_wxUSE_SONAME=no
+  DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_NO_RTTI=no
@@ -1240,22 +1395,36 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
+  DEFAULT_wxUSE_LOGWINDOW=no
+  DEFAULT_wxUSE_LOGGUI=no
 
   DEFAULT_wxUSE_GUI=yes
+  DEFAULT_wxUSE_CONTROLS=no
 
+  DEFAULT_wxUSE_REGEX=no
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no
   DEFAULT_wxUSE_LIBTIFF=no
   DEFAULT_wxUSE_ODBC=no
+  DEFAULT_wxUSE_FREETYPE=no
+  DEFAULT_wxUSE_OPENGL=no
 
+  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
+  DEFAULT_wxUSE_SNGLINST_CHECKER=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_FFILE=no
   DEFAULT_wxUSE_TEXTFILE=no
-  DEFAULT_wxUSE_TIMEDATE=no
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=no
+  DEFAULT_wxUSE_FONTMAP=no
   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
@@ -1263,6 +1432,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_DYNLIB_CLASS=no
   DEFAULT_wxUSE_LONGLONG=no
+  DEFAULT_wxUSE_GEOMETRY=no
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
@@ -1272,6 +1442,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no
+  DEFAULT_wxUSE_DRAGIMAGE=no
   DEFAULT_wxUSE_SPLINES=no
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=no
@@ -1283,28 +1454,46 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_HELP=no
-  DEFAULT_wxUSE_WXTREE=no
+  DEFAULT_wxUSE_MS_HTML_HELP=no
+  DEFAULT_wxUSE_WXHTML_HELP=no
+  DEFAULT_wxUSE_TREELAYOUT=no
   DEFAULT_wxUSE_METAFILE=no
+  DEFAULT_wxUSE_MIMETYPE=no
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=no
+  DEFAULT_wxUSE_CHOICEDLG=no
+  DEFAULT_wxUSE_COLOURDLG=no
   DEFAULT_wxUSE_DIRDLG=no
+  DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_FINDREPLDLG=no
+  DEFAULT_wxUSE_FONTDLG=no
+  DEFAULT_wxUSE_MSGDLG=no
+  DEFAULT_wxUSE_NUMBERDLG=no
   DEFAULT_wxUSE_TEXTDLG=no
+  DEFAULT_wxUSE_SPLASH=no
   DEFAULT_wxUSE_STARTUP_TIPS=no
   DEFAULT_wxUSE_PROGRESSDLG=no
+  DEFAULT_wxUSE_WIZARDDLG=no
+
+  DEFAULT_wxUSE_MENUS=no
   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no
+  DEFAULT_wxUSE_FILESYSTEM=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ZIPSTREAM=no
-  DEFAULT_wxUSE_VALIDATORS=yes
+  DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_BUTTON=no
   DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=no
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLST=no
-  DEFAULT_wxUSE_CHOICE=yes
+  DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
@@ -1313,6 +1502,7 @@ if test $DEBUG_CONFIGURE = 1; then
   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
@@ -1324,23 +1514,33 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STATBMP=no
   DEFAULT_wxUSE_STATBOX=no
   DEFAULT_wxUSE_STATLINE=no
+  DEFAULT_wxUSE_STATTEXT=no
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TEXTCTRL=no
+  DEFAULT_wxUSE_TOGGLEBTN=no
   DEFAULT_wxUSE_TOOLBAR=no
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_POPUPWIN=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_PALETTE=no
+  DEFAULT_wxUSE_IMAGE=no
   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no
   DEFAULT_wxUSE_PNM=no
+  DEFAULT_wxUSE_XPM=no
 else
+  DEFAULT_wxUSE_UNIVERSAL=no
+
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
+  DEFAULT_wxUSE_SONAME=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
@@ -1356,22 +1556,35 @@ else
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
+  DEFAULT_wxUSE_LOGWINDOW=yes
+  DEFAULT_wxUSE_LOGGUI=yes
 
   DEFAULT_wxUSE_GUI=yes
 
+  DEFAULT_wxUSE_REGEX=yes
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
-  DEFAULT_wxUSE_ODBC=yes
+  DEFAULT_wxUSE_ODBC=no
+  DEFAULT_wxUSE_FREETYPE=no
+  DEFAULT_wxUSE_OPENGL=no
 
+  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
+  DEFAULT_wxUSE_SNGLINST_CHECKER=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_FFILE=yes
   DEFAULT_wxUSE_TEXTFILE=yes
-  DEFAULT_wxUSE_TIMEDATE=yes
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=yes
+  DEFAULT_wxUSE_FONTMAP=yes
   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
@@ -1379,6 +1592,7 @@ else
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
   DEFAULT_wxUSE_LONGLONG=yes
+  DEFAULT_wxUSE_GEOMETRY=yes
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
@@ -1388,6 +1602,7 @@ else
   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes
+  DEFAULT_wxUSE_DRAGIMAGE=yes
   DEFAULT_wxUSE_SPLINES=yes
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
@@ -1399,16 +1614,32 @@ else
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes
-  DEFAULT_wxUSE_WXTREE=yes
+  DEFAULT_wxUSE_MS_HTML_HELP=yes
+  DEFAULT_wxUSE_WXHTML_HELP=yes
+  DEFAULT_wxUSE_TREELAYOUT=yes
   DEFAULT_wxUSE_METAFILE=yes
+  DEFAULT_wxUSE_MIMETYPE=yes
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=yes
+  DEFAULT_wxUSE_CHOICEDLG=yes
+  DEFAULT_wxUSE_COLOURDLG=yes
   DEFAULT_wxUSE_DIRDLG=yes
+  DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_FINDREPLDLG=yes
+  DEFAULT_wxUSE_FONTDLG=yes
+  DEFAULT_wxUSE_MSGDLG=yes
+  DEFAULT_wxUSE_NUMBERDLG=yes
   DEFAULT_wxUSE_TEXTDLG=yes
+  DEFAULT_wxUSE_SPLASH=yes
   DEFAULT_wxUSE_STARTUP_TIPS=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes
+  DEFAULT_wxUSE_WIZARDDLG=yes
+
+  DEFAULT_wxUSE_MENUS=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes
+  DEFAULT_wxUSE_FILESYSTEM=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes
@@ -1416,19 +1647,22 @@ else
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_CARET=yes
+  DEFAULT_wxUSE_BUTTON=yes
   DEFAULT_wxUSE_BMPBUTTON=yes
+  DEFAULT_wxUSE_CALCTRL=yes
+  DEFAULT_wxUSE_CARET=yes
   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=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
@@ -1440,19 +1674,26 @@ else
   DEFAULT_wxUSE_STATBMP=yes
   DEFAULT_wxUSE_STATBOX=yes
   DEFAULT_wxUSE_STATLINE=yes
+  DEFAULT_wxUSE_STATTEXT=yes
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TEXTCTRL=yes
+  DEFAULT_wxUSE_TOGGLEBTN=yes
   DEFAULT_wxUSE_TOOLBAR=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
+  DEFAULT_wxUSE_POPUPWIN=yes
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_PALETTE=yes
+  DEFAULT_wxUSE_IMAGE=yes
   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes
   DEFAULT_wxUSE_PNM=yes
+  DEFAULT_wxUSE_XPM=yes
 fi
 
 
@@ -1468,8 +1709,8 @@ done
 
 
 
-          echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1473: checking "for --enable-gui"" >&5
+          echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
+echo "configure:1714: checking for --enable-gui" >&5
           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
@@ -1509,6 +1750,45 @@ fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
+
+          echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
+echo "configure:1756: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_universal='wxUSE_UNIVERSAL=yes'
+                          else
+                            ac_cv_use_universal='wxUSE_UNIVERSAL=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL
+                        
+fi
+
+
+          eval "$ac_cv_use_universal"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_UNIVERSAL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 # Check whether --with-gtk or --without-gtk was given.
 if test "${with_gtk+set}" = set; then
   withval="$with_gtk"
@@ -1521,6 +1801,12 @@ if test "${with_motif+set}" = set; then
   wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1
 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
+fi
+
 # Check whether --with-wine or --without-wine was given.
 if test "${with_wine+set}" = set; then
   withval="$with_wine"
@@ -1545,27 +1831,25 @@ if test "${with_pm+set}" = set; then
   wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
 fi
 
-
-# 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=""
+# Check whether --with-mgl or --without-mgl was given.
+if test "${with_mgl+set}" = set; then
+  withval="$with_mgl"
+  wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1
 fi
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+
+# Check whether --enable-gtk2 or --disable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then
+  enableval="$enable_gtk2"
+  wxUSE_GTK2=1
 else
-  gtk_config_exec_prefix=""
+  wxUSE_GTK2=0
 fi
 
 
 
-          echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1569: checking "for --with-libpng"" >&5
+          echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:1853: checking for --with-libpng" >&5
           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
@@ -1573,8 +1857,12 @@ if test "${with_libpng+set}" = set; then
   
                         if test "$withval" = yes; then
                           ac_cv_use_libpng='wxUSE_LIBPNG=yes'
-                        else
+                        elif test "$withval" = no; then
                           ac_cv_use_libpng='wxUSE_LIBPNG=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_libpng='wxUSE_LIBPNG=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; }
                         fi
                       
 else
@@ -1598,13 +1886,17 @@ fi
 
           if test "$wxUSE_LIBPNG" = yes; then
             echo "$ac_t""yes" 1>&6
-          else
+          elif test "$wxUSE_LIBPNG" = no; then
             echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_LIBPNG" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; }
           fi
         
 
-          echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
-echo "configure:1608: checking "for --with-libjpeg"" >&5
+          echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
+echo "configure:1900: checking for --with-libjpeg" >&5
           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
@@ -1612,8 +1904,12 @@ if test "${with_libjpeg+set}" = set; then
   
                         if test "$withval" = yes; then
                           ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
-                        else
+                        elif test "$withval" = no; then
                           ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; }
                         fi
                       
 else
@@ -1637,13 +1933,17 @@ fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
             echo "$ac_t""yes" 1>&6
-          else
+          elif test "$wxUSE_LIBJPEG" = no; then
             echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_LIBJPEG" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; }
           fi
         
 
-          echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
-echo "configure:1647: checking "for --with-libtiff"" >&5
+          echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
+echo "configure:1947: checking for --with-libtiff" >&5
           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then
@@ -1651,8 +1951,12 @@ if test "${with_libtiff+set}" = set; then
   
                         if test "$withval" = yes; then
                           ac_cv_use_libtiff='wxUSE_LIBTIFF=yes'
-                        else
+                        elif test "$withval" = no; then
                           ac_cv_use_libtiff='wxUSE_LIBTIFF=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_libtiff='wxUSE_LIBTIFF=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; }
                         fi
                       
 else
@@ -1676,13 +1980,64 @@ fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
             echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_LIBTIFF" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_LIBTIFF" = sys; then
+            echo "$ac_t""system version" 1>&6
           else
+            { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
+
+          echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
+echo "configure:1994: checking for --with-freetype" >&5
+          no_cache=0
+          # Check whether --with-freetype or --without-freetype was given.
+if test "${with_freetype+set}" = set; then
+  withval="$with_freetype"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_freetype='wxUSE_FREETYPE=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_freetype='wxUSE_FREETYPE=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_freetype='wxUSE_FREETYPE=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
+else
+  
+                        LINE=`grep "wxUSE_FREETYPE" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_freetype='wxUSE_FREETYPE='$DEFAULT_wxUSE_FREETYPE
+                      
+fi
+
+
+          eval "$ac_cv_use_freetype"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_freetype >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FREETYPE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_FREETYPE" = no; then
             echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_FREETYPE" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; }
           fi
         
 
-          echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1686: checking "for --with-opengl"" >&5
+          echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
+echo "configure:2041: checking for --with-opengl" >&5
           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
@@ -1723,8 +2078,8 @@ fi
 fi
 
 
-          echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
-echo "configure:1728: checking "for --with-dmalloc"" >&5
+          echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2083: checking for --with-dmalloc" >&5
           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@@ -1762,75 +2117,130 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
-echo "configure:1767: checking "for --with-zlib"" >&5
+          echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
+echo "configure:2122: checking for --with-regex" >&5
           no_cache=0
-          # Check whether --with-zlib or --without-zlib was given.
-if test "${with_zlib+set}" = set; then
-  withval="$with_zlib"
+          # Check whether --with-regex or --without-regex was given.
+if test "${with_regex+set}" = set; then
+  withval="$with_regex"
   
                         if test "$withval" = yes; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=yes'
+                          ac_cv_use_regex='wxUSE_REGEX=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_regex='wxUSE_REGEX=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_regex='wxUSE_REGEX=sys'
                         else
-                          ac_cv_use_zlib='wxUSE_ZLIB=no'
+                          { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
                         fi
                       
 else
   
-                        LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
+                        LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         else
                           no_cache=1
                         fi
 
-                        ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
+                        ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX
                       
 fi
 
 
-          eval "$ac_cv_use_zlib"
+          eval "$ac_cv_use_regex"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_ZLIB" = yes; then
+          if test "$wxUSE_REGEX" = yes; then
             echo "$ac_t""yes" 1>&6
-          else
+          elif test "$wxUSE_REGEX" = no; then
             echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_REGEX" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
           fi
         
 
-          echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
-echo "configure:1806: checking "for --with-odbc"" >&5
+          echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
+echo "configure:2169: checking for --with-zlib" >&5
           no_cache=0
-          # Check whether --with-odbc or --without-odbc was given.
-if test "${with_odbc+set}" = set; then
-  withval="$with_odbc"
+          # Check whether --with-zlib or --without-zlib was given.
+if test "${with_zlib+set}" = set; then
+  withval="$with_zlib"
   
                         if test "$withval" = yes; then
-                          ac_cv_use_odbc='wxUSE_ODBC=yes'
+                          ac_cv_use_zlib='wxUSE_ZLIB=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_zlib='wxUSE_ZLIB=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_zlib='wxUSE_ZLIB=sys'
                         else
-                          ac_cv_use_odbc='wxUSE_ODBC=no'
+                          { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; }
                         fi
                       
 else
   
-                        LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
+                        LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
                         else
                           no_cache=1
                         fi
 
-                        ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
+                        ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
                       
 fi
 
 
-          eval "$ac_cv_use_odbc"
+          eval "$ac_cv_use_zlib"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_ZLIB" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_ZLIB" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_ZLIB" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
+
+          echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
+echo "configure:2216: checking for --with-odbc" >&5
+          no_cache=0
+          # Check whether --with-odbc or --without-odbc was given.
+if test "${with_odbc+set}" = set; then
+  withval="$with_odbc"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_odbc='wxUSE_ODBC=yes'
+                        else
+                          ac_cv_use_odbc='wxUSE_ODBC=no'
+                        fi
+                      
+else
+  
+                        LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
+                      
+fi
+
+
+          eval "$ac_cv_use_odbc"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_ODBC" = yes; then
@@ -1842,9 +2252,8 @@ fi
 
 
 
-
-          echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
-echo "configure:1848: checking "for --enable-shared"" >&5
+          echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
+echo "configure:2257: checking for --enable-shared" >&5
           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
@@ -1882,8 +2291,47 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:1887: checking "for --enable-optimise"" >&5
+          echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6
+echo "configure:2296: checking for --enable-soname" >&5
+          no_cache=0
+          # Check whether --enable-soname or --disable-soname was given.
+if test "${enable_soname+set}" = set; then
+  enableval="$enable_soname"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_soname='wxUSE_SONAME=yes'
+                          else
+                            ac_cv_use_soname='wxUSE_SONAME=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME
+                        
+fi
+
+
+          eval "$ac_cv_use_soname"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SONAME" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
+echo "configure:2335: checking for --enable-optimise" >&5
           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
@@ -1921,8 +2369,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:1926: checking "for --enable-debug"" >&5
+          echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
+echo "configure:2374: checking for --enable-debug" >&5
           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -1969,8 +2417,8 @@ elif test "$wxUSE_DEBUG" = "no"; then
 fi
 
 
-          echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
-echo "configure:1974: checking "for --enable-debug_flag"" >&5
+          echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
+echo "configure:2422: checking for --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
@@ -2008,8 +2456,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6
-echo "configure:2013: checking "for --enable-debug_info"" >&5
+          echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
+echo "configure:2461: checking for --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
@@ -2047,8 +2495,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6
-echo "configure:2052: checking "for --enable-debug_gdb"" >&5
+          echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
+echo "configure:2500: checking for --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
@@ -2086,8 +2534,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6
-echo "configure:2091: checking "for --enable-debug_cntxt"" >&5
+          echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2539: checking for --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
@@ -2125,8 +2573,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6
-echo "configure:2130: checking "for --enable-mem_tracing"" >&5
+          echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
+echo "configure:2578: checking for --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
@@ -2164,8 +2612,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2169: checking "for --enable-profile"" >&5
+          echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
+echo "configure:2617: checking for --enable-profile" >&5
           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
@@ -2203,8 +2651,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6
-echo "configure:2208: checking "for --enable-no_rtti"" >&5
+          echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
+echo "configure:2656: checking for --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
@@ -2242,8 +2690,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6
-echo "configure:2247: checking "for --enable-no_exceptions"" >&5
+          echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
+echo "configure:2695: checking for --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
@@ -2281,8 +2729,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2286: checking "for --enable-permissive"" >&5
+          echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
+echo "configure:2734: checking for --enable-permissive" >&5
           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
@@ -2320,8 +2768,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6
-echo "configure:2325: checking "for --enable-no_deps"" >&5
+          echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
+echo "configure:2773: checking for --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
@@ -2360,9 +2808,88 @@ fi
         
 
 
+          echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
+echo "configure:2813: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=yes'
+                          else
+                            ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "WXWIN_COMPATIBILITY_2" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_compat20='WXWIN_COMPATIBILITY_2='$DEFAULT_WXWIN_COMPATIBILITY_2
+                        
+fi
+
+
+          eval "$ac_cv_use_compat20"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_compat20 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WXWIN_COMPATIBILITY_2" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6
+echo "configure:2852: checking for --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"
+  
+                          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
+  
+                          LINE=`grep "WXWIN_COMPATIBILITY_2_2" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2='$DEFAULT_WXWIN_COMPATIBILITY_2_2
+                        
+fi
+
+
+          eval "$ac_cv_use_compat22"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_compat22 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WXWIN_COMPATIBILITY_2_2" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
 
-          echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6
-echo "configure:2366: checking "for --enable-intl"" >&5
+          echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
+echo "configure:2893: checking for --enable-intl" >&5
           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
@@ -2400,8 +2927,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2405: checking "for --enable-config"" >&5
+          echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
+echo "configure:2932: checking for --enable-config" >&5
           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
@@ -2439,10 +2966,9 @@ fi
           fi
         
 
-if test "$wxUSE_GUI" = "yes"; then
 
-          echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6
-echo "configure:2446: checking "for --enable-sockets"" >&5
+          echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
+echo "configure:2972: checking for --enable-sockets" >&5
           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
@@ -2479,130 +3005,128 @@ fi
             echo "$ac_t""no" 1>&6
           fi
         
-else
-wxUSE_SOCKETS=no
-fi
 
 
-          echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
-echo "configure:2489: checking "for --enable-dialupman"" >&5
+          echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
+echo "configure:3012: checking for --enable-ipc" >&5
           no_cache=0
-          # Check whether --enable-dialupman or --disable-dialupman was given.
-if test "${enable_dialupman+set}" = set; then
-  enableval="$enable_dialupman"
+          # 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_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                            ac_cv_use_ipc='wxUSE_IPC=yes'
                           else
-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                            ac_cv_use_ipc='wxUSE_IPC=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
+                          ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC
                         
 fi
 
 
-          eval "$ac_cv_use_dialupman"
+          eval "$ac_cv_use_ipc"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DIALUP_MANAGER" = yes; then
+          if test "$wxUSE_IPC" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6
-echo "configure:2528: checking "for --enable-ipc"" >&5
+
+          echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
+echo "configure:3052: checking for --enable-cmdline" >&5
           no_cache=0
-          # Check whether --enable-ipc or --disable-ipc was given.
-if test "${enable_ipc+set}" = set; then
-  enableval="$enable_ipc"
+          # 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_ipc='wxUSE_IPC=yes'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                           else
-                            ac_cv_use_ipc='wxUSE_IPC=no'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC
+                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
                         
 fi
 
 
-          eval "$ac_cv_use_ipc"
+          eval "$ac_cv_use_cmdline"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_IPC" = yes; then
+          if test "$wxUSE_CMDLINE_PARSER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6
-echo "configure:2567: checking "for --enable-apple_ieee"" >&5
+          echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
+echo "configure:3091: checking for --enable-datetime" >&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"
+          # 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_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                            ac_cv_use_datetime='wxUSE_DATETIME=yes'
                           else
-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                            ac_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                          ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
                         
 fi
 
 
-          eval "$ac_cv_use_apple_ieee"
+          eval "$ac_cv_use_datetime"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_APPLE_IEEE" = yes; then
+          if test "$wxUSE_DATETIME" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6
-echo "configure:2606: checking "for --enable-timedate"" >&5
+          echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
+echo "configure:3130: checking for --enable-timedate" >&5
           no_cache=0
           # Check whether --enable-timedate or --disable-timedate was given.
 if test "${enable_timedate+set}" = set; then
@@ -2640,943 +3164,937 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2645: checking "for --enable-wave"" >&5
+          echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
+echo "configure:3169: checking for --enable-stopwatch" >&5
           no_cache=0
-          # Check whether --enable-wave or --disable-wave was given.
-if test "${enable_wave+set}" = set; then
-  enableval="$enable_wave"
+          # 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_wave='wxUSE_WAVE=yes'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                           else
-                            ac_cv_use_wave='wxUSE_WAVE=no'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                          ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
                         
 fi
 
 
-          eval "$ac_cv_use_wave"
+          eval "$ac_cv_use_stopwatch"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_WAVE" = yes; then
+          if test "$wxUSE_STOPWATCH" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6
-echo "configure:2684: checking "for --enable-fraction"" >&5
+          echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
+echo "configure:3208: checking for --enable-dialupman" >&5
           no_cache=0
-          # Check whether --enable-fraction or --disable-fraction was given.
-if test "${enable_fraction+set}" = set; then
-  enableval="$enable_fraction"
+          # 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_fraction='wxUSE_FRACTION=yes'
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                           else
-                            ac_cv_use_fraction='wxUSE_FRACTION=no'
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
                         
 fi
 
 
-          eval "$ac_cv_use_fraction"
+          eval "$ac_cv_use_dialupman"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_FRACTION" = yes; then
+          if test "$wxUSE_DIALUP_MANAGER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
-echo "configure:2723: checking "for --enable-dynlib"" >&5
+          echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
+echo "configure:3247: checking for --enable-apple_ieee" >&5
           no_cache=0
-          # Check whether --enable-dynlib or --disable-dynlib was given.
-if test "${enable_dynlib+set}" = set; then
-  enableval="$enable_dynlib"
+          # 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_dynlib='wxUSE_DYNLIB_CLASS=yes'
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
                           else
-                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
+                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
                         
 fi
 
 
-          eval "$ac_cv_use_dynlib"
+          eval "$ac_cv_use_apple_ieee"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DYNLIB_CLASS" = yes; then
+          if test "$wxUSE_APPLE_IEEE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2762: checking "for --enable-longlong"" >&5
+          echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
+echo "configure:3286: checking for --enable-timer" >&5
           no_cache=0
-          # Check whether --enable-longlong or --disable-longlong was given.
-if test "${enable_longlong+set}" = set; then
-  enableval="$enable_longlong"
+          # 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_longlong='wxUSE_LONGLONG=yes'
+                            ac_cv_use_timer='wxUSE_TIMER=yes'
                           else
-                            ac_cv_use_longlong='wxUSE_LONGLONG=no'
+                            ac_cv_use_timer='wxUSE_TIMER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
+                          ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
                         
 fi
 
 
-          eval "$ac_cv_use_longlong"
+          eval "$ac_cv_use_timer"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_LONGLONG" = yes; then
+          if test "$wxUSE_TIMER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:2801: checking "for --enable-log"" >&5
+          echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
+echo "configure:3325: checking for --enable-wave" >&5
           no_cache=0
-          # Check whether --enable-log or --disable-log was given.
-if test "${enable_log+set}" = set; then
-  enableval="$enable_log"
+          # 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_log='wxUSE_LOG=yes'
+                            ac_cv_use_wave='wxUSE_WAVE=yes'
                           else
-                            ac_cv_use_log='wxUSE_LOG=no'
+                            ac_cv_use_wave='wxUSE_WAVE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
+                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
                         
 fi
 
 
-          eval "$ac_cv_use_log"
+          eval "$ac_cv_use_wave"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_LOG" = yes; then
+          if test "$wxUSE_WAVE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:2840: checking "for --enable-streams"" >&5
+          echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
+echo "configure:3364: checking for --enable-fraction" >&5
           no_cache=0
-          # Check whether --enable-streams or --disable-streams was given.
-if test "${enable_streams+set}" = set; then
-  enableval="$enable_streams"
+          # 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_streams='wxUSE_STREAMS=yes'
+                            ac_cv_use_fraction='wxUSE_FRACTION=yes'
                           else
-                            ac_cv_use_streams='wxUSE_STREAMS=no'
+                            ac_cv_use_fraction='wxUSE_FRACTION=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
+                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
                         
 fi
 
 
-          eval "$ac_cv_use_streams"
+          eval "$ac_cv_use_fraction"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STREAMS" = yes; then
+          if test "$wxUSE_FRACTION" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:2879: checking "for --enable-file"" >&5
+          echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
+echo "configure:3403: checking for --enable-dynlib" >&5
           no_cache=0
-          # Check whether --enable-file or --disable-file was given.
-if test "${enable_file+set}" = set; then
-  enableval="$enable_file"
+          # 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_file='wxUSE_FILE=yes'
+                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                           else
-                            ac_cv_use_file='wxUSE_FILE=no'
+                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
+                          ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
                         
 fi
 
 
-          eval "$ac_cv_use_file"
+          eval "$ac_cv_use_dynlib"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_FILE" = yes; then
+          if test "$wxUSE_DYNLIB_CLASS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:2918: checking "for --enable-textfile"" >&5
+          echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
+echo "configure:3442: checking for --enable-longlong" >&5
           no_cache=0
-          # Check whether --enable-textfile or --disable-textfile was given.
-if test "${enable_textfile+set}" = set; then
-  enableval="$enable_textfile"
+          # 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_textfile='wxUSE_TEXTFILE=yes'
+                            ac_cv_use_longlong='wxUSE_LONGLONG=yes'
                           else
-                            ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+                            ac_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
+                          ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
                         
 fi
 
 
-          eval "$ac_cv_use_textfile"
+          eval "$ac_cv_use_longlong"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TEXTFILE" = yes; then
+          if test "$wxUSE_LONGLONG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:2957: checking "for --enable-unicode"" >&5
+          echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
+echo "configure:3481: checking for --enable-geometry" >&5
           no_cache=0
-          # Check whether --enable-unicode or --disable-unicode was given.
-if test "${enable_unicode+set}" = set; then
-  enableval="$enable_unicode"
+          # 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_unicode='wxUSE_UNICODE=yes'
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
                           else
-                            ac_cv_use_unicode='wxUSE_UNICODE=no'
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
+                          ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
                         
 fi
 
 
-          eval "$ac_cv_use_unicode"
+          eval "$ac_cv_use_geometry"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_UNICODE" = yes; then
+          if test "$wxUSE_GEOMETRY" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:2996: checking "for --enable-wcsrtombs"" >&5
+          echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
+echo "configure:3520: checking for --enable-log" >&5
           no_cache=0
-          # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
-if test "${enable_wcsrtombs+set}" = set; then
-  enableval="$enable_wcsrtombs"
+          # 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_wcsrtombs='wxUSE_WCSRTOMBS=yes'
+                            ac_cv_use_log='wxUSE_LOG=yes'
                           else
-                            ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no'
+                            ac_cv_use_log='wxUSE_LOG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS
+                          ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
                         
 fi
 
 
-          eval "$ac_cv_use_wcsrtombs"
+          eval "$ac_cv_use_log"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_WCSRTOMBS" = yes; then
+          if test "$wxUSE_LOG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3035: checking "for --enable-wxprintfv"" >&5
+          echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
+echo "configure:3559: checking for --enable-streams" >&5
           no_cache=0
-          # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
-if test "${enable_wxprintfv+set}" = set; then
-  enableval="$enable_wxprintfv"
+          # 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_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+                            ac_cv_use_streams='wxUSE_STREAMS=yes'
                           else
-                            ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+                            ac_cv_use_streams='wxUSE_STREAMS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
+                          ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
                         
 fi
 
 
-          eval "$ac_cv_use_wxprintfv"
+          eval "$ac_cv_use_streams"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
+          if test "$wxUSE_STREAMS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6
-echo "configure:3074: checking "for --enable-joystick"" >&5
+          echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
+echo "configure:3598: checking for --enable-file" >&5
           no_cache=0
-          # Check whether --enable-joystick or --disable-joystick was given.
-if test "${enable_joystick+set}" = set; then
-  enableval="$enable_joystick"
+          # 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_joystick='wxUSE_JOYSTICK=yes'
+                            ac_cv_use_file='wxUSE_FILE=yes'
                           else
-                            ac_cv_use_joystick='wxUSE_JOYSTICK=no'
+                            ac_cv_use_file='wxUSE_FILE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK
+                          ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
                         
 fi
 
 
-          eval "$ac_cv_use_joystick"
+          eval "$ac_cv_use_file"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_JOYSTICK" = yes; then
+          if test "$wxUSE_FILE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6
-echo "configure:3113: checking "for --enable-std_iostreams"" >&5
+          echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
+echo "configure:3637: checking for --enable-ffile" >&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"
+          # 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_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+                            ac_cv_use_ffile='wxUSE_FFILE=yes'
                           else
-                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+                            ac_cv_use_ffile='wxUSE_FFILE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM
+                          ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
                         
 fi
 
 
-          eval "$ac_cv_use_std_iostreams"
+          eval "$ac_cv_use_ffile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STD_IOSTREAM" = yes; then
+          if test "$wxUSE_FFILE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3152: checking "for --enable-fs_inet"" >&5
+          echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
+echo "configure:3676: checking for --enable-textfile" >&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"
+          # 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_fs_inet='wxUSE_FS_INET=yes'
+                            ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
                           else
-                            ac_cv_use_fs_inet='wxUSE_FS_INET=no'
+                            ac_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
+                          ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
                         
 fi
 
 
-          eval "$ac_cv_use_fs_inet"
+          eval "$ac_cv_use_textfile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_FS_INET" = yes; then
+          if test "$wxUSE_TEXTFILE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3191: checking "for --enable-fs_zip"" >&5
+          echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
+echo "configure:3715: checking for --enable-fontmap" >&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"
+          # 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_fs_zip='wxUSE_FS_ZIP=yes'
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
                           else
-                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
+                          ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
                         
 fi
 
 
-          eval "$ac_cv_use_fs_zip"
+          eval "$ac_cv_use_fontmap"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_FS_ZIP" = yes; then
+          if test "$wxUSE_FONTMAP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3230: checking "for --enable-zipstream"" >&5
+          echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
+echo "configure:3754: checking for --enable-unicode" >&5
           no_cache=0
-          # Check whether --enable-zipstream or --disable-zipstream was given.
-if test "${enable_zipstream+set}" = set; then
-  enableval="$enable_zipstream"
+          # 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_zipstream='wxUSE_ZIPSTREAM=yes'
+                            ac_cv_use_unicode='wxUSE_UNICODE=yes'
                           else
-                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
+                            ac_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
+                          ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
                         
 fi
 
 
-          eval "$ac_cv_use_zipstream"
+          eval "$ac_cv_use_unicode"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_ZIPSTREAM" = yes; then
+          if test "$wxUSE_UNICODE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6
-echo "configure:3271: checking "for --enable-threads"" >&5
+          echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
+echo "configure:3793: checking for --enable-wxprintfv" >&5
           no_cache=0
-          # Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval="$enable_threads"
+          # 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_threads='wxUSE_THREADS=yes'
+                            ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
                           else
-                            ac_cv_use_threads='wxUSE_THREADS=no'
+                            ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
+                          ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
                         
 fi
 
 
-          eval "$ac_cv_use_threads"
+          eval "$ac_cv_use_wxprintfv"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_THREADS" = yes; then
+          if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6
-echo "configure:3310: checking "for --enable-serial"" >&5
+          echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
+echo "configure:3832: checking for --enable-std_iostreams" >&5
           no_cache=0
-          # Check whether --enable-serial or --disable-serial was given.
-if test "${enable_serial+set}" = set; then
-  enableval="$enable_serial"
+          # 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_serial='wxUSE_SERIAL=yes'
+                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
                           else
-                            ac_cv_use_serial='wxUSE_SERIAL=no'
+                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
+                          ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM
                         
 fi
 
 
-          eval "$ac_cv_use_serial"
+          eval "$ac_cv_use_std_iostreams"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SERIAL" = yes; then
+          if test "$wxUSE_STD_IOSTREAM" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-if test "$wxUSE_GUI" = "yes"; then
-
-
-
-          echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6
-echo "configure:3353: checking "for --enable-docview"" >&5
+          echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
+echo "configure:3871: checking for --enable-filesystem" >&5
           no_cache=0
-          # Check whether --enable-docview or --disable-docview was given.
-if test "${enable_docview+set}" = set; then
-  enableval="$enable_docview"
+          # 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_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
                           else
-                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+                          ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
                         
 fi
 
 
-          eval "$ac_cv_use_docview"
+          eval "$ac_cv_use_filesystem"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
+          if test "$wxUSE_FILESYSTEM" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3392: checking "for --enable-help"" >&5
+          echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
+echo "configure:3910: checking for --enable-fs_inet" >&5
           no_cache=0
-          # Check whether --enable-help or --disable-help was given.
-if test "${enable_help+set}" = set; then
-  enableval="$enable_help"
+          # 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_help='wxUSE_HELP=yes'
+                            ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
                           else
-                            ac_cv_use_help='wxUSE_HELP=no'
+                            ac_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
+                          ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
                         
 fi
 
 
-          eval "$ac_cv_use_help"
+          eval "$ac_cv_use_fs_inet"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_HELP" = yes; then
+          if test "$wxUSE_FS_INET" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
-echo "configure:3431: checking "for --enable-constraints"" >&5
+          echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
+echo "configure:3949: checking for --enable-fs_zip" >&5
           no_cache=0
-          # Check whether --enable-constraints or --disable-constraints was given.
-if test "${enable_constraints+set}" = set; then
-  enableval="$enable_constraints"
+          # 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_constraints='wxUSE_CONSTRAINTS=yes'
+                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
                           else
-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
+                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+                          ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
                         
 fi
 
 
-          eval "$ac_cv_use_constraints"
+          eval "$ac_cv_use_fs_zip"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CONSTRAINTS" = yes; then
+          if test "$wxUSE_FS_ZIP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3470: checking "for --enable-printarch"" >&5
+          echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
+echo "configure:3988: checking for --enable-zipstream" >&5
           no_cache=0
-          # Check whether --enable-printarch or --disable-printarch was given.
-if test "${enable_printarch+set}" = set; then
-  enableval="$enable_printarch"
+          # 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_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                           else
-                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+                          ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
                         
 fi
 
 
-          eval "$ac_cv_use_printarch"
+          eval "$ac_cv_use_zipstream"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
+          if test "$wxUSE_ZIPSTREAM" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3509: checking "for --enable-mdi"" >&5
+
+          echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
+echo "configure:4028: checking for --enable-catch_segvs" >&5
           no_cache=0
-          # Check whether --enable-mdi or --disable-mdi was given.
-if test "${enable_mdi+set}" = set; then
-  enableval="$enable_mdi"
+          # 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_mdi='wxUSE_MDI_ARCHITECTURE=yes'
+                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
                           else
-                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
+                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
+                          ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
                         
 fi
 
 
-          eval "$ac_cv_use_mdi"
+          eval "$ac_cv_use_catch_segvs"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
+          if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-          echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6
-echo "configure:3549: checking "for --enable-postscript"" >&5
+          echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
+echo "configure:4067: checking for --enable-snglinst" >&5
           no_cache=0
-          # Check whether --enable-postscript or --disable-postscript was given.
-if test "${enable_postscript+set}" = set; then
-  enableval="$enable_postscript"
+          # 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_postscript='wxUSE_POSTSCRIPT=yes'
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                           else
-                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
+                          ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
                         
 fi
 
 
-          eval "$ac_cv_use_postscript"
+          eval "$ac_cv_use_snglinst"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_POSTSCRIPT" = yes; then
+          if test "$wxUSE_SNGLINST_CHECKER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
@@ -3584,79 +4102,78 @@ fi
         
 
 
-
-          echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6
-echo "configure:3590: checking "for --enable-prologio"" >&5
+          echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
+echo "configure:4107: checking for --enable-mimetype" >&5
           no_cache=0
-          # Check whether --enable-prologio or --disable-prologio was given.
-if test "${enable_prologio+set}" = set; then
-  enableval="$enable_prologio"
+          # 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_prologio='wxUSE_PROLOGIO=yes'
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                           else
-                            ac_cv_use_prologio='wxUSE_PROLOGIO=no'
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
+                          ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
                         
 fi
 
 
-          eval "$ac_cv_use_prologio"
+          eval "$ac_cv_use_mimetype"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PROLOGIO" = yes; then
+          if test "$wxUSE_MIMETYPE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3629: checking "for --enable-resources"" >&5
+          echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
+echo "configure:4146: checking for --enable-system_options" >&5
           no_cache=0
-          # Check whether --enable-resources or --disable-resources was given.
-if test "${enable_resources+set}" = set; then
-  enableval="$enable_resources"
+          # 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_resources='wxUSE_RESOURCES=yes'
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                           else
-                            ac_cv_use_resources='wxUSE_RESOURCES=no'
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
+                          ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
                         
 fi
 
 
-          eval "$ac_cv_use_resources"
+          eval "$ac_cv_use_system_options"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_RESOURCES" = yes; then
+          if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
@@ -3664,4095 +4181,8790 @@ fi
         
 
 
-          echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6
-echo "configure:3669: checking "for --enable-xresources"" >&5
+
+          echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
+echo "configure:4187: checking for --enable-threads" >&5
           no_cache=0
-          # Check whether --enable-xresources or --disable-xresources was given.
-if test "${enable_xresources+set}" = set; then
-  enableval="$enable_xresources"
+          # 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_xresources='wxUSE_X_RESOURCES=yes'
+                            ac_cv_use_threads='wxUSE_THREADS=yes'
                           else
-                            ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
+                            ac_cv_use_threads='wxUSE_THREADS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_THREADS" ${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
+                          ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
                         
 fi
 
 
-          eval "$ac_cv_use_xresources"
+          eval "$ac_cv_use_threads"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_X_RESOURCES" = yes; then
+          if test "$wxUSE_THREADS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6
-echo "configure:3710: checking "for --enable-clipboard"" >&5
+          echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
+echo "configure:4226: checking for --enable-serial" >&5
           no_cache=0
-          # Check whether --enable-clipboard or --disable-clipboard was given.
-if test "${enable_clipboard+set}" = set; then
-  enableval="$enable_clipboard"
+          # Check whether --enable-serial or --disable-serial was given.
+if test "${enable_serial+set}" = set; then
+  enableval="$enable_serial"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
+                            ac_cv_use_serial='wxUSE_SERIAL=yes'
                           else
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+                            ac_cv_use_serial='wxUSE_SERIAL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+                          ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
                         
 fi
 
 
-          eval "$ac_cv_use_clipboard"
+          eval "$ac_cv_use_serial"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CLIPBOARD" = yes; then
+          if test "$wxUSE_SERIAL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6
-echo "configure:3749: checking "for --enable-dnd"" >&5
+if test "$wxUSE_GUI" = "yes"; then
+
+
+
+          echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4269: checking for --enable-docview" >&5
           no_cache=0
-          # Check whether --enable-dnd or --disable-dnd was given.
-if test "${enable_dnd+set}" = set; then
-  enableval="$enable_dnd"
+          # 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_dnd='wxUSE_DRAG_AND_DROP=yes'
+                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
+                          ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
                         
 fi
 
 
-          eval "$ac_cv_use_dnd"
+          eval "$ac_cv_use_docview"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DRAG_AND_DROP" = yes; then
+          if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-          echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6
-echo "configure:3789: checking "for --enable-wxtree"" >&5
+          echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4308: checking for --enable-help" >&5
           no_cache=0
-          # Check whether --enable-wxtree or --disable-wxtree was given.
-if test "${enable_wxtree+set}" = set; then
-  enableval="$enable_wxtree"
+          # 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_wxtree='wxUSE_WXTREE=yes'
+                            ac_cv_use_help='wxUSE_HELP=yes'
                           else
-                            ac_cv_use_wxtree='wxUSE_WXTREE=no'
+                            ac_cv_use_help='wxUSE_HELP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE
+                          ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
                         
 fi
 
 
-          eval "$ac_cv_use_wxtree"
+          eval "$ac_cv_use_help"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_WXTREE" = yes; then
+          if test "$wxUSE_HELP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6
-echo "configure:3830: checking "for --enable-controls"" >&5
+          echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:4347: checking for --enable-mshtmlhelp" >&5
           no_cache=0
-          # Check whether --enable-controls or --disable-controls was given.
-if test "${enable_controls+set}" = set; then
-  enableval="$enable_controls"
+          # 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_controls='wxUSE_CONTROLS=yes'
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                           else
-                            ac_cv_use_controls='wxUSE_CONTROLS=no'
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
+                          ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
                         
 fi
 
 
-          eval "$ac_cv_use_controls"
+          eval "$ac_cv_use_mshtmlhelp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CONTROLS" = yes; then
+          if test "$wxUSE_MS_HTML_HELP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-if test "$wxUSE_CONTROLS" = "yes"; then
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLISTBOX=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=no
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPINCTRL=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
-  DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-elif test "$wxUSE_CONTROLS" = "no"; then
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLISTBOX=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_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATUSBAR=no
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_TREECTRL=no
-fi
-
-
-          echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:3938: checking "for --enable-accel"" >&5
+          echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
+echo "configure:4386: checking for --enable-html" >&5
           no_cache=0
-          # Check whether --enable-accel or --disable-accel was given.
-if test "${enable_accel+set}" = set; then
-  enableval="$enable_accel"
+          # 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_accel='wxUSE_ACCEL=yes'
+                            ac_cv_use_html='wxUSE_HTML=yes'
                           else
-                            ac_cv_use_accel='wxUSE_ACCEL=no'
+                            ac_cv_use_html='wxUSE_HTML=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
+                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
                         
 fi
 
 
-          eval "$ac_cv_use_accel"
+          eval "$ac_cv_use_html"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_ACCEL" = yes; then
+          if test "$wxUSE_HTML" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:3977: checking "for --enable-caret"" >&5
+          echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
+echo "configure:4425: checking for --enable-htmlhelp" >&5
           no_cache=0
-          # Check whether --enable-caret or --disable-caret was given.
-if test "${enable_caret+set}" = set; then
-  enableval="$enable_caret"
+          # 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_caret='wxUSE_CARET=yes'
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                           else
-                            ac_cv_use_caret='wxUSE_CARET=no'
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+                          ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP
                         
 fi
 
 
-          eval "$ac_cv_use_caret"
+          eval "$ac_cv_use_htmlhelp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CARET" = yes; then
+          if test "$wxUSE_WXHTML_HELP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
-echo "configure:4016: checking "for --enable-bmpbutton"" >&5
+          echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
+echo "configure:4464: checking for --enable-constraints" >&5
           no_cache=0
-          # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
-if test "${enable_bmpbutton+set}" = set; then
-  enableval="$enable_bmpbutton"
+          # 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_bmpbutton='wxUSE_BMPBUTTON=yes'
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else
-                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
+                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
                         
 fi
 
 
-          eval "$ac_cv_use_bmpbutton"
+          eval "$ac_cv_use_constraints"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_BMPBUTTON" = yes; then
+          if test "$wxUSE_CONSTRAINTS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4055: checking "for --enable-checkbox"" >&5
+          echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
+echo "configure:4503: checking for --enable-printarch" >&5
           no_cache=0
-          # Check whether --enable-checkbox or --disable-checkbox was given.
-if test "${enable_checkbox+set}" = set; then
-  enableval="$enable_checkbox"
+          # 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_checkbox='wxUSE_CHECKBOX=yes'
+                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
+                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
+                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
                         
 fi
 
 
-          eval "$ac_cv_use_checkbox"
+          eval "$ac_cv_use_printarch"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CHECKBOX" = yes; then
+          if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4094: checking "for --enable-checklst"" >&5
+          echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
+echo "configure:4542: checking for --enable-mdi" >&5
           no_cache=0
-          # Check whether --enable-checklst or --disable-checklst was given.
-if test "${enable_checklst+set}" = set; then
-  enableval="$enable_checklst"
+          # 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_checklst='wxUSE_CHECKLST=yes'
+                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_checklst='wxUSE_CHECKLST=no'
+                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
+                          ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
                         
 fi
 
 
-          eval "$ac_cv_use_checklst"
+          eval "$ac_cv_use_mdi"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CHECKLST" = yes; then
+          if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4133: checking "for --enable-choice"" >&5
+          echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
+echo "configure:4581: checking for --enable-loggui" >&5
           no_cache=0
-          # Check whether --enable-choice or --disable-choice was given.
-if test "${enable_choice+set}" = set; then
-  enableval="$enable_choice"
+          # 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_choice='wxUSE_CHOICE=yes'
+                            ac_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else
-                            ac_cv_use_choice='wxUSE_CHOICE=no'
+                            ac_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
+                          ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
                         
 fi
 
 
-          eval "$ac_cv_use_choice"
+          eval "$ac_cv_use_loggui"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CHOICE" = yes; then
+          if test "$wxUSE_LOGGUI" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4172: checking "for --enable-combobox"" >&5
+          echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
+echo "configure:4620: checking for --enable-logwin" >&5
           no_cache=0
-          # Check whether --enable-combobox or --disable-combobox was given.
-if test "${enable_combobox+set}" = set; then
-  enableval="$enable_combobox"
+          # 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_combobox='wxUSE_COMBOBOX=yes'
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else
-                            ac_cv_use_combobox='wxUSE_COMBOBOX=no'
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
+                          ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
                         
 fi
 
 
-          eval "$ac_cv_use_combobox"
+          eval "$ac_cv_use_logwin"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_COMBOBOX" = yes; then
+          if test "$wxUSE_LOGWINDOW" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4211: checking "for --enable-gauge"" >&5
+
+          echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
+echo "configure:4660: checking for --enable-postscript" >&5
           no_cache=0
-          # Check whether --enable-gauge or --disable-gauge was given.
-if test "${enable_gauge+set}" = set; then
-  enableval="$enable_gauge"
+          # 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_gauge='wxUSE_GAUGE=yes'
+                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else
-                            ac_cv_use_gauge='wxUSE_GAUGE=no'
+                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+                          ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
                         
 fi
 
 
-          eval "$ac_cv_use_gauge"
+          eval "$ac_cv_use_postscript"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_GAUGE" = yes; then
+          if test "$wxUSE_POSTSCRIPT" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4250: checking "for --enable-grid"" >&5
+
+
+
+          echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
+echo "configure:4702: checking for --enable-prologio" >&5
           no_cache=0
-          # Check whether --enable-grid or --disable-grid was given.
-if test "${enable_grid+set}" = set; then
-  enableval="$enable_grid"
+          # 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_grid='wxUSE_GRID=yes'
+                            ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
                           else
-                            ac_cv_use_grid='wxUSE_GRID=no'
+                            ac_cv_use_prologio='wxUSE_PROLOGIO=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+                          ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
                         
 fi
 
 
-          eval "$ac_cv_use_grid"
+          eval "$ac_cv_use_prologio"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_GRID" = yes; then
+          if test "$wxUSE_PROLOGIO" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4289: checking "for --enable-newgrid"" >&5
+          echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
+echo "configure:4741: checking for --enable-resources" >&5
           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-resources or --disable-resources was given.
+if test "${enable_resources+set}" = set; then
+  enableval="$enable_resources"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
+                            ac_cv_use_resources='wxUSE_RESOURCES=yes'
                           else
-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+                            ac_cv_use_resources='wxUSE_RESOURCES=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
                           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_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
                         
 fi
 
 
-          eval "$ac_cv_use_newgrid"
+          eval "$ac_cv_use_resources"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_NEW_GRID" = yes; then
+          if test "$wxUSE_RESOURCES" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4328: checking "for --enable-imaglist"" >&5
+
+          echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
+echo "configure:4781: checking for --enable-xresources" >&5
           no_cache=0
-          # Check whether --enable-imaglist or --disable-imaglist was given.
-if test "${enable_imaglist+set}" = set; then
-  enableval="$enable_imaglist"
+          # 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_imaglist='wxUSE_IMAGLIST=yes'
+                            ac_cv_use_xresources='wxUSE_X_RESOURCES=yes'
                           else
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
+                            ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
+                          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_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+                          ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES
                         
 fi
 
 
-          eval "$ac_cv_use_imaglist"
+          eval "$ac_cv_use_xresources"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_IMAGLIST" = yes; then
+          if test "$wxUSE_X_RESOURCES" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4367: checking "for --enable-listbox"" >&5
+
+
+          echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
+echo "configure:4822: checking for --enable-clipboard" >&5
           no_cache=0
-          # Check whether --enable-listbox or --disable-listbox was given.
-if test "${enable_listbox+set}" = set; then
-  enableval="$enable_listbox"
+          # 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_listbox='wxUSE_LISTBOX=yes'
+                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                           else
-                            ac_cv_use_listbox='wxUSE_LISTBOX=no'
+                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
+                          ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
                         
 fi
 
 
-          eval "$ac_cv_use_listbox"
+          eval "$ac_cv_use_clipboard"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_LISTBOX" = yes; then
+          if test "$wxUSE_CLIPBOARD" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4406: checking "for --enable-listctrl"" >&5
+          echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
+echo "configure:4861: checking for --enable-dnd" >&5
           no_cache=0
-          # Check whether --enable-listctrl or --disable-listctrl was given.
-if test "${enable_listctrl+set}" = set; then
-  enableval="$enable_listctrl"
+          # 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_listctrl='wxUSE_LISTCTRL=yes'
+                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                           else
-                            ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
+                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
+                          ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
                         
 fi
 
 
-          eval "$ac_cv_use_listctrl"
+          eval "$ac_cv_use_dnd"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_LISTCTRL" = yes; then
+          if test "$wxUSE_DRAG_AND_DROP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4445: checking "for --enable-notebook"" >&5
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:4900: checking for --enable-metafile" >&5
           no_cache=0
-          # Check whether --enable-notebook or --disable-notebook was given.
-if test "${enable_notebook+set}" = set; then
-  enableval="$enable_notebook"
+          # 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_notebook='wxUSE_NOTEBOOK=yes'
+                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
-                            ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
+                            ac_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
+                          ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
                         
 fi
 
 
-          eval "$ac_cv_use_notebook"
+          eval "$ac_cv_use_metafile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_NOTEBOOK" = yes; then
+          if test "$wxUSE_METAFILE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4484: checking "for --enable-radiobox"" >&5
+
+          echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6
+echo "configure:4940: checking for --enable-treelayout" >&5
           no_cache=0
-          # Check whether --enable-radiobox or --disable-radiobox was given.
-if test "${enable_radiobox+set}" = set; then
-  enableval="$enable_radiobox"
+          # 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_radiobox='wxUSE_RADIOBOX=yes'
+                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes'
                           else
-                            ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
+                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
+                          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_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
+                          ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT
                         
 fi
 
 
-          eval "$ac_cv_use_radiobox"
+          eval "$ac_cv_use_treelayout"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_RADIOBOX" = yes; then
+          if test "$wxUSE_TREELAYOUT" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4523: checking "for --enable-radiobtn"" >&5
+
+
+          echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
+echo "configure:4981: checking for --enable-controls" >&5
           no_cache=0
-          # Check whether --enable-radiobtn or --disable-radiobtn was given.
-if test "${enable_radiobtn+set}" = set; then
-  enableval="$enable_radiobtn"
+          # 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_radiobtn='wxUSE_RADIOBTN=yes'
+                            ac_cv_use_controls='wxUSE_CONTROLS=yes'
                           else
-                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
+                            ac_cv_use_controls='wxUSE_CONTROLS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
+                          ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
                         
 fi
 
 
-          eval "$ac_cv_use_radiobtn"
+          eval "$ac_cv_use_controls"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_RADIOBTN" = yes; then
+          if test "$wxUSE_CONTROLS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4562: checking "for --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"
+if test "$wxUSE_CONTROLS" = "yes"; then
+  DEFAULT_wxUSE_ACCEL=yes
+  DEFAULT_wxUSE_BMPBUTTON=yes
+  DEFAULT_wxUSE_BUTTON=yes
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=yes
+  DEFAULT_wxUSE_COMBOBOX=yes
+  DEFAULT_wxUSE_CHECKBOX=yes
+  DEFAULT_wxUSE_CHECKLISTBOX=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_PROPSHEET=yes
+  DEFAULT_wxUSE_RADIOBOX=yes
+  DEFAULT_wxUSE_RADIOBTN=yes
+  DEFAULT_wxUSE_SASH=yes
+  DEFAULT_wxUSE_SCROLLBAR=yes
+  DEFAULT_wxUSE_SLIDER=yes
+  DEFAULT_wxUSE_SPINBTN=yes
+  DEFAULT_wxUSE_SPINCTRL=yes
+  DEFAULT_wxUSE_SPLITTER=yes
+  DEFAULT_wxUSE_STATBMP=yes
+  DEFAULT_wxUSE_STATBOX=yes
+  DEFAULT_wxUSE_STATLINE=yes
+  DEFAULT_wxUSE_STATUSBAR=yes
+  DEFAULT_wxUSE_TAB_DIALOG=yes
+  DEFAULT_wxUSE_TOGGLEBTN=yes
+  DEFAULT_wxUSE_TOOLBAR=yes
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
+  DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
+  DEFAULT_wxUSE_TOOLTIPS=yes
+  DEFAULT_wxUSE_TREECTRL=yes
+  DEFAULT_wxUSE_POPUPWIN=yes
+elif test "$wxUSE_CONTROLS" = "no"; then
+  DEFAULT_wxUSE_ACCEL=no
+  DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_BUTTON=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_COMBOBOX=no
+  DEFAULT_wxUSE_CHECKBOX=no
+  DEFAULT_wxUSE_CHECKLISTBOX=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_PROPSHEET=no
+  DEFAULT_wxUSE_RADIOBOX=no
+  DEFAULT_wxUSE_RADIOBTN=no
+  DEFAULT_wxUSE_SASH=no
+  DEFAULT_wxUSE_SCROLLBAR=no
+  DEFAULT_wxUSE_SLIDER=no
+  DEFAULT_wxUSE_SPINBTN=no
+  DEFAULT_wxUSE_SPINCTRL=no
+  DEFAULT_wxUSE_SPLITTER=no
+  DEFAULT_wxUSE_STATBMP=no
+  DEFAULT_wxUSE_STATBOX=no
+  DEFAULT_wxUSE_STATLINE=no
+  DEFAULT_wxUSE_STATUSBAR=no
+  DEFAULT_wxUSE_TAB_DIALOG=no
+  DEFAULT_wxUSE_TOGGLEBTN=no
+  DEFAULT_wxUSE_TOOLBAR=no
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_POPUPWIN=no
+fi
+
+
+          echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
+echo "configure:5099: checking for --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"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_sash='wxUSE_SASH=yes'
+                            ac_cv_use_accel='wxUSE_ACCEL=yes'
                           else
-                            ac_cv_use_sash='wxUSE_SASH=no'
+                            ac_cv_use_accel='wxUSE_ACCEL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
+                          ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
                         
 fi
 
 
-          eval "$ac_cv_use_sash"
+          eval "$ac_cv_use_accel"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SASH" = yes; then
+          if test "$wxUSE_ACCEL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4601: checking "for --enable-scrollbar"" >&5
+          echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
+echo "configure:5138: checking for --enable-button" >&5
           no_cache=0
-          # Check whether --enable-scrollbar or --disable-scrollbar was given.
-if test "${enable_scrollbar+set}" = set; then
-  enableval="$enable_scrollbar"
+          # 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_scrollbar='wxUSE_SCROLLBAR=yes'
+                            ac_cv_use_button='wxUSE_BUTTON=yes'
                           else
-                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
+                            ac_cv_use_button='wxUSE_BUTTON=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
+                          ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON
                         
 fi
 
 
-          eval "$ac_cv_use_scrollbar"
+          eval "$ac_cv_use_button"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SCROLLBAR" = yes; then
+          if test "$wxUSE_BUTTON" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
-echo "configure:4640: checking "for --enable-slider"" >&5
+          echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
+echo "configure:5177: checking for --enable-bmpbutton" >&5
           no_cache=0
-          # Check whether --enable-slider or --disable-slider was given.
-if test "${enable_slider+set}" = set; then
-  enableval="$enable_slider"
+          # 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_slider='wxUSE_SLIDER=yes'
+                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                           else
-                            ac_cv_use_slider='wxUSE_SLIDER=no'
+                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
+                          ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
                         
 fi
 
 
-          eval "$ac_cv_use_slider"
+          eval "$ac_cv_use_bmpbutton"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SLIDER" = yes; then
+          if test "$wxUSE_BMPBUTTON" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6
-echo "configure:4679: checking "for --enable-spinbtn"" >&5
+          echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
+echo "configure:5216: checking for --enable-calendar" >&5
           no_cache=0
-          # Check whether --enable-spinbtn or --disable-spinbtn was given.
-if test "${enable_spinbtn+set}" = set; then
-  enableval="$enable_spinbtn"
+          # 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_spinbtn='wxUSE_SPINBTN=yes'
+                            ac_cv_use_calendar='wxUSE_CALCTRL=yes'
                           else
-                            ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
+                            ac_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
+                          ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL
                         
 fi
 
 
-          eval "$ac_cv_use_spinbtn"
+          eval "$ac_cv_use_calendar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SPINBTN" = yes; then
+          if test "$wxUSE_CALCTRL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6
-echo "configure:4718: checking "for --enable-spinctrl"" >&5
+          echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
+echo "configure:5255: checking for --enable-caret" >&5
           no_cache=0
-          # Check whether --enable-spinctrl or --disable-spinctrl was given.
-if test "${enable_spinctrl+set}" = set; then
-  enableval="$enable_spinctrl"
+          # 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_spinctrl='wxUSE_SPINCTRL=yes'
+                            ac_cv_use_caret='wxUSE_CARET=yes'
                           else
-                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
+                            ac_cv_use_caret='wxUSE_CARET=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
+                          ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
                         
 fi
 
 
-          eval "$ac_cv_use_spinctrl"
+          eval "$ac_cv_use_caret"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SPINCTRL" = yes; then
+          if test "$wxUSE_CARET" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6
-echo "configure:4757: checking "for --enable-splitter"" >&5
+          echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
+echo "configure:5294: checking for --enable-checkbox" >&5
           no_cache=0
-          # Check whether --enable-splitter or --disable-splitter was given.
-if test "${enable_splitter+set}" = set; then
-  enableval="$enable_splitter"
+          # 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_splitter='wxUSE_SPLITTER=yes'
+                            ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
                           else
-                            ac_cv_use_splitter='wxUSE_SPLITTER=no'
+                            ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
+                          ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
                         
 fi
 
 
-          eval "$ac_cv_use_splitter"
+          eval "$ac_cv_use_checkbox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SPLITTER" = yes; then
+          if test "$wxUSE_CHECKBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6
-echo "configure:4796: checking "for --enable-statbmp"" >&5
+          echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
+echo "configure:5333: checking for --enable-checklst" >&5
           no_cache=0
-          # Check whether --enable-statbmp or --disable-statbmp was given.
-if test "${enable_statbmp+set}" = set; then
-  enableval="$enable_statbmp"
+          # 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_statbmp='wxUSE_STATBMP=yes'
+                            ac_cv_use_checklst='wxUSE_CHECKLST=yes'
                           else
-                            ac_cv_use_statbmp='wxUSE_STATBMP=no'
+                            ac_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
+                          ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
                         
 fi
 
 
-          eval "$ac_cv_use_statbmp"
+          eval "$ac_cv_use_checklst"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATBMP" = yes; then
+          if test "$wxUSE_CHECKLST" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6
-echo "configure:4835: checking "for --enable-statbox"" >&5
+          echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
+echo "configure:5372: checking for --enable-choice" >&5
           no_cache=0
-          # Check whether --enable-statbox or --disable-statbox was given.
-if test "${enable_statbox+set}" = set; then
-  enableval="$enable_statbox"
+          # 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_statbox='wxUSE_STATBOX=yes'
+                            ac_cv_use_choice='wxUSE_CHOICE=yes'
                           else
-                            ac_cv_use_statbox='wxUSE_STATBOX=no'
+                            ac_cv_use_choice='wxUSE_CHOICE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+                          ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
                         
 fi
 
 
-          eval "$ac_cv_use_statbox"
+          eval "$ac_cv_use_choice"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATBOX" = yes; then
+          if test "$wxUSE_CHOICE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6
-echo "configure:4874: checking "for --enable-statline"" >&5
+          echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
+echo "configure:5411: checking for --enable-combobox" >&5
           no_cache=0
-          # Check whether --enable-statline or --disable-statline was given.
-if test "${enable_statline+set}" = set; then
-  enableval="$enable_statline"
+          # 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_statline='wxUSE_STATLINE=yes'
+                            ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
                           else
-                            ac_cv_use_statline='wxUSE_STATLINE=no'
+                            ac_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+                          ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
                         
 fi
 
 
-          eval "$ac_cv_use_statline"
+          eval "$ac_cv_use_combobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATLINE" = yes; then
+          if test "$wxUSE_COMBOBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6
-echo "configure:4913: checking "for --enable-statusbar"" >&5
+          echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
+echo "configure:5450: checking for --enable-gauge" >&5
           no_cache=0
-          # Check whether --enable-statusbar or --disable-statusbar was given.
-if test "${enable_statusbar+set}" = set; then
-  enableval="$enable_statusbar"
+          # 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_statusbar='wxUSE_STATUSBAR=yes'
+                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
                           else
-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+                            ac_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
                         
 fi
 
 
-          eval "$ac_cv_use_statusbar"
+          eval "$ac_cv_use_gauge"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATUSBAR" = yes; then
+          if test "$wxUSE_GAUGE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6
-echo "configure:4952: checking "for --enable-tabdialog"" >&5
+          echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
+echo "configure:5489: checking for --enable-grid" >&5
           no_cache=0
-          # Check whether --enable-tabdialog or --disable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
-  enableval="$enable_tabdialog"
+          # 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_tabdialog='wxUSE_TABDIALOG=yes'
+                            ac_cv_use_grid='wxUSE_GRID=yes'
                           else
-                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+                            ac_cv_use_grid='wxUSE_GRID=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
                         
 fi
 
 
-          eval "$ac_cv_use_tabdialog"
+          eval "$ac_cv_use_grid"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TABDIALOG" = yes; then
+          if test "$wxUSE_GRID" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6
-echo "configure:4991: checking "for --enable-toolbar"" >&5
+          echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
+echo "configure:5528: checking for --enable-newgrid" >&5
           no_cache=0
-          # Check whether --enable-toolbar or --disable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
-  enableval="$enable_toolbar"
+          # Check whether --enable-newgrid or --disable-newgrid was given.
+if test "${enable_newgrid+set}" = set; then
+  enableval="$enable_newgrid"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                            ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
                           else
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                            ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+                          ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
                         
 fi
 
 
-          eval "$ac_cv_use_toolbar"
+          eval "$ac_cv_use_newgrid"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOOLBAR" = yes; then
+          if test "$wxUSE_NEW_GRID" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6
-echo "configure:5030: checking "for --enable-tbarnative"" >&5
+          echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
+echo "configure:5567: checking for --enable-imaglist" >&5
           no_cache=0
-          # Check whether --enable-tbarnative or --disable-tbarnative was given.
-if test "${enable_tbarnative+set}" = set; then
-  enableval="$enable_tbarnative"
+          # 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_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
                           else
-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${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
 
-                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+                          ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
                         
 fi
 
 
-          eval "$ac_cv_use_tbarnative"
+          eval "$ac_cv_use_imaglist"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
+          if test "$wxUSE_IMAGLIST" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6
-echo "configure:5069: checking "for --enable-tbarsmpl"" >&5
+          echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
+echo "configure:5606: checking for --enable-listbox" >&5
           no_cache=0
-          # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
-if test "${enable_tbarsmpl+set}" = set; then
-  enableval="$enable_tbarsmpl"
+          # 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_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+                            ac_cv_use_listbox='wxUSE_LISTBOX=yes'
                           else
-                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+                            ac_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+                          ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
                         
 fi
 
 
-          eval "$ac_cv_use_tbarsmpl"
+          eval "$ac_cv_use_listbox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
+          if test "$wxUSE_LISTBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6
-echo "configure:5108: checking "for --enable-treectrl"" >&5
+          echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
+echo "configure:5645: checking for --enable-listctrl" >&5
           no_cache=0
-          # Check whether --enable-treectrl or --disable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
-  enableval="$enable_treectrl"
+          # 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_treectrl='wxUSE_TREECTRL=yes'
+                            ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                           else
-                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+                            ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+                          ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
                         
 fi
 
 
-          eval "$ac_cv_use_treectrl"
+          eval "$ac_cv_use_listctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TREECTRL" = yes; then
+          if test "$wxUSE_LISTCTRL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6
-echo "configure:5149: checking "for --enable-commondlg"" >&5
+          echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
+echo "configure:5684: checking for --enable-notebook" >&5
           no_cache=0
-          # Check whether --enable-commondlg or --disable-commondlg was given.
-if test "${enable_commondlg+set}" = set; then
-  enableval="$enable_commondlg"
+          # 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_commondlg='wxUSE_COMMONDLGS=yes'
+                            ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                           else
-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                            ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+                          ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
                         
 fi
 
 
-          eval "$ac_cv_use_commondlg"
+          eval "$ac_cv_use_notebook"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_COMMONDLGS" = yes; then
+          if test "$wxUSE_NOTEBOOK" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6
-echo "configure:5188: checking "for --enable-dirdlg"" >&5
+          echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
+echo "configure:5723: checking for --enable-propsheet" >&5
           no_cache=0
-          # Check whether --enable-dirdlg or --disable-dirdlg was given.
-if test "${enable_dirdlg+set}" = set; then
-  enableval="$enable_dirdlg"
+          # 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_dirdlg='wxUSE_DIRDLG=yes'
+                            ac_cv_use_propsheet='wxUSE_PROPSHEET=yes'
                           else
-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                            ac_cv_use_propsheet='wxUSE_PROPSHEET=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
+                          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_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+                          ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET
                         
 fi
 
 
-          eval "$ac_cv_use_dirdlg"
+          eval "$ac_cv_use_propsheet"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DIRDLG" = yes; then
+          if test "$wxUSE_PROPSHEET" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6
-echo "configure:5227: checking "for --enable-textdlg"" >&5
+          echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
+echo "configure:5762: checking for --enable-radiobox" >&5
           no_cache=0
-          # Check whether --enable-textdlg or --disable-textdlg was given.
-if test "${enable_textdlg+set}" = set; then
-  enableval="$enable_textdlg"
+          # 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_textdlg='wxUSE_TEXTDLG=yes'
+                            ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                           else
-                            ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
+                            ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
+                          ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
                         
 fi
 
 
-          eval "$ac_cv_use_textdlg"
+          eval "$ac_cv_use_radiobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TEXTDLG" = yes; then
+          if test "$wxUSE_RADIOBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6
-echo "configure:5266: checking "for --enable-tipdlg"" >&5
+          echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
+echo "configure:5801: checking for --enable-radiobtn" >&5
           no_cache=0
-          # Check whether --enable-tipdlg or --disable-tipdlg was given.
-if test "${enable_tipdlg+set}" = set; then
-  enableval="$enable_tipdlg"
+          # 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_tipdlg='wxUSE_STARTUP_TIPS=yes'
+                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                           else
-                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
+                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
+                          ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
                         
 fi
 
 
-          eval "$ac_cv_use_tipdlg"
+          eval "$ac_cv_use_radiobtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STARTUP_TIPS" = yes; then
+          if test "$wxUSE_RADIOBTN" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6
-echo "configure:5305: checking "for --enable-progressdlg"" >&5
+          echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
+echo "configure:5840: checking for --enable-sash" >&5
           no_cache=0
-          # Check whether --enable-progressdlg or --disable-progressdlg was given.
-if test "${enable_progressdlg+set}" = set; then
-  enableval="$enable_progressdlg"
+          # 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_progressdlg='wxUSE_PROGRESSDLG=yes'
+                            ac_cv_use_sash='wxUSE_SASH=yes'
                           else
-                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
+                            ac_cv_use_sash='wxUSE_SASH=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
+                          ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
                         
 fi
 
 
-          eval "$ac_cv_use_progressdlg"
+          eval "$ac_cv_use_sash"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PROGRESSDLG" = yes; then
+          if test "$wxUSE_SASH" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6
-echo "configure:5344: checking "for --enable-miniframe"" >&5
+          echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
+echo "configure:5879: checking for --enable-scrollbar" >&5
           no_cache=0
-          # Check whether --enable-miniframe or --disable-miniframe was given.
-if test "${enable_miniframe+set}" = set; then
-  enableval="$enable_miniframe"
+          # 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_miniframe='wxUSE_MINIFRAME=yes'
+                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                           else
-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                          ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
                         
 fi
 
 
-          eval "$ac_cv_use_miniframe"
+          eval "$ac_cv_use_scrollbar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_MINIFRAME" = yes; then
+          if test "$wxUSE_SCROLLBAR" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6
-echo "configure:5383: checking "for --enable-html"" >&5
+          echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
+echo "configure:5918: checking for --enable-slider" >&5
           no_cache=0
-          # Check whether --enable-html or --disable-html was given.
-if test "${enable_html+set}" = set; then
-  enableval="$enable_html"
+          # 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_html='wxUSE_HTML=yes'
+                            ac_cv_use_slider='wxUSE_SLIDER=yes'
                           else
-                            ac_cv_use_html='wxUSE_HTML=no'
+                            ac_cv_use_slider='wxUSE_SLIDER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                          ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
                         
 fi
 
 
-          eval "$ac_cv_use_html"
+          eval "$ac_cv_use_slider"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_HTML" = yes; then
+          if test "$wxUSE_SLIDER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
-echo "configure:5422: checking "for --enable-tooltips"" >&5
+          echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
+echo "configure:5957: checking for --enable-spinbtn" >&5
           no_cache=0
-          # Check whether --enable-tooltips or --disable-tooltips was given.
-if test "${enable_tooltips+set}" = set; then
-  enableval="$enable_tooltips"
+          # 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_tooltips='wxUSE_TOOLTIPS=yes'
+                            ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                           else
-                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
+                            ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
+                          ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
                         
 fi
 
 
-          eval "$ac_cv_use_tooltips"
+          eval "$ac_cv_use_spinbtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOOLTIPS" = yes; then
+          if test "$wxUSE_SPINBTN" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6
-echo "configure:5461: checking "for --enable-splines"" >&5
+          echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
+echo "configure:5996: checking for --enable-spinctrl" >&5
           no_cache=0
-          # Check whether --enable-splines or --disable-splines was given.
-if test "${enable_splines+set}" = set; then
-  enableval="$enable_splines"
+          # 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_splines='wxUSE_SPLINES=yes'
+                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                           else
-                            ac_cv_use_splines='wxUSE_SPLINES=no'
+                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
+                          ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
                         
 fi
 
 
-          eval "$ac_cv_use_splines"
+          eval "$ac_cv_use_spinctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SPLINES" = yes; then
+          if test "$wxUSE_SPINCTRL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6
-echo "configure:5500: checking "for --enable-validators"" >&5
+          echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
+echo "configure:6035: checking for --enable-splitter" >&5
           no_cache=0
-          # Check whether --enable-validators or --disable-validators was given.
-if test "${enable_validators+set}" = set; then
-  enableval="$enable_validators"
+          # 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_validators='wxUSE_VALIDATORS=yes'
+                            ac_cv_use_splitter='wxUSE_SPLITTER=yes'
                           else
-                            ac_cv_use_validators='wxUSE_VALIDATORS=no'
+                            ac_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS
+                          ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
                         
 fi
 
 
-          eval "$ac_cv_use_validators"
+          eval "$ac_cv_use_splitter"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_VALIDATORS" = yes; then
+          if test "$wxUSE_SPLITTER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6
-echo "configure:5539: checking "for --enable-busyinfo"" >&5
+          echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
+echo "configure:6074: checking for --enable-statbmp" >&5
           no_cache=0
-          # Check whether --enable-busyinfo or --disable-busyinfo was given.
-if test "${enable_busyinfo+set}" = set; then
-  enableval="$enable_busyinfo"
+          # 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_busyinfo='wxUSE_BUSYINFO=yes'
+                            ac_cv_use_statbmp='wxUSE_STATBMP=yes'
                           else
-                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
+                            ac_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
+                          ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
                         
 fi
 
 
-          eval "$ac_cv_use_busyinfo"
+          eval "$ac_cv_use_statbmp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_BUSYINFO" = yes; then
+          if test "$wxUSE_STATBMP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6
-echo "configure:5580: checking "for --enable-gif"" >&5
+          echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
+echo "configure:6113: checking for --enable-statbox" >&5
           no_cache=0
-          # Check whether --enable-gif or --disable-gif was given.
-if test "${enable_gif+set}" = set; then
-  enableval="$enable_gif"
+          # 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_gif='wxUSE_GIF=yes'
+                            ac_cv_use_statbox='wxUSE_STATBOX=yes'
                           else
-                            ac_cv_use_gif='wxUSE_GIF=no'
+                            ac_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF
+                          ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
                         
 fi
 
 
-          eval "$ac_cv_use_gif"
+          eval "$ac_cv_use_statbox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_GIF" = yes; then
+          if test "$wxUSE_STATBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:5619: checking "for --enable-pcx"" >&5
+          echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
+echo "configure:6152: checking for --enable-statline" >&5
           no_cache=0
-          # Check whether --enable-pcx or --disable-pcx was given.
-if test "${enable_pcx+set}" = set; then
-  enableval="$enable_pcx"
+          # 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_pcx='wxUSE_PCX=yes'
+                            ac_cv_use_statline='wxUSE_STATLINE=yes'
                           else
-                            ac_cv_use_pcx='wxUSE_PCX=no'
+                            ac_cv_use_statline='wxUSE_STATLINE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX
+                          ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
                         
 fi
 
 
-          eval "$ac_cv_use_pcx"
+          eval "$ac_cv_use_statline"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PCX" = yes; then
+          if test "$wxUSE_STATLINE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:5658: checking "for --enable-pnm"" >&5
+          echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
+echo "configure:6191: checking for --enable-stattext" >&5
           no_cache=0
-          # Check whether --enable-pnm or --disable-pnm was given.
-if test "${enable_pnm+set}" = set; then
-  enableval="$enable_pnm"
+          # 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_pnm='wxUSE_PNM=yes'
+                            ac_cv_use_stattext='wxUSE_STATTEXT=yes'
                           else
-                            ac_cv_use_pnm='wxUSE_PNM=no'
+                            ac_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM
+                          ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
                         
 fi
 
 
-          eval "$ac_cv_use_pnm"
+          eval "$ac_cv_use_stattext"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PNM" = yes; then
+          if test "$wxUSE_STATTEXT" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
+          echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
+echo "configure:6230: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+                          else
+                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+                        
 fi
 
 
-          echo "saving argument cache $wx_arg_cache_file"
-          mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
+          eval "$ac_cv_use_statusbar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STATUSBAR" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
         
 
+          echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
+echo "configure:6269: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
+                          else
+                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:5705: checking for toolkit" >&5
+                          ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+                        
+fi
 
-if test "$wxUSE_GUI" = "yes"; then
 
-if test "$USE_BEOS" = 1; then
-    { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }
-fi
+          eval "$ac_cv_use_tabdialog"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+          fi
 
-if test "$TOOLKIT_GIVEN" = 1; then
-    for toolkit in `echo $ALL_TOOLKITS`; do
-    var=wxUSE_$toolkit
-    eval "value=\$${var}"
-    eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
-  done
+          if test "$wxUSE_TABDIALOG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
+echo "configure:6308: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
+                          else
+                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
+                          fi
+                        
 else
-    for toolkit in `echo $ALL_TOOLKITS`; do
-    if test "$has_toolkit_in_cache" != 1; then
-      var=DEFAULT_DEFAULT_wxUSE_$toolkit
-    else
-      var=DEFAULT_wxUSE_$toolkit
-    fi
-    eval "wxUSE_$toolkit=\$${var}"
-  done
-fi
+  
+                          LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+                          ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
+                        
+fi
 
-case "${host}" in
-  *-pc-os2_emx )
-    NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
-    # PATH_IFS is autodetected by OS/2's configure (usually ';')
-    LEX_STEM="lexyy"
-  ;;
-  *)
-    PATH_IFS=':'
-    LEX_STEM="lex.yy"
-    PROGRAM_EXT=
-  ;;
-esac
 
-case "$NUM_TOOLKITS" in
-  1)
-  ;;
-  0)
-    { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; }
-  ;;
-  *)
-    { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; }
-esac
+          eval "$ac_cv_use_textctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+          fi
 
-for toolkit in `echo $ALL_TOOLKITS`; do
-  var=wxUSE_$toolkit
-  eval "value=\$${var}"
-  if test "x$value" != x; then
-    cache_var=CACHE_$toolkit
-    eval "cache=\$${cache_var}"
-    if test "$cache" = 1; then
-      echo "$var=$value" >> ${wx_arg_cache_file}
-    fi
-    if test "$value" = 1; then
-      echo "$ac_t""`echo $toolkit | tr A-Z a-z`" 1>&6
-    fi
-  fi
-done
+          if test "$wxUSE_TEXTCTRL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
+          echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
+echo "configure:6347: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+                          else
+                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+                          fi
+                        
 else
-    PATH_IFS=':'
-    echo "$ac_t""base only" 1>&6
+  
+                          LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
+                        
 fi
 
 
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# 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.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
+          eval "$ac_cv_use_togglebtn"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOGGLEBTN" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
+echo "configure:6386: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                          else
+                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+                        
+fi
+
+
+          eval "$ac_cv_use_toolbar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLBAR" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
+echo "configure:6425: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                          else
+                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+                        
+fi
+
+
+          eval "$ac_cv_use_tbarnative"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
+echo "configure:6464: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+                          else
+                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+                        
+fi
+
+
+          eval "$ac_cv_use_tbarsmpl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
+echo "configure:6503: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
+                          else
+                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+                        
+fi
+
+
+          eval "$ac_cv_use_treectrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TREECTRL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
+echo "configure:6542: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                          else
+                            ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN
+                        
+fi
+
+
+          eval "$ac_cv_use_popupwin"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_POPUPWIN" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
+echo "configure:6583: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+                          else
+                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+                        
+fi
+
+
+          eval "$ac_cv_use_commondlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_COMMONDLGS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
+echo "configure:6622: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
+                          else
+                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_choicedlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CHOICEDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
+echo "configure:6661: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
+                          else
+                            ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_coldlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_COLOURDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6700: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
+                          else
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_filedlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FILEDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6739: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_filedlg='wxUSE_FINDREPLDLG=yes'
+                          else
+                            ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_filedlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FINDREPLDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
+echo "configure:6778: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
+                          else
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_fontdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FONTDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
+echo "configure:6817: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+                          else
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_dirdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DIRDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
+echo "configure:6856: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
+                          else
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_msgdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MSGDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
+echo "configure:6895: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
+                          else
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_numberdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_NUMBERDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6
+echo "configure:6934: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_splash='wxUSE_SPLASH=yes'
+                          else
+                            ac_cv_use_splash='wxUSE_SPLASH=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH
+                        
+fi
+
+
+          eval "$ac_cv_use_splash"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SPLASH" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
+echo "configure:6973: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
+                          else
+                            ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_textdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TEXTDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
+echo "configure:7012: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
+                          else
+                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
+                        
+fi
+
+
+          eval "$ac_cv_use_tipdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STARTUP_TIPS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
+echo "configure:7051: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
+                          else
+                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_progressdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PROGRESSDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
+echo "configure:7090: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
+                          else
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_wizarddlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WIZARDDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
+echo "configure:7131: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_menus='wxUSE_MENUS=yes'
+                          else
+                            ac_cv_use_menus='wxUSE_MENUS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS
+                        
+fi
+
+
+          eval "$ac_cv_use_menus"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MENUS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
+echo "configure:7170: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                          else
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                        
+fi
+
+
+          eval "$ac_cv_use_miniframe"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MINIFRAME" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
+echo "configure:7209: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
+                          else
+                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
+                        
+fi
+
+
+          eval "$ac_cv_use_tooltips"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLTIPS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
+echo "configure:7248: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_splines='wxUSE_SPLINES=yes'
+                          else
+                            ac_cv_use_splines='wxUSE_SPLINES=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
+                        
+fi
+
+
+          eval "$ac_cv_use_splines"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SPLINES" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
+echo "configure:7287: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_validators='wxUSE_VALIDATORS=yes'
+                          else
+                            ac_cv_use_validators='wxUSE_VALIDATORS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS
+                        
+fi
+
+
+          eval "$ac_cv_use_validators"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_VALIDATORS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
+echo "configure:7326: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
+                          else
+                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
+                        
+fi
+
+
+          eval "$ac_cv_use_busyinfo"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_BUSYINFO" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
+echo "configure:7365: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
+                          else
+                            ac_cv_use_joystick='wxUSE_JOYSTICK=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK
+                        
+fi
+
+
+          eval "$ac_cv_use_joystick"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_JOYSTICK" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:7404: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
+                          else
+                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+                        
+fi
+
+
+          eval "$ac_cv_use_metafile"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_METAFILE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
+echo "configure:7443: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
+                          else
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE
+                        
+fi
+
+
+          eval "$ac_cv_use_dragimage"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DRAGIMAGE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6
+echo "configure:7484: checking for --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"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE
+                        
+fi
+
+
+          eval "$ac_cv_use_palette"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PALETTE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
+echo "configure:7523: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_image='wxUSE_IMAGE=yes'
+                          else
+                            ac_cv_use_image='wxUSE_IMAGE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE
+                        
+fi
+
+
+          eval "$ac_cv_use_image"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_IMAGE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
+echo "configure:7562: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_gif='wxUSE_GIF=yes'
+                          else
+                            ac_cv_use_gif='wxUSE_GIF=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF
+                        
+fi
+
+
+          eval "$ac_cv_use_gif"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GIF" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
+echo "configure:7601: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_pcx='wxUSE_PCX=yes'
+                          else
+                            ac_cv_use_pcx='wxUSE_PCX=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX
+                        
+fi
+
+
+          eval "$ac_cv_use_pcx"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PCX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7640: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_pnm='wxUSE_PNM=yes'
+                          else
+                            ac_cv_use_pnm='wxUSE_PNM=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM
+                        
+fi
+
+
+          eval "$ac_cv_use_pnm"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PNM" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7679: checking for --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"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_pnm='wxUSE_XPM=yes'
+                          else
+                            ac_cv_use_pnm='wxUSE_XPM=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_pnm='wxUSE_XPM='$DEFAULT_wxUSE_XPM
+                        
+fi
+
+
+          eval "$ac_cv_use_pnm"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_XPM" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+fi
+
+
+          echo "saving argument cache $wx_arg_cache_file"
+          mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
+        
+
+
+echo $ac_n "checking for toolkit""... $ac_c" 1>&6
+echo "configure:7726: checking for toolkit" >&5
+
+if test "$wxUSE_GUI" = "yes"; then
+
+    if test "$USE_BEOS" = 1; then
+        { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }
+    fi
+
+    if test "$TOOLKIT_GIVEN" = 1; then
+            for toolkit in `echo $ALL_TOOLKITS`; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
+        eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+      done
+    else
+            for toolkit in `echo $ALL_TOOLKITS`; do
+        if test "$has_toolkit_in_cache" != 1; then
+          var=DEFAULT_DEFAULT_wxUSE_$toolkit
+        else
+          var=DEFAULT_wxUSE_$toolkit
+        fi
+        eval "wxUSE_$toolkit=\$${var}"
+      done
+    fi
+
+            NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0}  \
+                  + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} \
+                  + ${wxUSE_MGL:-0}`
+
+                case "${host}" in
+      *-pc-os2_emx )
+        # PATH_IFS is autodetected by OS/2's configure (usually ';')
+        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+        LEX_STEM="lexyy"
+      ;;
+      *)
+        PATH_IFS=':'
+        LEX_STEM="lex.yy"
+      ;;
+    esac
+
+    case "$NUM_TOOLKITS" in
+      1)
+      ;;
+      0)
+        { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; }
+      ;;
+      *)
+        { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; }
+    esac
+
+        for toolkit in `echo $ALL_TOOLKITS`; do
+      var=wxUSE_$toolkit
+      eval "value=\$${var}"
+      if test "x$value" != x; then
+        cache_var=CACHE_$toolkit
+        eval "cache=\$${cache_var}"
+        if test "$cache" = 1; then
+          echo "$var=$value" >> ${wx_arg_cache_file}
+        fi
+        if test "$value" = 1; then
+          toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+          echo "$ac_t""$toolkit_echo" 1>&6
+        fi
+      fi
+    done
+else
+    PATH_IFS=':'
+    echo "$ac_t""base ($host_alias hosted) only" 1>&6
+fi
+
+
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# 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.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+
+if test "$build" != "$host" ; then
+    if test "$USE_WIN32" = 1 ; then
+        CC=$host_alias-gcc
+        CXX=$host_alias-c++
+        AR=$host_alias-ar
+        RANLIB=$host_alias-ranlib
+        DLLTOOL=$host_alias-dlltool
+        RESCOMP=$host_alias-windres
+        LD=$host_alias-ld
+        NM=$host_alias-nm
+        STRIP=$host_alias-strip
+    else
+        { echo "configure: error: $build_alias -> $host_alias cross compilation not supported yet." 1>&2; exit 1; }
+    fi
+fi
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:7865: 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
+  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
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:7895: 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
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:7946: 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
+  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
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:7978: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+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
+
+cat > conftest.$ac_ext << EOF
+
+#line 7989 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:7994: \"$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
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:8020: 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:8025: 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:8034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:8053: 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
+  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=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+
+
+CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:8088: 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
+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,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 8103 "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:8109: \"$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
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 8120 "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:8126: \"$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
+  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 8137 "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:8143: \"$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
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+echo "configure:8169: 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'"
+  cat > conftest.$ac_ext <<EOF
+#line 8175 "configure"
+#include "confdefs.h"
+#include <sgtty.h>
+Autoconf TIOCGETP
+EOF
+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
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=no
+fi
+rm -f conftest*
+
+
+  if test $ac_cv_prog_gcc_traditional = no; then
+    cat > conftest.$ac_ext <<EOF
+#line 8193 "configure"
+#include "confdefs.h"
+#include <termio.h>
+Autoconf TCGETA
+EOF
+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
+
+echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+  if test $ac_cv_prog_gcc_traditional = yes; then
+    CC="$CC -traditional"
+  fi
+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
+
+
+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:8229: 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
+  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
+CXX="$ac_cv_prog_CXX"
+if test -n "$CXX"; then
+  echo "$ac_t""$CXX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CXX" && break
+done
+test -n "$CXX" || CXX="gcc"
+
+
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:8261: 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 8272 "configure"
+#include "confdefs.h"
+
+int main(){return(0);}
+EOF
+if { (eval echo configure:8277: \"$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:8303: 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:8308: checking whether we are using GNU C++" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.C <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8317: \"$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
+
+echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+
+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:8336: 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=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS="$ac_save_CXXFLAGS"
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+
+
+CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
+
+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
+
+
+# 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:8381: 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
+  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
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+# Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8412: 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
+  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
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:8452: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  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"
+  fi
+fi
+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}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+# Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8508: 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
+  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
+STRIP="$ac_cv_prog_STRIP"
+if test -n "$STRIP"; then
+  echo "$ac_t""$STRIP" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
+echo "configure:8537: checking make for VPATH support" >&5
+cat - << EOF > confMake
+check : file
+	cp \$? \$@
+	cp \$? final_file
+EOF
+
+if test ! -d sub ; then
+  mkdir sub
+fi
+echo dummy > sub/file
+${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
+RESULT=$?
+rm -f sub/file check final_file confMake
+rmdir sub
+if test "$RESULT" = 0; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  { 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,
+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.
+" 1>&2; exit 1; }
+fi
+
+for ac_prog in 'bison -y' byacc
+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:8574: 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
+  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
+YACC="$ac_cv_prog_YACC"
+if test -n "$YACC"; then
+  echo "$ac_t""$YACC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+
+# Extract the first word of "flex", so it can be a program name with args.
+set dummy flex; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8608: 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
+  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
+LEX="$ac_cv_prog_LEX"
+if test -n "$LEX"; then
+  echo "$ac_t""$LEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$LEXLIB"
+then
+  case "$LEX" in
+  flex*) ac_lib=fl ;;
+  *) ac_lib=l ;;
+  esac
+  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
+echo "configure:8642: 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 8650 "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 yywrap();
+
+int main() {
+yywrap()
+; return 0; }
+EOF
+if { (eval echo configure:8661: \"$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
+  LEXLIB="-l$ac_lib"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:8685: checking whether ln -s works" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"
+else
+  ac_cv_prog_LN_S=ln
+fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+SEARCH_INCLUDE="\
+    /usr/local/include        \
+                              \
+    /usr/Motif-1.2/include    \
+    /usr/Motif-2.1/include    \
+                              \
+    /usr/include/Motif1.2     \
+    /opt/xpm/include/X11      \
+    /opt/GBxpm/include/       \
+    /opt/GBxpm/X11/include/   \
+                              \
+    /usr/Motif1.2/include     \
+    /usr/dt/include           \
+    /usr/openwin/include      \
+                              \
+    /usr/include/Xm           \
+                              \
+    /usr/X11R6/include        \
+    /usr/X11R6.4/include      \
+    /usr/X11R5/include        \
+    /usr/X11R4/include        \
+                              \
+    /usr/include/X11R6        \
+    /usr/include/X11R5        \
+    /usr/include/X11R4        \
+                              \
+    /usr/local/X11R6/include  \
+    /usr/local/X11R5/include  \
+    /usr/local/X11R4/include  \
+                              \
+    /usr/local/include/X11R6  \
+    /usr/local/include/X11R5  \
+    /usr/local/include/X11R4  \
+                              \
+    /usr/X11/include          \
+    /usr/include/X11          \
+    /usr/local/X11/include    \
+    /usr/local/include/X11    \
+                              \
+    /usr/X386/include         \
+    /usr/x386/include         \
+    /usr/XFree86/include/X11  \
+                              \
+    X:/XFree86/include        \
+    X:/XFree86/include/X11    \
+                              \
+    /usr/include/gtk          \
+    /usr/local/include/gtk    \
+    /usr/include/glib         \
+    /usr/local/include/glib   \
+                              \
+    /usr/include/qt           \
+    /usr/local/include/qt     \
+                              \
+    /usr/include/windows      \
+    /usr/include/wine         \
+    /usr/local/include/wine   \
+                              \
+    /usr/unsupported/include  \
+    /usr/athena/include       \
+    /usr/local/x11r5/include  \
+    /usr/lpp/Xamples/include  \
+                              \
+    /usr/openwin/share/include \
+                               \
+    /usr/include"
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+
+
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# 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.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
       -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
     ;;
   *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+
+
+REGEX_INCLUDE=
+if test "$wxUSE_REGEX" != "no"; then
+            ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for regex.h""... $ac_c" 1>&6
+echo "configure:8830: 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 8835 "configure"
+#include "confdefs.h"
+#include <regex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8840: \"$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
+  for ac_func in regcomp
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:8859: 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 8864 "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:8887: \"$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
+  echo "$ac_t""no" 1>&6
+fi
+
+
+    if test "x$ac_cv_func_regcomp" != "xyes"; then
+                        if test "$wxUSE_REGEX" = "sys"; then
+            { echo "configure: error: system regex library not found! Use --with-regex to use the built-in regex library." 1>&2; exit 1; }
+        fi
+
+                REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+    fi
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_REGEX 1
+EOF
+
+fi
+
+
+AFMINSTALL=
+
+TOOLKIT=
+TOOLKIT_INCLUDE=
+WIDGET_SET=
+
+if test "$USE_WIN32" = 1 ; then
+    for ac_hdr in w32api.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:8942: 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 8947 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8952: \"$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
+
+    ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+echo "configure:8980: checking for windows.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 8985 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8990: \"$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
+
+        { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+    
+fi
+
+
+        echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6
+echo "configure:9016: checking if w32api has good enough MSIE support" >&5
+if eval "test \"`echo '$''{'wx_cv_w32api_win_ie'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+      cat > conftest.$ac_ext <<EOF
+#line 9022 "configure"
+#include "confdefs.h"
+#include <w32api.h>
+int main() {
+
+                       #define wxCHECK_W32API_VERSION( major, minor ) \
+                       ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
+                       && ( ( __W32API_MAJOR_VERSION > (major) ) \
+                       || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
+
+                       #if !wxCHECK_W32API_VERSION(1,1)
+                       #error You need w32api 1.1 or newer
+                       #endif
+                     
+; return 0; }
+EOF
+if { (eval echo configure:9038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        wx_cv_w32api_win_ie=yes
+                        CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400"
+                     
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        wx_cv_w32api_win_ie=no
+                     
+fi
+rm -f conftest*
+    
+fi
+
+echo "$ac_t""$wx_cv_w32api_win_ie" 1>&6
+
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+
+        if test "$wxUSE_CYGWIN" = 1; then
+        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+    fi
+
+        if test "$wxUSE_ODBC" = "yes" ; then
+        LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+    fi
+
+                        if test "$wxUSE_MINGW" = 1; then
+        LDFLAGS="$LDFLAGS -mwindows"
+    fi
+
+    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+fi
+
+if test "$wxUSE_GUI" = "yes"; then
+    USE_GUI=1
+
+    GUI_TK_LIBRARY=
+
+    WXGTK12=
+    WXGTK127=
+    WXGTK20=
+
+    if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+        TOOLKIT=MSW
+        GUIDIST=MSW_DIST
+    fi
+
+    if test "$wxUSE_GTK" = 1; then
+        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:9092: checking for GTK+ version" >&5
+
+        gtk_version_cached=1
+        if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+                                                gtk_version_cached=0
+                echo "$ac_t""""" 1>&6
+
+                wx_cv_lib_gtk=
+                if test "x$wxUSE_GTK2" = "xyes"; 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=""
+fi
+
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+if test "${with_gtk_exec_prefix+set}" = set; then
+  withval="$with_gtk_exec_prefix"
+  gtk_config_exec_prefix="$withval"
+else
+  gtk_config_exec_prefix=""
+fi
+
+# Check whether --enable-gtktest or --disable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+  enableval="$enable_gtktest"
+  :
+else
+  enable_gtktest=yes
+fi
+
+
+  for module in . 
+  do
+      case "$module" in
+         gthread)
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_exec_prefix/bin/gtk-config-2.0
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_prefix/bin/gtk-config-2.0
+     fi
+  fi
+
+  # Extract the first word of "gtk-config-2.0", so it can be a program name with args.
+set dummy gtk-config-2.0; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9154: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$GTK_CONFIG_2_0" in
+  /*)
+  ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GTK_CONFIG_2_0="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GTK_CONFIG_2_0" && ac_cv_path_GTK_CONFIG_2_0="no"
+  ;;
+esac
+fi
+GTK_CONFIG_2_0="$ac_cv_path_GTK_CONFIG_2_0"
+if test -n "$GTK_CONFIG_2_0"; then
+  echo "$ac_t""$GTK_CONFIG_2_0" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  min_gtk_version=1.3.1
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:9189: checking for GTK - version >= $min_gtk_version" >&5
+  no_gtk=""
+  if test "$GTK_CONFIG_2_0" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG_2_0 $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG_2_0 $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+      rm -f conf.gtktest
+      if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9212 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config-2.0 --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-2.0 was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
+      printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    }
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+               major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config-2.0 shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG_2_0 environment to point to the\n");
+        printf("*** correct copy of gtk-config-2.0. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+
+EOF
+if { (eval echo configure:9290: \"$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*
+  no_gtk=yes
+fi
+rm -fr conftest*
+fi
+
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" 1>&6
+     wx_cv_lib_gtk=2.0
+  else
+     echo "$ac_t""no" 1>&6
+     if test "$GTK_CONFIG_2_0" = "no" ; then
+       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
+       echo "*** full path to gtk-config-2.0."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          cat > conftest.$ac_ext <<EOF
+#line 9324 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int main() {
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+; return 0; }
+EOF
+if { (eval echo configure:9334: \"$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 "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+          echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" 
+else
+  echo "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 "*** may want to edit the gtk-config-2.0 script: $GTK_CONFIG_2_0" 
+fi
+rm -f conftest*
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     gthread
+  fi
+  
+  
+  rm -f conf.gtktest
+
+                fi
+
+                if test -z "$wx_cv_lib_gtk"; then
+                    
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  # Extract the first word of "gtk-config", so it can be a program name with args.
+set dummy gtk-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9392: 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
+  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 dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
+  ;;
+esac
+fi
+GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
+if test -n "$GTK_CONFIG"; then
+  echo "$ac_t""$GTK_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  min_gtk_version=1.2.7
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:9427: checking for GTK - version >= $min_gtk_version" >&5
+  no_gtk=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK_CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs gthread`
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+    if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9440 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <gtk/gtkfeatures.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+   if ((GTK_MAJOR_VERSION != gtk_major_version) ||
+       (GTK_MINOR_VERSION != gtk_minor_version) ||
+       (GTK_MICRO_VERSION != gtk_micro_version)) {
+     printf("Headers vs. library version mismatch!\n");
+     exit(1);
+   }
+
+   if (gtk_minor_version == 1) return FALSE;
+
+   return !((gtk_major_version > major) ||
+    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
+
+EOF
+if { (eval echo configure:9473: \"$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*
+  no_gtk=yes
+fi
+rm -fr conftest*
+fi
+
+     CFLAGS="$ac_save_CFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk=yes
+  fi
+  if test "x$no_gtk" = x ; then
+     echo "$ac_t""yes" 1>&6
+     wx_cv_lib_gtk=1.2.7
+  else
+     echo "$ac_t""no" 1>&6
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     :
+  fi
+  
+  
+
+                fi
+
+                if test -z "$wx_cv_lib_gtk"; then
+                    
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  # Extract the first word of "gtk-config", so it can be a program name with args.
+set dummy gtk-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9522: 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
+  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 dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
+  ;;
+esac
+fi
+GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
+if test -n "$GTK_CONFIG"; then
+  echo "$ac_t""$GTK_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  min_gtk_version=1.2.3
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:9557: checking for GTK - version >= $min_gtk_version" >&5
+  no_gtk=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK_CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs gthread`
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+    if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9570 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <gtk/gtkfeatures.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+   if ((GTK_MAJOR_VERSION != gtk_major_version) ||
+       (GTK_MINOR_VERSION != gtk_minor_version) ||
+       (GTK_MICRO_VERSION != gtk_micro_version)) {
+     printf("Headers vs. library version mismatch!\n");
+     exit(1);
+   }
+
+   if (gtk_minor_version == 1) return FALSE;
+
+   return !((gtk_major_version > major) ||
+    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
+
+EOF
+if { (eval echo configure:9603: \"$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*
+  no_gtk=yes
+fi
+rm -fr conftest*
+fi
+
+     CFLAGS="$ac_save_CFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk=yes
+  fi
+  if test "x$no_gtk" = x ; then
+     echo "$ac_t""yes" 1>&6
+     wx_cv_lib_gtk=1.2.3
+  else
+     echo "$ac_t""no" 1>&6
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     :
+  fi
+  
+  
+
+                fi
+
+                if test -z "$wx_cv_lib_gtk"; then
+                                        wx_cv_lib_gtk=none
+                else
+                                                            wx_cv_cflags_gtk=$GTK_CFLAGS
+                    wx_cv_libs_gtk=$GTK_LIBS
+                fi
+            
+        
+fi
+
+
+                        if test "$gtk_version_cached" = 1; then
+            echo "$ac_t""$wx_cv_lib_gtk" 1>&6
+        fi
+
+        case "$wx_cv_lib_gtk" in
+            2.0)    WXGTK20=1
+                    ;;
+            1.2.7)  WXGTK127=1
+                    WXGTK12=1
+                    ;;
+            1.2.3)  WXGTK12=1
+                    ;;
+            *)      { 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.
+                            " 1>&2; exit 1; }
+                    ;;
+        esac
+
+        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk"
+
+        AFMINSTALL=afminstall
+        TOOLKIT=GTK
+        GUIDIST=GTK_DIST
+
+                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:9674: 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
+  ac_save_LIBS="$LIBS"
+LIBS="-lgdk  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9682 "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 gdk_im_open();
+
+int main() {
+gdk_im_open()
+; return 0; }
+EOF
+if { (eval echo configure:9693: \"$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
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    if test "$wxUSE_MGL" = 1; then
+        
+        echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:9721: checking for SciTech MGL library" >&5
+        if test "x$MGL_ROOT" = x ; then
+            echo "$ac_t""not found" 1>&6
+            { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
+        else
+            echo "$ac_t""$MGL_ROOT" 1>&6
+        fi
+
+        mgl_os=linux/gcc/glibc
+        mgl_lib_type=""
+
+        if test "$wxUSE_DEBUG_FLAG" = yes ; then
+            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a ; 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 ; then
+                mgl_lib_type=release
+            else
+                { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
+            fi
+        fi
+
+        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
+        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
+
+        AFMINSTALL=afminstall
+        TOOLKIT=MGL
+        GUIDIST=MGL_DIST
+    fi
+
+    if test "$wxUSE_WINE" = 1; then
+        ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+echo "configure:9756: checking for windows.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9761 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9766: \"$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
+
+            { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+        
+fi
+
+
+        xpm_link=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:9793: checking for Xpm library" >&5
+        
+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
+  done
+
+        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
+
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            echo "$ac_t""no" 1>&6
+            echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+        fi
+
+        mesa_link=""
+        echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:9821: checking for Mesa library" >&5
+        
+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
+
+        if test "$ac_find_libraries" != "" ; then
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
+            mesa_link="-lMesaGL"
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            { echo "configure: error: no" 1>&2; exit 1; }
+        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 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:9854: checking for X" >&5
+
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+  withval="$with_x"
+  :
+fi
+
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+  # The user explicitly disabled X.
+  have_x=disabled
+else
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=NO ac_x_libraries=NO
+rm -fr conftestdir
+if mkdir conftestdir; then
+  cd conftestdir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+  cat > Imakefile <<'EOF'
+acfindx:
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+EOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+        test -f $ac_im_libdir/libX11.$ac_extension; then
+        ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
+    # Screen out bogus values from the imake configuration.  They are
+    # bogus both because they are the default anyway, and because
+    # using them would break gcc on systems where it needs fixed includes.
+    case "$ac_im_incroot" in
+	/usr/include) ;;
+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
+    esac
+    case "$ac_im_usrlibdir" in
+	/usr/lib | /lib) ;;
+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
+    esac
+  fi
+  cd ..
+  rm -fr conftestdir
+fi
+
+if test "$ac_x_includes" = NO; then
+  # Guess where to find include files, by looking for this one X11 .h file.
+  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+
+  # First, try using that file with no special directory specified.
+cat > conftest.$ac_ext <<EOF
+#line 9916 "configure"
+#include "confdefs.h"
+#include <$x_direct_test_include>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9921: \"$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
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  # Look for the header file in a standard set of common directories.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+  for ac_dir in               \
+    /usr/X11/include          \
+    /usr/X11R6/include        \
+    /usr/X11R5/include        \
+    /usr/X11R4/include        \
+                              \
+    /usr/include/X11          \
+    /usr/include/X11R6        \
+    /usr/include/X11R5        \
+    /usr/include/X11R4        \
+                              \
+    /usr/local/X11/include    \
+    /usr/local/X11R6/include  \
+    /usr/local/X11R5/include  \
+    /usr/local/X11R4/include  \
+                              \
+    /usr/local/include/X11    \
+    /usr/local/include/X11R6  \
+    /usr/local/include/X11R5  \
+    /usr/local/include/X11R4  \
+                              \
+    /usr/X386/include         \
+    /usr/x386/include         \
+    /usr/XFree86/include/X11  \
+                              \
+    /usr/include              \
+    /usr/local/include        \
+    /usr/unsupported/include  \
+    /usr/athena/include       \
+    /usr/local/x11r5/include  \
+    /usr/lpp/Xamples/include  \
+                              \
+    /usr/openwin/include      \
+    /usr/openwin/share/include \
+    ; \
+  do
+    if test -r "$ac_dir/$x_direct_test_include"; then
+      ac_x_includes=$ac_dir
+      break
+    fi
+  done
+fi
+rm -f conftest*
+fi # $ac_x_includes = NO
+
+if test "$ac_x_libraries" = NO; then
+  # 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.
+  ac_save_LIBS="$LIBS"
+  LIBS="-l$x_direct_test_library $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9990 "configure"
+#include "confdefs.h"
+
+int main() {
+${x_direct_test_function}()
+; return 0; }
+EOF
+if { (eval echo configure:9997: \"$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
+  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
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+      ac_x_libraries=$ac_dir
+      break 2
+    fi
+  done
+done
+fi
+rm -f conftest*
+fi # $ac_x_libraries = NO
+
+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+  fi
+  eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+  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.
+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+  # Update the cache value to reflect the command line values.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$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.
+  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:10103: 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 10106 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:10113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_R_nospace=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_nospace=no
+fi
+rm -f conftest*
+      if test $ac_R_nospace = yes; then
+	echo "$ac_t""no" 1>&6
+	X_LIBS="$X_LIBS -R$x_libraries"
+      else
+	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	cat > conftest.$ac_ext <<EOF
+#line 10129 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:10136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_R_space=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_space=no
+fi
+rm -f conftest*
+	if test $ac_R_space = yes; then
+	  echo "$ac_t""yes" 1>&6
+	  X_LIBS="$X_LIBS -R $x_libraries"
+	else
+	  echo "$ac_t""neither works" 1>&6
+	fi
+      fi
+      LIBS="$ac_xsave_LIBS"
+    esac
+  fi
+
+  # Check for system-dependent libraries X programs must link with.
+  # Do this before checking for the system-independent R6 libraries
+  # (-lICE), since we may need -lsocket or whatever for X linking.
+
+  if test "$ISC" = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+  else
+    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+    # libraries were built with DECnet support.  And karl@cs.umb.edu says
+    # the Alpha needs dnet_stub (dnet does not exist).
+    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+echo "configure:10168: checking for dnet_ntoa in -ldnet" >&5
+ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldnet  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10176 "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 dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:10187: \"$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"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+echo "configure:10209: 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
+  ac_save_LIBS="$LIBS"
+LIBS="-ldnet_stub  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10217 "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 dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:10228: \"$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"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+    # to get the SysV transport functions.
+    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # needs -lnsl.
+    # The nsl library prevents programs from opening the X display
+    # on Irix 5.2, according to dickey@clark.net.
+    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:10257: 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 10262 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname(); 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 gethostbyname();
+
+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
+gethostbyname();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10285: \"$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
+      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:10306: 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
+  ac_save_LIBS="$LIBS"
+LIBS="-lnsl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10314 "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 gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:10325: \"$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 -lnsl"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
+    # socket/setsockopt and other routines are undefined under SCO ODT
+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+    # on later versions), says simon@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:10355: 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 10360 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char connect(); 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 connect();
+
+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
+connect();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10383: \"$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
+      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+echo "configure:10404: 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"
+cat > conftest.$ac_ext <<EOF
+#line 10412 "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 connect();
+
+int main() {
+connect()
+; return 0; }
+EOF
+if { (eval echo configure:10423: \"$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"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+    echo $ac_n "checking for remove""... $ac_c" 1>&6
+echo "configure:10447: checking for remove" >&5
+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10452 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char remove(); 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 remove();
+
+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
+remove();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10475: \"$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
+      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:10496: 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
+  ac_save_LIBS="$LIBS"
+LIBS="-lposix  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10504 "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 remove();
+
+int main() {
+remove()
+; return 0; }
+EOF
+if { (eval echo configure:10515: \"$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"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+    echo $ac_n "checking for shmat""... $ac_c" 1>&6
+echo "configure:10539: checking for shmat" >&5
+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10544 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shmat(); 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 shmat();
+
+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
+shmat();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10567: \"$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
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_shmat = no; then
+      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:10588: 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
+  ac_save_LIBS="$LIBS"
+LIBS="-lipc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10596 "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 shmat();
+
+int main() {
+shmat()
+; return 0; }
+EOF
+if { (eval echo configure:10607: \"$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"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+  fi
+
+  # Check for libraries that X11R6 Xt/Xaw programs need.
+  ac_save_LDFLAGS="$LDFLAGS"
+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+  # check for ICE first), but we must link in the order -lSM -lICE or
+  # we get undefined symbols.  So assume we have SM if we have ICE.
+  # These have to be linked with before -lX11, unlike the other
+  # libraries we check for below, so use a different variable.
+  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+echo "configure:10640: 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"
+cat > conftest.$ac_ext <<EOF
+#line 10648 "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 IceConnectionNumber();
+
+int main() {
+IceConnectionNumber()
+; return 0; }
+EOF
+if { (eval echo configure:10659: \"$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"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  LDFLAGS="$ac_save_LDFLAGS"
+
+fi
+
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    LDFLAGS="$LDFLAGS $X_LIBS"
+
+    if test "$wxUSE_MOTIF" = 1; then
+        if test "$no_x" = "yes"; then
+          { echo "configure: error: X11 not found" 1>&2; exit 1; }
+        fi
+
+        GUI_TK_LIBRARY="$X_LIBS"
+        TOOLKIT_INCLUDE="$X_CFLAGS"
+        AFMINSTALL=afminstall
+        COMPILED_X_PROGRAM=0
+
+        echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:10697: checking for Motif/Lesstif headers" >&5
+        
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE;
+  do
+    if test -f "$ac_dir/Xm/Xm.h"; then
+      ac_find_includes=$ac_dir
+      break
+    fi
+  done
+
+        if test "$ac_find_includes" != "" ; then
+            echo "$ac_t""found $ac_find_includes" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10712 "configure"
+#include "confdefs.h"
+
+                    #include <Xm/Xm.h>
+                
+int main() {
+
+                    int version;
+                    version = xmUseVersion;
+                
+; return 0; }
+EOF
+if { (eval echo configure:10724: \"$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
+                
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    echo "$ac_t""no" 1>&6
+                    { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+                
+            
+fi
+rm -f conftest*
+        fi
+
+        if test "$COMPILED_X_PROGRAM" = 0; then
+            echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:10745: checking for Motif/Lesstif library" >&5
+            
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libXm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+            if test "$ac_find_libraries" != "" ; then
+                
+  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
+    ac_path_to_link=""
+  else
+    ac_path_to_link="-L$ac_find_libraries"
+  fi
+
+
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+                echo "$ac_t""found at $ac_find_libraries" 1>&6
+            else
+                                                                cat > conftest.$ac_ext <<EOF
+#line 10784 "configure"
+#include "confdefs.h"
+
+                        #include <Xm/Xm.h>
+                    
+int main() {
+
+                        int version;
+                        version = xmUseVersion;
+                    
+; return 0; }
+EOF
+if { (eval echo configure:10796: \"$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
+                    
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        echo "$ac_t""no" 1>&6
+                        { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+                    
+                
+fi
+rm -f conftest*
+            fi
+        fi
+
+        xpm_link=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:10818: checking for Xpm library" >&5
+        
+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
+  done
+
+        if test "$ac_find_libraries" != "" ; then
+            
+  echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link="-L$ac_find_libraries"
+  fi
+
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+            xpm_link="-lXpm "
+            cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
+EOF
+
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10850 "configure"
+#include "confdefs.h"
+
+                    #include <X11/xpm.h>
+                
+int main() {
+
+                    int version;
+                    version = XpmLibraryVersion();
+                
+; return 0; }
+EOF
+if { (eval echo configure:10862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    xpm_link="-lXpm "
+                    cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
+EOF
+
+                    echo "$ac_t""found in default search path" 1>&6
+                    COMPILED_X_PROGRAM=0
+                
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    echo "$ac_t""no" 1>&6
+                    echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+                
+            
+fi
+rm -f conftest*
+        fi
+
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm $xpm_link -lXmu -lXext -lXt -lX11"
+        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+        TOOLKIT=MOTIF
+        GUIDIST=MOTIF_DIST
+    fi
+
+        if test "$wxUSE_MAC" = 1; then
+        CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+        CFLAGS="${CFLAGS} -fpascal-strings"
+        CXXFLAGS="${CXXFLAGS} -fpascal-strings"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
+
+        TOOLKIT=MAC
+        GUIDIST=MACX_DIST
+    fi
+
+    if test "$wxUSE_PM" = 1; then
+        TOOLKIT=PM
+        GUIDIST=GTK_DIST
+    fi
+
+        if test "$TOOLKIT" = "PM" ; then
+        TOOLKIT_DIR="os2"
+    else
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+    fi
+
+        PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
+
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
+        TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
+        WIDGET_SET=univ
+    else
+        ALL_OBJECTS="\$(GUIOBJS)"
+    fi
+
+    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+
+    if test "$TOOLKIT" != "MSW"; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
+    fi
+
+    if test "$wxUSE_HTML" = "yes"; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
+    fi
+
+        if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+    fi
+    if test "$wxUSE_LIBJPEG" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
+    fi
+    if test "$wxUSE_LIBTIFF" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
+    fi
+    if test "$wxUSE_LIBPNG" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
+    fi
+    if test "$wxUSE_FREETYPE" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
+    fi
+
+    RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
+    RPM_SPEC="wx\$(TOOLKIT).spec"
+
+        GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
+    DISTDIR="wx\$(TOOLKIT)"
+else
+    USE_GUI=0
+
+            TOOLKIT_DIR="base"
+
+        if test "$USE_WIN32" = 1 ; then
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/msw"
+
+                        TOOLKIT="MSW"
+    else
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/unix"
+    fi
+
+    PORT_FILES="\${top_srcdir}/src/files.lst"
+    RPM_FILES="src/rpmfiles.lst"
+    RPM_SPEC="wxBase.spec"
+
+        GUIDIST="BASE_DIST"
+    DISTDIR="wxBase"
+fi
+
+if test "x$REGEX_INCLUDE" != "x" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+fi
+if test "$wxUSE_ZLIB" = "yes" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+fi
+
+if test "$wxUSE_OPENGL" = "yes"; then
+  if test "$wxUSE_MAC" = 1; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_OPENGL 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_GLCANVAS 1
+EOF
+
+    OPENGL_LIBS="-framework OpenGL -framework AGL"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+  else
+    ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
+echo "configure:11001: 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 11006 "configure"
+#include "confdefs.h"
+#include <GL/gl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11011: \"$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
+  
+      cat >> confdefs.h <<\EOF
+#define wxUSE_OPENGL 1
+EOF
+
+      cat >> confdefs.h <<\EOF
+#define wxUSE_GLCANVAS 1
+EOF
+
+      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+      echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
+echo "configure:11038: checking for glFlush in -lGL" >&5
+ac_lib_var=`echo GL'_'glFlush | 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="-lGL  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11046 "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 glFlush();
+
+int main() {
+glFlush()
+; return 0; }
+EOF
+if { (eval echo configure:11057: \"$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 confcache
-
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-if eval "test $host != $build"; then
-  if eval "test $host_alias != NONE"; then
-    CC=$host_alias-gcc
-    CXX=$host_alias-c++
-    AR=$host_alias-ar
-    RANLIB=$host_alias-ranlib
-    DLLTOOL=$host_alias-dlltool
-    LD=$host_alias-ld
-    NM=$host_alias-nm
-    STRIP=$host_alias-strip
-  fi
 fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+        OPENGL_LIBS="-lGL -lGLU"
+      
+else
+  echo "$ac_t""no" 1>&6
 
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5840: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+          echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
+echo "configure:11079: checking for glFlush in -lMesaGL" >&5
+ac_lib_var=`echo MesaGL'_'glFlush | 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
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  ac_save_LIBS="$LIBS"
+LIBS="-lMesaGL  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11087 "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 glFlush();
+
+int main() {
+glFlush()
+; return 0; }
+EOF
+if { (eval echo configure:11098: \"$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
-  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"
+  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
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+          OPENGL_LIBS="-lMesaGL -lMesaGLU"
+        
 else
   echo "$ac_t""no" 1>&6
 fi
 
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5870: 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.
+       
+fi
+
+      
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
+  echo "$ac_t""no" 1>&6
+wxUSE_OPENGL=0
+fi
+
   fi
 fi
+
+if test -z "$TOOLKIT_VPATH" ; then
+    TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
 fi
+
+if test -n "$TOOLKIT" ; then
+    TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
 fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+
+if test "$wxUSE_CYGWIN" = 1 ; then
+  TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5921: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+lib_debug_suffix=
+if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+    lib_debug_suffix=d
+    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d"
+fi
+
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}-${WX_RELEASE}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}_gl-${WX_RELEASE}"
+
+if test "$cross_compiling" = "yes"; then
+    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
+    TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
+fi
+
+WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
+WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+
+WXCONFIG_LIBS="-l${WX_LIBRARY}"
+
+if test "$wxUSE_OPENGL" = "yes"; then
+    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
+fi
+
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
+
+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_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
+WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
+
+
+
+if test "$wxUSE_SHARED" = "yes"; then
+
+        if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
+    else
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
+    fi
+
+        if test "$GCC" = "yes"; then
+                PIC_FLAG="-fPIC"
+    fi
+
+        SHARED_LD="${CXX} -shared -o"
+
+    case "${host}" in
+      *-hp-hpux* )
+                if test "$GCC" != "yes"; then
+                        LDFLAGS="-L/usr/lib"
+
+            SHARED_LD="${CXX} -b -o"
+            PIC_FLAG="+Z"
+        fi
+
+                if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
+        else
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+        fi
+      ;;
+
+      *-*-linux* )
+        if test "$GCC" != "yes"; then
+            echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
+echo "configure:11218: 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
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+  
+                cat > conftest.$ac_ext <<EOF
+#line 11224 "configure"
+#include "confdefs.h"
+
+int main() {
+
+                        #ifndef __INTEL_COMPILER
+                        #error Not icc
+                        #endif
+                    
+; return 0; }
+EOF
+if { (eval echo configure:11235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_prog_icc=yes
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_prog_icc=no
+                
 fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+rm -f conftest*
+            
 fi
- ;;
+
+echo "$ac_t""$wx_cv_prog_icc" 1>&6
+            if test "$wx_cv_prog_icc" = "yes"; then
+                PIC_FLAG="-KPIC"
+            fi
+        fi
+
+        if test "$wxUSE_SONAME" = "yes" ; then
+            SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
+            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+                        WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
+        fi
+      ;;
+
+      *-*-solaris2* )
+        if test "$GCC" = yes ; then
+                                    CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
+        else
+            SHARED_LD="${CXX} -G -o"
+            PIC_FLAG="-KPIC"
+            SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
+            SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}"
+        fi
+      ;;
+
+      *-*-darwin* )
+        CFLAGS="${CFLAGS} -fno-common"
+        CXXFLAGS="${CXXFLAGS} -fno-common"
+        SHARED_LD="${CXX} -dynamiclib -o"
+        PIC_FLAG="-dynamic -fPIC"
+      ;;
+
+      *-*-aix* )
+        SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
+      ;;
+
+      *-*-cygwin* | *-*-mingw32* )
+        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
+        WXMSW_DLL_DEFINES="-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}"
+        fi
+                        PIC_FLAG=
+      ;;
+
+      *-pc-os2_emx )
+                wxUSE_SHARED=no
+      ;;
+
+      *-*-beos* )
+                        SHARED_LD="${LD} -shared -o"
+      ;;
+
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-sunos4* | \
+      *-*-irix5* | *-*-irix6* | \
+      *-*-osf* | \
+      *-*-dgux5* | \
+      *-*-sysv5* )
+              ;;
+
+      *)
+        { echo "configure: error: unknown system type $host." 1>&2; exit 1; }
     esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:5953: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+        if test "x$WX_TARGET_LIBRARY" = "x"; then
+        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
+    fi
 
-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
+        WX_TARGET_LIBRARY_TYPE="so"
+fi
 
-cat > conftest.$ac_ext << EOF
+if test "$wxUSE_SHARED" = "no"; then
 
-#line 5964 "configure"
-#include "confdefs.h"
+        if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then
+                WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+    fi
 
-main(){return(0);}
-EOF
-if { (eval echo configure:5969: \"$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
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+    if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}"
+    else
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
+    fi
 
-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; }
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+
+    WX_TARGET_LIBRARY_TYPE="a"
 fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:5995: 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:6000: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+if test "$wxUSE_MAC" = 1; then
+        WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
+    # 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:11350: 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
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+  if test -n "$RESCOMP"; then
+  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
 else
-  ac_cv_prog_gcc=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
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+RESCOMP="$ac_cv_prog_RESCOMP"
+if test -n "$RESCOMP"; then
+  echo "$ac_t""$RESCOMP" 1>&6
 else
-  GCC=
+  echo "$ac_t""no" 1>&6
 fi
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:6028: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+    # 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:11380: 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
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
 else
-  ac_cv_prog_cc_g=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
-rm -f conftest*
-
 fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+  echo "$ac_t""$DEREZ" 1>&6
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+  echo "$ac_t""no" 1>&6
 fi
 
+    LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
+    LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+fi
 
-CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:6063: 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
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+for ac_hdr in strings.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11416: 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
-    # 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,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 6078 "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:6084: \"$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
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 6095 "configure"
+#line 11421 "configure"
 #include "confdefs.h"
-#include <assert.h>
-Syntax Error
+#include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11426: \"$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
-  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 6112 "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:6118: \"$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
-  :
+  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*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
 fi
-  CPP="$ac_cv_prog_CPP"
+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
-  ac_cv_prog_CPP="$CPP"
+  echo "$ac_t""no" 1>&6
 fi
-echo "$ac_t""$CPP" 1>&6
-
+done
 
-if test $ac_cv_prog_gcc = yes; then
-    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:6145: checking whether ${CC-cc} needs -traditional" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+for ac_hdr in stdlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11456: 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
-    ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 6151 "configure"
+#line 11461 "configure"
 #include "confdefs.h"
-#include <sgtty.h>
-Autoconf TIOCGETP
+#include <$ac_hdr>
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "$ac_pattern" >/dev/null 2>&1; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11466: \"$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_prog_gcc_traditional=yes
+  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*
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat > conftest.$ac_ext <<EOF
-#line 6169 "configure"
-#include "confdefs.h"
-#include <termio.h>
-Autoconf TCGETA
-EOF
-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
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
-  fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-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
-
-
-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:6205: 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
-  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
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
+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
-
-test -n "$CXX" && break
 done
-test -n "$CXX" || CXX="gcc"
-
-
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:6237: 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 6248 "configure"
+for ac_hdr in unistd.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11496: 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 11501 "configure"
 #include "confdefs.h"
-
-int main(){return(0);}
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:6253: \"$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
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11506: \"$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
-  ac_cv_prog_cxx_works=no
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=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; }
+rm -f conftest*
 fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:6279: 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
+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
 
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:6284: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+for ac_hdr in wchar.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11536: 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.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
+  cat > conftest.$ac_ext <<EOF
+#line 11541 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11546: \"$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
-  ac_cv_prog_gxx=no
+  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
-
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
-
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
+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
-  GXX=
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-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:6312: checking whether ${CXX-g++} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+for ac_hdr in wcstr.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11576: 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
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-  ac_cv_prog_cxx_g=yes
+  cat > conftest.$ac_ext <<EOF
+#line 11581 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11586: \"$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
-  ac_cv_prog_cxx_g=no
+  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
-
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS="$ac_save_CXXFLAGS"
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
+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
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-
-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:6345: checking how to run the C++ preprocessor" >&5
-if test -z "$CXXCPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+for ac_hdr in fnmatch.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11616: 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
-  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 6358 "configure"
+#line 11621 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
+#include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11626: \"$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*
-  CXXCPP=/lib/cpp
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-  ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
 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
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
-
-
-CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
-
-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
-
+done
 
-# 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:6401: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+for ac_hdr in iconv.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11656: 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
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+  cat > conftest.$ac_ext <<EOF
+#line 11661 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11666: \"$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
-  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=":"
+  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
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+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
 
-
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6432: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+for ac_hdr in langinfo.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11696: 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
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+  cat > conftest.$ac_ext <<EOF
+#line 11701 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11706: \"$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
-  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"
+  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
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
+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
 
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:6472: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+if test "$wxUSE_GUI" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes"; then
+                for ac_hdr in X11/XKBlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11739: 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
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
+  cat > conftest.$ac_ext <<EOF
+#line 11744 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11749: \"$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
-  if test "${ac_cv_path_install+set}" = set; then
-    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.
-    INSTALL="$ac_install_sh"
-  fi
+rm -f conftest*
 fi
-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}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+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
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+    fi
+fi
 
 
-# Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6528: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:11780: 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
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  cat > conftest.$ac_ext <<EOF
+#line 11785 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11793: \"$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
-  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
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 11810 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
 else
-  echo "$ac_t""no" 1>&6
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
+fi
 
-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:6557: checking "make for VPATH support"" >&5
-cat - << EOF > confMake
-check : file
-	cp \$? \$@
-	cp \$? final_file
+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 11828 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
 EOF
-
-if test ! -d sub ; then
-  mkdir sub
-fi
-echo dummy > sub/file
-${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
-RESULT=$?
-rm -f sub/file check final_file confMake
-rmdir sub
-if test "$RESULT" = 0; then
-  echo "$ac_t""yes" 1>&6
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
 else
-  echo "$ac_t""no" 1>&6
-  { 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" 1>&2; exit 1; }
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
-for ac_prog in 'bison -y' byacc
-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:6586: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
 else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+  cat > conftest.$ac_ext <<EOF
+#line 11849 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:11860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  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
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
 fi
 
-test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
+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
 
-# 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:6620: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
+echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+echo "configure:11884: 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
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+  cat > conftest.$ac_ext <<EOF
+#line 11889 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_mode_t=yes
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
+  rm -rf conftest*
+  ac_cv_type_mode_t=no
 fi
+rm -f conftest*
+
 fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+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
 
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:6654: 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 "checking for off_t""... $ac_c" 1>&6
+echo "configure:11917: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6662 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 11922 "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 yywrap();
-
-int main() {
-yywrap()
-; return 0; }
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
 EOF
-if { (eval echo configure:6673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+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*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  ac_cv_type_off_t=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  ac_cv_type_off_t=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
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
-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 whether ln -s works""... $ac_c" 1>&6
-echo "configure:6697: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "configure:11950: 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
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
+  cat > conftest.$ac_ext <<EOF
+#line 11955 "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
-  echo "$ac_t""no" 1>&6
+  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
 
-SEARCH_INCLUDE="\
-    /usr/local/include        \
-                              \
-    /usr/Motif-1.2/include    \
-    /usr/Motif-2.1/include    \
-                              \
-    /usr/include/Motif1.2     \
-    /opt/xpm/include/X11      \
-    /opt/GBxpm/include/       \
-    /opt/GBxpm/X11/include/   \
-                              \
-    /usr/Motif1.2/include     \
-    /usr/dt/include           \
-    /usr/openwin/include      \
-                              \
-    /usr/include/Xm           \
-                              \
-    /usr/X11R6/include        \
-    /usr/X11R6.4/include      \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X11/include          \
-    /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    X:/XFree86/include        \
-    X:/XFree86/include/X11    \
-                              \
-    /usr/include/gtk          \
-    /usr/local/include/gtk    \
-    /usr/include/glib         \
-    /usr/local/include/glib   \
-                              \
-    /usr/include/qt           \
-    /usr/local/include/qt     \
-                              \
-    /usr/include/windows      \
-    /usr/include/wine         \
-    /usr/local/include/wine   \
-                              \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/share/include \
-                               \
-    /usr/include"
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:11983: 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 11988 "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*
 
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+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
 
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# 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.
-#
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:12016: 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 12021 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
 EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
+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
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
+  rm -rf conftest*
+  ac_cv_type_uid_t=no
 fi
-rm -f confcache
+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
 
-AFMINSTALL=
+  cat >> confdefs.h <<\EOF
+#define gid_t int
+EOF
 
-if test "$wxUSE_GUI" = "yes"; then
+fi
 
-USE_GUI=1
 
-TOOLKIT=
-TOOLKIT_INCLUDE=
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:12051: checking for wchar_t" >&5
+if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cat > conftest.$ac_ext <<EOF
+#line 12057 "configure"
+#include "confdefs.h"
+#include <wchar.h>
+int main() {
 
-GUIOBJS=
-COMMONOBJS=
-GENERICOBJS=
+            wchar_t wc, *ws;
+            wc = L'a';
+            ws = L"Hello, world!";
+        
+; return 0; }
+EOF
+if { (eval echo configure:12068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_wchar_t=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 12076 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int main() {
 
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+                wchar_t wc, *ws;
+                wc = L'a';
+                ws = L"Hello, world!";
+            
+; return 0; }
+EOF
+if { (eval echo configure:12087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_wchar_t=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_type_wchar_t=no
+fi
+rm -f conftest*
+    
+fi
+rm -f conftest*
 
-WXGTK12=
-WXGTK13=
+fi
 
-WXWINE=
+echo "$ac_t""$wx_cv_type_wchar_t" 1>&6
 
-if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
-    if test "$cross_compiling" = "yes" ; then
-        echo "configure: warning: Cross compiling --- skipping windows.h check" 1>&2
-    else
-        echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
-echo "configure:6864: checking for Windows headers" >&5
-        
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
-  do
-    if test -f "$ac_dir/windows.h"; then
-      ac_find_includes=$ac_dir
-      break
-    fi
-  done
+if test "$wx_cv_type_wchar_t" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
+EOF
 
-        if test "$ac_find_includes" != "" ; then
-            echo "$ac_t""found $ac_find_includes" 1>&6
-            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
-        else
-            echo "$ac_t""no" 1>&6
-            { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-        fi
-    fi
+fi
 
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
-            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
 
-        if test "$wxUSE_MINGW" = 1; then
-        LDFLAGS="$LDFLAGS -mwindows"
-    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
 
-    TOOLKIT=MSW
+echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
+echo "configure:12121: 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 12126 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
 
-    GUIOBJS="\$(MSW_GUIOBJS)"
-    GUIHEADERS="\$(MSW_HEADERS)"
-    COMMONOBJS="\$(MSW_COMMONOBJS)"
-    GENERICOBJS="\$(MSW_GENERICOBJS)"
-    UNIXOBJS=
-    GUIDIST=MSW_DIST
-fi
+            return 0; }
 
-if test "$wxUSE_GTK" = 1; then
-            
-  if test x$gtk_config_exec_prefix != x ; then
-     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
+            struct Foo { void foo(size_t); void foo(unsigned int); };
 
-  # Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6919: 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
+            int bar() {
+        
+; return 0; }
+EOF
+if { (eval echo configure:12139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=no
 else
-  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 dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-  ;;
-esac
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=yes
+    
 fi
-GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
-if test -n "$GTK_CONFIG"; then
-  echo "$ac_t""$GTK_CONFIG" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+rm -f conftest*
+
 fi
 
-  min_gtk_version=1.2.3
-  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:6954: checking for GTK - version >= $min_gtk_version" >&5
-  no_gtk=""
-  if test "$GTK_CONFIG" != "no" ; then
-    GTK_CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $GTK_CFLAGS"
-    LIBS="$LIBS $GTK_LIBS"
-    if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+echo "$ac_t""$wx_cv_size_t_is_uint" 1>&6
+
+if test "$wx_cv_size_t_is_uint" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_UINT 1
+EOF
+
+else
+    echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
+echo "configure:12162: 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
   cat > conftest.$ac_ext <<EOF
-#line 6967 "configure"
+#line 12167 "configure"
 #include "confdefs.h"
+#include <stddef.h>
+int main() {
 
-#include <gtk/gtk.h>
-#include <gtk/gtkfeatures.h>
-#include <stdio.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-   if ((GTK_MAJOR_VERSION != gtk_major_version) ||
-       (GTK_MINOR_VERSION != gtk_minor_version) ||
-       (GTK_MICRO_VERSION != gtk_micro_version)) {
-     printf("Headers vs. library version mismatch!\n");
-     exit(1);
-   }
-
-   if (gtk_minor_version == 1) return FALSE;
+                return 0; }
 
-   return !((gtk_major_version > major) ||
-    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
-}
+                struct Foo { void foo(size_t); void foo(unsigned long); };
 
+                int bar() {
+            
+; return 0; }
 EOF
-if { (eval echo configure:6999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
+if { (eval echo configure:12180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  no_gtk=yes
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=yes
+        
 fi
-rm -fr conftest*
+rm -f conftest*
+    
 fi
 
-     CFLAGS="$ac_save_CFLAGS"
-     LIBS="$ac_save_LIBS"
-  else
-     no_gtk=yes
-  fi
-  if test "x$no_gtk" = x ; then
-     echo "$ac_t""yes" 1>&6
-     WXGTK12=1
-  else
-     echo "$ac_t""no" 1>&6
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.3 or above?" 1>&2; exit 1; }
-  fi
-  
-  
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6
+
+    if test "$wx_cv_size_t_is_ulong" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_ULONG 1
+EOF
 
+    fi
+fi
 
-    TOOLKIT_INCLUDE="$GTK_CFLAGS"
-    GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
-    TOOLKIT=GTK
+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
 
-    AFMINSTALL=afminstall
 
-    GUIOBJS="\$(GTK_GUIOBJS)"
-    GUIHEADERS="\$(GTK_HEADERS)"
-    COMMONOBJS="\$(GTK_COMMONOBJS)"
-    GENERICOBJS="\$(GTK_GENERICOBJS)"
-    GUIDEPS="\$(GTK_GUIDEPS)"
-    COMMONDEPS="\$(GTK_COMMONDEPS)"
-    GENERICDEPS="\$(GTK_GENERICDEPS)"
-    UNIXOBJS="\$(UNIX_OBJS)"
-    UNIXDEPS="\$(UNIX_DEPS)"
-    GUIDIST=GTK_DIST
 
-echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:7047: 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 "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
+echo "configure:12214: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-lgdk  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7055 "configure"
+  
+        cat > conftest.$ac_ext <<EOF
+#line 12220 "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 gdk_im_open();
-
+#include <pwd.h>
 int main() {
-gdk_im_open()
+
+                char *p;
+                struct passwd *pw;
+                p = pw->pw_gecos;
+             
 ; return 0; }
 EOF
-if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                wx_cv_struct_pw_gecos=yes
+             
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+                wx_cv_struct_pw_gecos=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
 
-else
-  echo "$ac_t""no" 1>&6
-fi
+echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
 
+if test "$wx_cv_struct_pw_gecos" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_PW_GECOS 1
+EOF
 
 fi
 
-if test "$wxUSE_WINE" = 1; then
-    echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:7094: checking for WINE includes" >&5
-    
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
-  do
-    if test -f "$ac_dir/windows.h"; then
-      ac_find_includes=$ac_dir
-      break
-    fi
-  done
-
-    if test "$ac_find_includes" != "" ; then
-        echo "$ac_t""found $ac_find_includes" 1>&6
-        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
-    else
-        echo "$ac_t""no" 1>&6
-        { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-    fi
 
-    XPM_LINK=""
-    echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:7115: checking for Xpm library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libXpm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:12261: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12266 "configure"
+#include "confdefs.h"
 
-    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
+int main() {
 
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-        echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
-    fi
+/* 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;
 
-    MESA_LINK=""
-    echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:7143: checking for Mesa library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
 
-    if test "$ac_find_libraries" != "" ; then
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-        MESA_LINK="-lMesaGL"
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        { echo "configure: error: no" 1>&2; exit 1; }
-    fi
+; return 0; }
+EOF
+if { (eval echo configure:12315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_const=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
+fi
+rm -f conftest*
+fi
 
-    GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -lm"
-    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
-    WXWINE=1
-    TOOLKIT=MSW
-
-    GUIHEADERS="\$(MSW_HEADERS)"
-    GUIOBJS="\$(MSW_GUIOBJS)"
-    COMMONOBJS="\$(MSW_COMMONOBJS)"
-    GENERICOBJS="\$(MSW_GENERICOBJS)"
-    GUIDEPS="\$(MSW_GUIDEPS)"
-    COMMONDEPS="\$(MSW_COMMONDEPS)"
-    GENERICDEPS="\$(MSW_GENERICDEPS)"
-    UNIXOBJS="\$(UNIX_OBJS)"
-    UNIXDEPS="\$(UNIX_DEPS)"
-    GUIDIST=MSW_DIST
-fi
-
-if test "$wxUSE_MOTIF" = 1; then
-            # If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:7187: checking for X" >&5
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
+EOF
 
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
-  :
 fi
 
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:12336: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+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.
-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.
-  cat > Imakefile <<'EOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat > conftest.$ac_ext <<EOF
+#line 12343 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
 EOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-        test -f $ac_im_libdir/libX11.$ac_extension; then
-        ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case "$ac_im_incroot" in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
-    esac
-    case "$ac_im_usrlibdir" in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftestdir
+if { (eval echo configure:12350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
 fi
 
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
+esac
+
 
-  # First, try using that file with no special directory specified.
-cat > conftest.$ac_ext <<EOF
-#line 7249 "configure"
+echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:12377: 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
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_char=1
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12385 "configure"
 #include "confdefs.h"
-#include <$x_direct_test_include>
+#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
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7254: \"$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=
+if { (eval echo configure:12397: \"$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
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
+  rm -fr conftest*
+  ac_cv_sizeof_char=0
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
-fi # $ac_x_includes = NO
 
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
+fi
+echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+EOF
 
-  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.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7323 "configure"
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:12417: 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
+  ac_cv_sizeof_short=2
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12425 "configure"
 #include "confdefs.h"
-
-int main() {
-${x_direct_test_function}()
-; return 0; }
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
 EOF
-if { (eval echo configure:7330: \"$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=
+if { (eval echo configure:12437: \"$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
   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
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
-fi # $ac_x_libraries = NO
 
-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"
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+
+
+echo $ac_n "checking size of int *""... $ac_c" 1>&6
+echo "configure:12457: checking size of int *" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_int_p=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12465 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int *));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int_p=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int_p=0
 fi
+rm -fr conftest*
 fi
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
 
-if test "$have_x" != yes; then
-  echo "$ac_t""$have_x" 1>&6
-  no_x=yes
+fi
+echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT_P $ac_cv_sizeof_int_p
+EOF
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:12497: 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
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12505 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12517: \"$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
+rm -fr conftest*
 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
-#define X_DISPLAY_MISSING 1
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
 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:7436: 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 7439 "configure"
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:12537: 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
+  ac_cv_sizeof_long=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12545 "configure"
 #include "confdefs.h"
-
-int main() {
-
-; return 0; }
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
 EOF
-if { (eval echo configure:7446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_R_nospace=yes
+if { (eval echo configure:12557: \"$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
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_nospace=no
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
-      if test $ac_R_nospace = yes; then
-	echo "$ac_t""no" 1>&6
-	X_LIBS="$X_LIBS -R$x_libraries"
-      else
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-	cat > conftest.$ac_ext <<EOF
-#line 7462 "configure"
-#include "confdefs.h"
 
-int main() {
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
 
-; return 0; }
+
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:12577: 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
+  ac_cv_sizeof_long_long=0
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12585 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+#include <sys/types.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
+}
 EOF
-if { (eval echo configure:7469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_R_space=yes
+if { (eval echo configure:12597: \"$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
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_R_space=no
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
-	if test $ac_R_space = yes; then
-	  echo "$ac_t""yes" 1>&6
-	  X_LIBS="$X_LIBS -R $x_libraries"
-	else
-	  echo "$ac_t""neither works" 1>&6
-	fi
-      fi
-      LIBS="$ac_xsave_LIBS"
-    esac
-  fi
 
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
 
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And karl@cs.umb.edu says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:7501: 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 "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:12618: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7509 "configure"
+  
+    if test "$cross_compiling" = yes; then
+  wx_cv_sizeof_wchar_t=4
+    
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12628 "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 dnet_ntoa();
 
-int main() {
-dnet_ntoa()
-; return 0; }
+            #ifdef HAVE_WCHAR_H
+            #  include <wchar.h>
+            #endif
+            #ifdef HAVE_STDLIB_H
+            #  include <stdlib.h>
+            #endif
+            #include <stdio.h>
+            int main()
+            {
+                FILE *f=fopen("conftestval", "w");
+                if (!f) exit(1);
+                fprintf(f, "%i", sizeof(wchar_t));
+                exit(0);
+            }
+        
 EOF
-if { (eval echo configure:7520: \"$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"
+if { (eval echo configure:12647: \"$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
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  rm -fr conftest*
+  wx_cv_sizeof_wchar_t=0
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
+rm -fr conftest*
 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"
-else
-  echo "$ac_t""no" 1>&6
+
+
 fi
 
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:7542: 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_t""$wx_cv_sizeof_wchar_t" 1>&6
+
+cat >> confdefs.h <<EOF
+#define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
+EOF
+
+
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:12670: 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_save_LIBS="$LIBS"
-LIBS="-ldnet_stub  $LIBS"
+  ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 7550 "configure"
+#line 12677 "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 dnet_ntoa();
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
 
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:12688: \"$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.
+cat > conftest.$ac_ext <<EOF
+#line 12692 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
 int main() {
-dnet_ntoa()
+
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
 ; return 0; }
 EOF
-if { (eval echo configure:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  ac_cv_c_bigendian=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  ac_cv_c_bigendian=no
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+if test $ac_cv_c_bigendian = unknown; then
+if test "$cross_compiling" = yes; then
+  ac_cv_c_bigendian=unknown
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12723 "configure"
+#include "confdefs.h"
+main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
+EOF
+if { (eval echo configure:12736: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
+if test $ac_cv_c_bigendian = unknown; then
+  echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2
+fi
+if test $ac_cv_c_bigendian = yes; then
+  cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
 
-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"
-else
-  echo "$ac_t""no" 1>&6
 fi
 
-    fi
 
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to dickey@clark.net.
-    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:7590: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:12764: 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
+  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 7595 "configure"
+#line 12777 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); 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 gethostbyname();
-
-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
-gethostbyname();
-#endif
-
-; return 0; }
+#include <stdlib.h>
 EOF
-if { (eval echo configure:7618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12782: \"$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
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
+  CXXCPP=/lib/cpp
 fi
 rm -f conftest*
+  ac_cv_prog_CXXCPP="$CXXCPP"
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
 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
+CXXCPP="$ac_cv_prog_CXXCPP"
+echo "$ac_t""$CXXCPP" 1>&6
 
-    if test $ac_cv_func_gethostbyname = no; then
-      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7639: 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
+
+  if test "$cross_compiling" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IOSTREAMH 1
+EOF
+
+  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
+
+
+    for ac_hdr in iostream
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12826: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7647 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 12831 "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 gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:7658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12836: \"$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_lib_$ac_lib_var=yes"
+  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_lib_$ac_lib_var=no"
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+    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_iostream" = "yes" ; then
+      :
+    else
+      cat >> confdefs.h <<\EOF
+#define wxUSE_IOSTREAMH 1
+EOF
 
     fi
 
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says simon@lia.di.epfl.ch: it contains
-    # gethostby* variants that don't use the nameserver (or something).
-    # -lsocket must be given before -lnsl if both are needed.
-    # We assume that if connect needs -lnsl, so does gethostbyname.
-    echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:7688: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+    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_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
+echo "configure:12884: 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
-  cat > conftest.$ac_ext <<EOF
-#line 7693 "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
+
+
+    cat > conftest.$ac_ext <<EOF
+#line 12899 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect(); 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 connect();
 
+      
 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
-connect();
-#endif
+        bool b = true;
 
+        return 0;
+      
 ; return 0; }
 EOF
-if { (eval echo configure:7716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
+  
+        wx_cv_cpp_bool=yes
+      
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_connect=no"
+  
+        wx_cv_cpp_bool=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
+    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 $ac_cv_func_connect = no; then
-      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7737: checking for connect in -lsocket" >&5
-ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+echo "$ac_t""$wx_cv_cpp_bool" 1>&6
+
+  if test "$wx_cv_cpp_bool" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_BOOL 1
+EOF
+
+  fi
+
+
+
+echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
+echo "configure:12949: checking for wcslen in -lc" >&5
+ac_lib_var=`echo c'_'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
   ac_save_LIBS="$LIBS"
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7745 "configure"
+#line 12957 "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 connect();
+char wcslen();
 
 int main() {
-connect()
+wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:7756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12968: \"$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
@@ -7767,84 +12979,82 @@ 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"
+  
+            cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
+EOF
+
+            WCHAR_LINK=""
+        
 else
   echo "$ac_t""no" 1>&6
-fi
 
-    fi
-
-    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-    echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:7780: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
+echo "configure:12994: 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
-  cat > conftest.$ac_ext <<EOF
-#line 7785 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lw  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13002 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove(); 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 remove();
+char wcslen();
 
 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
-remove();
-#endif
-
+wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
+  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_func_remove=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
+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_WCSLEN 1
+EOF
+
+                WCHAR_LINK="-lw"
+            
 else
   echo "$ac_t""no" 1>&6
-fi
 
-    if test $ac_cv_func_remove = no; then
-      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7829: checking for remove in -lposix" >&5
-ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+                echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
+echo "configure:13039: 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
   ac_save_LIBS="$LIBS"
-LIBS="-lposix  $LIBS"
+LIBS="-lmsvcrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7837 "configure"
+#line 13047 "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 remove();
+char wcslen();
 
 int main() {
-remove()
+wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:7848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13058: \"$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
@@ -7859,523 +13069,453 @@ 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"
+  
+                    cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
+EOF
+
+                    WCHAR_LINK=""
+                
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
+            
+fi
 
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7872: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+        
+fi
+
+
+for ac_func in wcsrtombs
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13094: 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 7877 "configure"
+#line 13099 "configure"
 #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 $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 shmat();
+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_shmat) || defined (__stub___shmat)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-shmat();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
+  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_shmat=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
 else
   echo "$ac_t""no" 1>&6
 fi
+done
 
-    if test $ac_cv_func_shmat = no; then
-      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7921: 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 "checking for vprintf""... $ac_c" 1>&6
+echo "configure:13148: checking for vprintf" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lipc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7929 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 13153 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char vprintf(); 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 shmat();
+char vprintf();
 
 int main() {
-shmat()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
+choke me
+#else
+vprintf();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:7940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13176: \"$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"
+  eval "ac_cv_func_vprintf=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_vprintf=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS="$LDFLAGS"
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:7973: 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
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:13200: checking for _doprnt" >&5
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7981 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 13205 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt(); 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 IceConnectionNumber();
+char _doprnt();
 
 int main() {
-IceConnectionNumber()
+
+/* The GNU C library defines this for functions which it 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)
+choke me
+#else
+_doprnt();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:7992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13228: \"$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"
+  eval "ac_cv_func__doprnt=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func__doprnt=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+  cat >> confdefs.h <<\EOF
+#define HAVE_DOPRNT 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  LDFLAGS="$ac_save_LDFLAGS"
-
 fi
 
 
-    if test "$no_x" = "yes"; then
-        { echo "configure: error: X11 not found" 1>&2; exit 1; }
-    fi
-
-    GUI_TK_LIBRARY="$X_LIBS"
-    TOOLKIT_INCLUDE="$X_CFLAGS"
-
-    AFMINSTALL=afminstall
-
-                                                                                                
-    echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:8028: checking for Motif/Lesstif headers" >&5
-    
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
-  do
-    if test -f "$ac_dir/Xm/Xm.h"; then
-      ac_find_includes=$ac_dir
-      break
-    fi
-  done
-
-    if test "$ac_find_includes" != "" ; then
-        echo "$ac_t""found $ac_find_includes" 1>&6
-    else
-        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
-
-    echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:8047: checking for Motif/Lesstif library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libXm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
-
-    if test "$ac_find_libraries" != "" ; then
-        
-  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
-    ac_path_to_link=""
-  else
-    ac_path_to_link="-L$ac_find_libraries"
-  fi
 
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-        { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
-    fi
 
-    echo $ac_n "checking for Xt library""... $ac_c" 1>&6
-echo "configure:8090: checking for Xt library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libXt.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
 
-    if test "$ac_find_libraries" != "" ; then
-        
-  echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_link=""
-  else
-    ac_path_to_link="-L$ac_find_libraries"
-  fi
+echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
+echo "configure:13258: checking for vsnprintf" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+  cat > conftest.$ac_ext <<EOF
+#line 13264 "configure"
+#include "confdefs.h"
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-        { echo "configure: error: please set LDFLAGS to contain the location of libXt" 1>&2; exit 1; }
-    fi
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                 
+int main() {
 
-    XPM_LINK=""
-    echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:8122: checking for Xpm library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libXpm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+                    int wx_test_vsnprintf(const char *, ...);
 
-    if test "$ac_find_libraries" != "" ; then
-        
-  echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_link=""
-  else
-    ac_path_to_link="-L$ac_find_libraries"
-  fi
+                    wx_test_vsnprintf("%s");
+                    return 0;
+                 }
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-        XPM_LINK="-lXpm "
-        cat >> confdefs.h <<\EOF
-#define wxHAVE_LIB_XPM 1
+                 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; }
 EOF
+if { (eval echo configure:13289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    wx_cv_func_vsnprintf=yes
+                 
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    cat > conftest.$ac_ext <<EOF
+#line 13300 "configure"
+#include "confdefs.h"
 
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-        echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
-    fi
+                                      #include <stdio.h>
+                                      #include <stdarg.h>
+                                   
+int main() {
 
-    GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm"
-    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
-    TOOLKIT=MOTIF
+                                      int wx_test_vsnprintf(const char *, ...);
 
-    GUIHEADERS="\$(MOTIF_HEADERS)"
-    GUIOBJS="\$(MOTIF_GUIOBJS)"
-    COMMONOBJS="\$(MOTIF_COMMONOBJS)"
-    GENERICOBJS="\$(MOTIF_GENERICOBJS)"
-    GUIDEPS="\$(MOTIF_GUIDEPS)"
-    COMMONDEPS="\$(MOTIF_COMMONDEPS)"
-    GENERICDEPS="\$(MOTIF_GENERICDEPS)"
-    UNIXOBJS="\$(UNIX_OBJS)"
-    UNIXDEPS="\$(UNIX_DEPS)"
-    GUIDIST=MOTIF_DIST
-fi
+                                      wx_test_vsnprintf("%s");
+                                      return 0;
+                                   }
 
-if test "$wxUSE_PM" = 1; then
-    TOOLKIT=PM
+                                   int wx_test_vsnprintf(const char *fmt, ...)
+                                   {
+                                      char *s;
 
-    GUIOBJS="\$(PM_GUIOBJS)"
-    GUIHEADERS="\$(PM_HEADERS)"
-    COMMONOBJS="\$(PM_COMMONOBJS)"
-    GENERICOBJS="\$(PM_GENERICOBJS)"
-    GUIDEPS="\$(PM_GUIDEPS)"
-    COMMONDEPS="\$(PM_COMMONDEPS)"
-    GENERICDEPS="\$(PM_GENERICDEPS)"
-    UNIXOBJS=
-    UNIXDEPS=
-    GUIDIST=GTK_DIST
+                                      va_list argp;
+                                      va_start(argp, fmt);
+                                      _vsnprintf(s, 42, fmt, argp);
+                                      va_end(argp);
+                                   
+; return 0; }
+EOF
+if { (eval echo configure:13325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                                      wx_cv_func_vsnprintf=yes
+                                   
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                                      wx_cv_func_vsnprintf=no
+                                   
 fi
+rm -f conftest*
+                 
+fi
+rm -f conftest*
 
-if test "$TOOLKIT" != "PM" ; then
-    TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
-else
-    TOOLKIT_DIR="os2"
 fi
 
-TOOLKIT_DEF="-D__WX${TOOLKIT}__"
+echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
 
-WX_LIBRARY="wx_${TOOLKIT_DIR}"
+if test "$wx_cv_func_vsnprintf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF 1
+EOF
 
-        ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)"
-    if test "$wxUSE_LIBJPEG" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"  
-    fi
-    if test "$wxUSE_LIBTIFF" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
-    fi
-    if test "$wxUSE_LIBPNG" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
-    fi
-    if test "$wxUSE_ZLIB" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
-    fi
-    ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
-    ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
 else
-    
-    USE_GUI=0
+    echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
+fi
+
+echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
+echo "configure:13357: checking for vsscanf" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+  cat > conftest.$ac_ext <<EOF
+#line 13363 "configure"
+#include "confdefs.h"
+
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                
+int main() {
+
+                    int wx_test_vsscanf(const char *, ...);
 
-        ALL_OBJECTS="\$(BASE_OBJS)"
-    ALL_DEPFILES="\${BASE_DEPS}"
-    ALL_HEADERS="\${BASE_HEADERS}"
+                    wx_test_vsscanf("%d");
+                    return 0;
+                }
 
-        WX_LIBRARY="wxbase"
+                int wx_test_vsscanf(const char *fmt, ...)
+                {
+                    va_list argp;
+                    va_start(argp, fmt);
+                    vsscanf("42", fmt, argp);
+                    va_end(argp);
+                
+; return 0; }
+EOF
+if { (eval echo configure:13386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    wx_cv_func_vsscanf=yes
+                
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    wx_cv_func_vsscanf=no
+                
 fi
+rm -f conftest*
 
-WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
+fi
 
-WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
 
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+if test "$wx_cv_func_vsscanf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSSCANF 1
+EOF
 
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
+fi
 
-SHARED_LD=
-PIC_FLAG=
-WX_ALL=
-WX_ALL_INSTALLED=
-BURNT_LIBRARY_NAME=
+if test "$TOOLKIT" != "MSW"; then
 
 
-if test "$wxUSE_SHARED" = "yes"; then
-    case "${host}" in
-      *-hp-hpux* )
-        if test "$GCC" = yes ; then
-            SHARED_LD="${CC} -shared -fPIC -o"
-            PIC_FLAG="-fPIC"
-        else
-            SHARED_LD="${CXX} -b -o"
-            PIC_FLAG="+Z"
-        fi
-        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
-        WX_ALL=${WX_LIBRARY_NAME_SHARED}
-      ;;
 
-            *-*-linux* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-              ;;
-      *-*-irix5* | *-*-irix6* )
-        if test "$GCC" = yes ; then
-           SHARED_LD="${CC} -shared -o"
-           PIC_FLAG="-fPIC"
-        else
-           SHARED_LD="${CXX} -shared -o"
-        fi
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-solaris2* )
-        if test "$GCC" = yes ; then
-            SHARED_LD="${CC} -shared -o"
-            PIC_FLAG="-fPIC"
-        else
-            SHARED_LD="${CXX} -G -o"
-            PIC_FLAG="-KPIC"
-        fi
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-sunos4* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-freebsd* | *-*-netbsd*)
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-osf* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-dgux5* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-sysv5* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-aix* )
-        SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
-        WX_ALL=${WX_LIBRARY_NAME_SHARED}
-      ;;
-      *-*-cygwin32* )
-                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-      ;;
-      *-*-mingw32* )
-                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-      ;;
-      *-pc-os2_emx )
-                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-      ;;
-      *-*-beos* )
-                        SHARED_LD="${LD} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *)
-        { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; }
-    esac
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
 
-        if test "x$WX_TARGET_LIBRARY" = "x"; then
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
-    fi
+echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
+echo "configure:13424: checking if iconv() takes char**" >&5
+if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cat > conftest.$ac_ext <<EOF
+#line 13430 "configure"
+#include "confdefs.h"
+#include <iconv.h>
+int main() {
+
+        char **inbuf, **outbuf;
+        iconv_t cd;
+        size_t insz, outsz;
+        iconv(cd, inbuf, &insz, outbuf, &outsz);
+    
+; return 0; }
+EOF
+if { (eval echo configure:13442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_iconv_takes_char=yes
 else
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-    WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_iconv_takes_char=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_iconv_takes_char" 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_iconv_takes_char" = yes ; then
+    cat >> confdefs.h <<\EOF
+#define WX_ICONV_TAKES_CHAR 1
+EOF
+
 fi
 
 
-for ac_hdr in strings.h
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+    for ac_func in sigaction
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8351: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13475: 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 8356 "configure"
+#line 13480 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* 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
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8361: \"$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
+if { (eval echo configure:13503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_$ac_func=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"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define $ac_tr_func 1
 EOF
  
 else
@@ -8383,79 +13523,123 @@ else
 fi
 done
 
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8391: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+    if test "$ac_cv_func_sigaction" = "no"; then
+        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2
+        wxUSE_ON_FATAL_EXCEPTION=no
+    fi
+
+    if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+      
+      ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_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 for sa_handler type""... $ac_c" 1>&6
+echo "configure:13544: 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 8396 "configure"
+  
+        cat > conftest.$ac_ext <<EOF
+#line 13550 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+#include <signal.h>
+int main() {
+
+                        extern void testSigHandler(int);
+
+                        struct sigaction sa;
+                        sa.sa_handler = testSigHandler;
+                     
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8401: \"$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
+if { (eval echo configure:13562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  
+                        wx_cv_type_sa_handler=int
+                     
 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"
+  
+                        wx_cv_type_sa_handler=void
+                     
 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
+
+echo "$ac_t""$wx_cv_type_sa_handler" 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
+
+
+      cat >> confdefs.h <<EOF
+#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+
+    fi
 fi
-done
 
-for ac_hdr in wchar.h
+for ac_func in vfork
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8431: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13599: 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 8436 "configure"
+#line 13604 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* 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
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8441: \"$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
+if { (eval echo configure:13627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_$ac_func=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"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define $ac_tr_func 1
 EOF
  
 else
@@ -8463,121 +13647,174 @@ else
 fi
 done
 
-for ac_hdr in wcstr.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8471: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+echo $ac_n "checking for statfs""... $ac_c" 1>&6
+echo "configure:13653: checking for statfs" >&5
+if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8476 "configure"
+#line 13658 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+
+             #ifdef __DARWIN__
+               #include <sys/param.h>
+               #include <sys/mount.h>
+             #else
+               #include <sys/vfs.h>
+             #endif
+        
+int main() {
+
+             long l;
+             struct statfs fs;
+             statfs("/", &fs);
+             l = fs.f_bsize;
+             l += fs.f_blocks;
+             l += fs.f_bavail;
+        
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8481: \"$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
+if { (eval echo configure:13679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  
+             wx_cv_func_statfs=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"
+  
+             wx_cv_func_statfs=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
+
+echo "$ac_t""$wx_cv_func_statfs" 1>&6
+
+if test "$wx_cv_func_statfs" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_STATFS 1
 EOF
- 
+
 else
-  echo "$ac_t""no" 1>&6
+    echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
 fi
-done
 
-for ac_hdr in fnmatch.h
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+    for ac_func in fcntl flock
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8511: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13712: 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 8516 "configure"
+#line 13717 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* 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
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8521: \"$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
+if { (eval echo configure:13740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_$ac_func=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"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define $ac_tr_func 1
 EOF
- 
+ break
 else
   echo "$ac_t""no" 1>&6
 fi
 done
 
 
-if test "$wxUSE_GUI" = "yes"; then
-        for ac_hdr in X11/XKBlib.h
+    if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
+        echo "configure: warning: wxSingleInstanceChecker not available" 1>&2
+        wxUSE_SNGLINST_CHECKER=no
+    fi
+fi
+
+for ac_func in timegm
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8553: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13774: 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 8558 "configure"
+#line 13779 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* 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
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8563: \"$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
+if { (eval echo configure:13802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_$ac_func=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"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define $ac_tr_func 1
 EOF
  
 else
@@ -8585,801 +13822,815 @@ else
 fi
 done
 
-fi
-
 
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8593: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+for ac_func in putenv setenv
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13830: 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 8598 "configure"
+#line 13835 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.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
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8606: \"$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
+if { (eval echo configure:13858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_header_stdc=yes
+  eval "ac_cv_func_$ac_func=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_header_stdc=no
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
+fi
 
-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 8623 "configure"
-#include "confdefs.h"
-#include <string.h>
+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
-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
+ break
+else
+  echo "$ac_t""no" 1>&6
 fi
-rm -f conftest*
+done
 
-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 <<EOF
-#line 8641 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
+HAVE_SOME_SLEEP_FUNC=0
+if test "$USE_BEOS" = 1; then
+            cat >> confdefs.h <<\EOF
+#define HAVE_SLEEP 1
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
+
+    HAVE_SOME_SLEEP_FUNC=1
 fi
-rm -f conftest*
 
+if test "$USE_DARWIN" = 1; then
+            cat >> confdefs.h <<\EOF
+#define HAVE_USLEEP 1
+EOF
+
+    HAVE_SOME_SLEEP_FUNC=1
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
+if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
+        POSIX4_LINK=
+    for ac_func in nanosleep
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13905: 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 8662 "configure"
+#line 13910 "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); }
+/* 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:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
+if { (eval echo configure:13933: \"$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 -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
+rm -f conftest*
 fi
 
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
+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
 
-fi
-
-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:8697: checking for mode_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
+echo "configure:13958: 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
-  cat > conftest.$ac_ext <<EOF
-#line 8702 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lposix4  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13966 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
+/* 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 nanosleep();
+
+int main() {
+nanosleep()
+; return 0; }
 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
+if { (eval echo configure:13977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_type_mode_t=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_mode_t=no
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 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
+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
 
-fi
+                    POSIX4_LINK="-lposix4"
+                
+else
+  echo "$ac_t""no" 1>&6
 
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:8730: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+                    for ac_func in usleep
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14005: 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 8735 "configure"
+#line 14010 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.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 "$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
+if { (eval echo configure:14033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_type_off_t=yes
+  eval "ac_cv_func_$ac_func=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_off_t=no
+  eval "ac_cv_func_$ac_func=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
+
+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
+  echo "$ac_t""no" 1>&6
+echo "configure: warning: wxSleep() function will not work" 1>&2
+                    
+fi
+done
+
+                
+            
 fi
 
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:8763: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+        
+    
+fi
+done
+
+fi
+
+for ac_func in uname gethostname
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14076: 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 8768 "configure"
+#line 14081 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.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 "$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
+if { (eval echo configure:14104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_type_pid_t=yes
+  eval "ac_cv_func_$ac_func=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_pid_t=no
+  eval "ac_cv_func_$ac_func=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
+
+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
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 
-fi
 
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:8796: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; 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
+
+
+for ac_func in strtok_r
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14141: 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 8801 "configure"
+#line 14146 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.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();
+
+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 "$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
+if { (eval echo configure:14172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_type_size_t=yes
+  eval "ac_cv_func_$ac_func=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_size_t=no
+  eval "ac_cv_func_$ac_func=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
 
+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
 
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:8829: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+
+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
+
+
+INET_LINK=
+for ac_func in inet_addr
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14209: 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 8834 "configure"
+#line 14214 "configure"
 #include "confdefs.h"
-#include <sys/types.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 "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
+if { (eval echo configure:14237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_type_uid_t=yes
+  eval "ac_cv_func_$ac_func=yes"
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_uid_t=no
+  eval "ac_cv_func_$ac_func=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
+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 gid_t int
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
 EOF
 
-fi
-
-
-
-echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:8865: checking for pw_gecos in struct passwd" >&5
-if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
+echo "configure:14262: 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
-  
-        cat > conftest.$ac_ext <<EOF
-#line 8871 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lnsl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14270 "configure"
 #include "confdefs.h"
-#include <pwd.h>
-int main() {
+/* 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 inet_addr();
 
-                char *p;
-                struct passwd *pw;
-                p = pw->pw_gecos;
-             
+int main() {
+inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:8882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  
-                wx_cv_struct_pw_gecos=yes
-                cat >> confdefs.h <<\EOF
-#define HAVE_PW_GECOS 1
-EOF
-
-             
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                wx_cv_struct_pw_gecos=no
-             
-        
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-    
+LIBS="$ac_save_LIBS"
 
 fi
-
-echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
-
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:8909: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  INET_LINK="nsl"
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
+echo "configure:14300: 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
-  cat > conftest.$ac_ext <<EOF
-#line 8914 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14308 "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 inet_addr();
 
 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;
-}
-{ /* 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;
-}
-
+inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:8963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_c_const=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_c_const=no
+  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
+  echo "$ac_t""no" 1>&6
 fi
 
-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
+
+    
 
 fi
+done
 
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:8984: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+
+for ac_func in inet_aton
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14352: 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
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 8991 "configure"
+#line 14357 "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() {
-} $ac_kw foo() {
+
+/* The GNU C library defines this for functions which it 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:8998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
+  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*
-done
-
 fi
 
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
+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 inline $ac_cv_c_inline
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ATON 1
 EOF
- ;;
-esac
-
 
-echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:9025: 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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_char=1
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9033 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char));
-  exit(0);
-}
-EOF
-if { (eval echo configure:9044: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_char=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_char" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-EOF
-
-
-echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:9064: checking size of short" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+  echo "$ac_t""no" 1>&6
+            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
+echo "configure:14405: 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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_short=2
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9072 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$INET_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14413 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(short));
-  exit(0);
-}
+/* 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 inet_aton();
+
+int main() {
+inet_aton()
+; return 0; }
 EOF
-if { (eval echo configure:9083: \"$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`
+if { (eval echo configure:14424: \"$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 -fr conftest*
-  ac_cv_sizeof_short=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 fi
-echo "$ac_t""$ac_cv_sizeof_short" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
+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
 
-
-echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:9103: checking size of int *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int_p=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9111 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int *));
-  exit(0);
-}
-EOF
-if { (eval echo configure:9122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int_p=`cat conftestval`
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int_p=0
-fi
-rm -fr conftest*
+  echo "$ac_t""no" 1>&6
 fi
 
+        
 fi
-echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT_P $ac_cv_sizeof_int_p
-EOF
+done
 
 
-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:9142: 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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9150 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
-}
+if test "x$INET_LINK" != "x"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
 EOF
-if { (eval echo configure:9161: \"$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
-rm -fr conftest*
+
+    INET_LINK="-l$INET_LINK"
 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:9181: 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
-  ac_cv_sizeof_long=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9189 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
-}
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# 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.
+#
 EOF
-if { (eval echo configure:9200: \"$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`
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
 fi
+rm -f confcache
 
-fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
 
 
-echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:9220: 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
-  ac_cv_sizeof_long_long=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9228 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
-}
-EOF
-if { (eval echo configure:9239: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long_long=0
-fi
-rm -fr conftest*
-fi
+if test "$TOOLKIT" != "MSW"; then
 
-fi
-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-EOF
 
+THREADS_LINK=
+THREADS_OBJ=
+CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
+
+if test "$wxUSE_THREADS" = "yes" ; then
+    if test "$wxUSE_WINE" = 1 ; then
+        echo "configure: warning: Threads are not supported under WINE" 1>&2
+        wxUSE_THREADS="no"
+    elif test "$USE_BEOS" = 1; then
+        echo "configure: warning: BeOS threads are not yet supported" 1>&2
+        wxUSE_THREADS="no"
+    fi
+fi
 
+if test "$wxUSE_THREADS" = "yes" ; then
+    
+        if test "$USE_AIX" = 1; then
+        THREADS_LIB=pthreads
+    else
+        THREADS_LIB=pthread
+    fi
 
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:9260: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+                echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
+echo "configure:14539: checking for pthread_create in -l$THREADS_LIB" >&5
+ac_lib_var=`echo $THREADS_LIB'_'pthread_create | 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_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9267 "configure"
+#line 14547 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
+/* 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 pthread_create();
 
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:9278: \"$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.
-cat > conftest.$ac_ext <<EOF
-#line 9282 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
 int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:9293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_c_bigendian=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_c_bigendian=no
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+LIBS="$ac_save_LIBS"
+
 fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-  ac_cv_c_bigendian=unknown
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+            THREADS_OBJ="threadpsx.lo"
+            THREADS_LINK=$THREADS_LIB
+        
 else
-  cat > conftest.$ac_ext <<EOF
-#line 9313 "configure"
+  echo "$ac_t""no" 1>&6
+
+                        echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+echo "configure:14581: checking for pthread_create in -lc_r" >&5
+ac_lib_var=`echo c_r'_'pthread_create | 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="-lc_r  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14589 "configure"
 #include "confdefs.h"
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
+/* 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 pthread_create();
+
+int main() {
+pthread_create()
+; return 0; }
 EOF
-if { (eval echo configure:9326: \"$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
+if { (eval echo configure:14600: \"$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 -fr conftest*
-  ac_cv_c_bigendian=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = unknown; then
-  echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-if test $ac_cv_c_bigendian = yes; then
-  cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
+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
+  
+                THREADS_OBJ="threadpsx.lo"
+                THREADS_LINK="c_r"
+            
+else
+  echo "$ac_t""no" 1>&6
 
-
-
-  if test "$cross_compiling" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_IOSTREAMH 1
-EOF
-
-  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
-
-
-    for ac_hdr in iostream
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9373: checking for $ac_hdr" >&5
+                                ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
+echo "configure:14624: checking for sys/prctl.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 9378 "configure"
+#line 14629 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+#include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14634: \"$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*
@@ -9395,171 +14646,146 @@ 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
- 
+  
+                    THREADS_OBJ="threadsgi.lo"
+                
 else
   echo "$ac_t""no" 1>&6
 fi
-done
-
-
-    if test "x$HAVE_IOSTREAM" = x ; then
-      cat >> confdefs.h <<\EOF
-#define wxUSE_IOSTREAMH 1
-EOF
 
-    else
-      :
-    fi
-
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+            
+fi
 
-  fi
+        
+fi
 
 
+    if test -z "$THREADS_OBJ" ; then
+        wxUSE_THREADS=no
+        echo "configure: warning: No thread support on this system" 1>&2
+    fi
+fi
 
-  echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:9431: checking if C++ compiler supports bool" >&5
-if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
+if test "$wxUSE_THREADS" = "yes" ; then
+  for ac_func in thr_setconcurrency
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14674: 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
-  
-    
-    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 9446 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14679 "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() {
 
-        bool b = true;
+/* The GNU C library defines this for functions which it 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;
-      
 ; return 0; }
 EOF
-if { (eval echo configure:9458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  
-        cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 1
-EOF
-
-        wx_cv_cpp_bool=yes
-      
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-        wx_cv_cpp_bool=no
-      
-    
+  eval "ac_cv_func_$ac_func=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""$wx_cv_cpp_bool" 1>&6
-
-  if test "$wx_cv_cpp_bool" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 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
-
-  fi
-
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 
 
-echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:9500: checking if you need GNU extensions" >&5
-if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then
+                            
+  for ac_hdr in sched.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:14732: 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 9506 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14737 "configure"
 #include "confdefs.h"
-#include <features.h>
-int main() {
-
-
-#ifndef __GNU_LIBRARY__
- Compile error wanted
-#endif
-
-
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:9519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:14742: \"$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*
-  wx_cv_gnu_extensions=yes
+  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*
-  wx_cv_gnu_extensions=no
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-
-
-echo "$ac_t""$wx_cv_gnu_extensions" 1>&6
-if test "$wx_cv_gnu_extensions" = "yes"; then
+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 _GNU_SOURCE 1
+#define $ac_tr_hdr 1
 EOF
-
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
 
-
-echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:9544: checking for wcslen in -lc" >&5
-ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
+  echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14770: checking for sched_yield in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'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
   ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9552 "configure"
+#line 14778 "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 wcslen();
+char sched_yield();
 
 int main() {
-wcslen()
+sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:9563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14789: \"$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
@@ -9574,37 +14800,33 @@ 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_WCSLEN 1
+  cat >> confdefs.h <<\EOF
+#define HAVE_SCHED_YIELD 1
 EOF
 
-            WCHAR_LINK=""
-        
 else
   echo "$ac_t""no" 1>&6
-
-            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:9589: checking for wcslen in -lw" >&5
-ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:14811: 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
   ac_save_LIBS="$LIBS"
-LIBS="-lw  $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9597 "configure"
+#line 14819 "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 wcslen();
+char sched_yield();
 
 int main() {
-wcslen()
+sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:9608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14830: \"$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
@@ -9619,747 +14841,598 @@ 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_WCSLEN 1
+  cat >> confdefs.h <<\EOF
+#define HAVE_SCHED_YIELD 1
 EOF
-
-                WCHAR_LINK="-lw"
-            
+ POSIX4_LINK="-lposix4"
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Yield will not work properly" 1>&2
+                
 fi
 
-        
+               
 fi
 
 
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:9639: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+              HAVE_PRIOR_FUNCS=0
+  echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14861: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | 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
-  cat > conftest.$ac_ext <<EOF
-#line 9644 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14869 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vprintf(); 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 vprintf();
+char pthread_attr_getschedpolicy();
 
 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_vprintf) || defined (__stub___vprintf)
-choke me
-#else
-vprintf();
-#endif
-
+pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
-if { (eval echo configure:9667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_vprintf=yes"
+  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_func_vprintf=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+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_VPRINTF 1
-EOF
+  echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14896: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | 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$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14904 "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 pthread_attr_setschedparam();
 
+int main() {
+pthread_attr_setschedparam()
+; return 0; }
+EOF
+if { (eval echo configure:14915: \"$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 "$ac_t""no" 1>&6
+  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"
 
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:9691: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14931: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'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
-  cat > conftest.$ac_ext <<EOF
-#line 9696 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14939 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt(); 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 _doprnt();
+char sched_get_priority_max();
 
 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__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
-
+sched_get_priority_max()
 ; return 0; }
 EOF
-if { (eval echo configure:9719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func__doprnt=yes"
+  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_func__doprnt=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
+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_DOPRNT 1
-EOF
-
+  HAVE_PRIOR_FUNCS=1
 else
   echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-
-for ac_func in vsnprintf
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9747: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:14969: 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
-  cat > conftest.$ac_ext <<EOF
-#line 9752 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lposix4  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14977 "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();
+char sched_get_priority_max();
 
 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
-
+sched_get_priority_max()
 ; return 0; }
 EOF
-if { (eval echo configure:9775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14988: \"$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"
+  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_func_$ac_func=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = 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_VSNPRINTF 1
-EOF
-
+  
+                            HAVE_PRIOR_FUNCS=1
+                            POSIX4_LINK="-lposix4"
+                         
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
-              
 fi
-done
-
-
-
-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 for vsscanf""... $ac_c" 1>&6
-echo "configure:9815: checking for vsscanf" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-  if test "$cross_compiling" = yes; then
-  wx_cv_func_vsscanf=no
-             
-else
-  cat > conftest.$ac_ext <<EOF
-#line 9825 "configure"
-#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-                #include <stdio.h>
-                #include <stdarg.h>
-
-                int try_vsscanf(const char *format, ...)
-                {
-                  va_list ap;
-                  va_start(ap, format);
-
-                  vsscanf("17", format, ap);
-
-                  va_end(ap);
-                }
 
-                int main()
-                {
-                  int i;
-                  try_vsscanf("%d", &i);
-                  return i == 17 ? 0 : 1;
-                }
-             
-EOF
-if { (eval echo configure:9852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-                cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
+                   
+fi
 
-                wx_cv_func_vsscanf=yes
-             
+                 
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  wx_cv_func_vsscanf=no
-fi
-rm -fr conftest*
+  echo "$ac_t""no" 1>&6
 fi
 
-
+               
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-echo "$ac_t""$wx_cv_func_vsscanf" 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 "$HAVE_PRIOR_FUNCS" = 1; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
+EOF
 
-if test "$USE_UNIX" = 1; then
+  else
+    echo "configure: warning: Setting thread priority will not work" 1>&2
+  fi
 
-for ac_func in vfork
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9888: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:15035: checking for pthread_cancel in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | 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
-  cat > conftest.$ac_ext <<EOF
-#line 9893 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15043 "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();
+char pthread_cancel();
 
 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
-
+pthread_cancel()
 ; return 0; }
 EOF
-if { (eval echo configure:9916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15054: \"$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"
+  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_func_$ac_func=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = 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
+  cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_CANCEL 1
 EOF
- 
+
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
 fi
-done
 
 
-for ac_func in timegm
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9944: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
+echo "configure:15080: 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 9949 "configure"
+  
+    cat > conftest.$ac_ext <<EOF
+#line 15086 "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();
-
+#include <pthread.h>
 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
-
+                    pthread_cleanup_push(NULL, NULL);
+                    pthread_cleanup_pop(0);
+                 
 ; return 0; }
 EOF
-if { (eval echo configure:9972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  
+                    wx_cv_func_pthread_cleanup_push=yes
+                 
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  
+                    wx_cv_func_pthread_cleanup_push=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
-
+echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
 
-HAVE_SOME_SLEEP_FUNC=0
-if test "$USE_BEOS" = 1; then
-            cat >> confdefs.h <<\EOF
-#define HAVE_SLEEP 1
+  if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
 EOF
 
-    HAVE_SOME_SLEEP_FUNC=1
-fi
+  fi
 
-if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
-        POSIX4_LINK=
-    for ac_func in nanosleep
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10011: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+                
+          if test "x$wx_lib_glibc21" = "xyes"; then
+      CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+  fi
+
+  echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
+echo "configure:15128: 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
-  cat > conftest.$ac_ext <<EOF
-#line 10016 "configure"
+  
+    cat > conftest.$ac_ext <<EOF
+#line 15134 "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();
-
+#include <pthread.h>
 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
-
+           pthread_mutexattr_t attr;
+           pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+        
 ; return 0; }
 EOF
-if { (eval echo configure:10039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  
+           wx_cv_type_pthread_mutexattr_t=yes
+        
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  
+           wx_cv_type_pthread_mutexattr_t=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
+echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6
+
+  if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_MUTEXATTR_T 1
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:10064: 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
+  else
+        echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
+echo "configure:15171: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix4  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 10072 "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 nanosleep();
-
+  
+        cat > conftest.$ac_ext <<EOF
+#line 15177 "configure"
+#include "confdefs.h"
+#include <pthread.h>
 int main() {
-nanosleep()
+
+                pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+            
 ; return 0; }
 EOF
-if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                wx_cv_type_pthread_rec_mutex_init=yes
+            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+                wx_cv_type_pthread_rec_mutex_init=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
+
+echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6
+    if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
 EOF
 
-                    POSIX4_LINK="-lposix4"
-                
-else
-  echo "$ac_t""no" 1>&6
+    else
+            echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
+    fi
+  fi
 
-                    for ac_func in usleep
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10111: 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 10116 "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();
+  THREADS_LINK="-l$THREADS_LINK"
 
-int main() {
+      if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
+      CPPFLAGS="${CFLAGS} -mt"
+      CXXFLAGS="${CXXFLAGS} -mt"
+      LDFLAGS="${LDFLAGS} -mt"
+  fi
+fi
 
-/* The GNU C library defines this for functions which it 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
+fi
 
-; return 0; }
+if test "$wxUSE_THREADS" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_THREADS 1
 EOF
-if { (eval echo configure:10139: \"$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"
+
+
+    if test "$USE_DARWIN" != 1; then
+    TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
+  fi
+
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+      if test "$ac_cv_func_strtok_r" = "yes"; then
+    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
+echo "configure:15240: checking if -D_REENTRANT is needed" >&5
+    if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
+        echo "$ac_t""yes" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+    fi
+  fi
 fi
-rm -f conftest*
+
+if test "$WXGTK20" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK20__ $WXGTK20
+EOF
+
+  WXGTK12=1
 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'`
+if test "$WXGTK12" = 1 ; then
   cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+#define __WXGTK12__ $WXGTK12
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+
 fi
-done
 
-                    echo "configure: warning: wxSleep() function will not work" 1>&2
-                
-            
+if test "$WXGTK127" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK127__ $WXGTK127
+EOF
+
 fi
 
-        
-    
+WXDEBUG=
+
+if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+    WXDEBUG="-g"
+    wxUSE_OPTIMISE=no
 fi
-done
 
+if test "$wxUSE_DEBUG_GDB" = "yes" ; then
+    wxUSE_DEBUG_INFO=yes
+    WXDEBUG="-ggdb"
 fi
 
-for ac_func in uname gethostname
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10178: 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
+if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define WXDEBUG 1
+EOF
+
+    WXDEBUG_DEFINE="-D__WXDEBUG__"
 else
-  cat > conftest.$ac_ext <<EOF
-#line 10183 "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();
+    if test "$wxUSE_GTK" = 1 ; then
+        WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+    fi
+fi
 
-int main() {
+if test "$wxUSE_MEM_TRACING" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MEMORY_TRACING 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
+    cat >> confdefs.h <<\EOF
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
+EOF
 
-; return 0; }
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DEBUG_NEW_ALWAYS 1
 EOF
-if { (eval echo configure:10206: \"$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"
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi
-rm -f conftest*
+
+if test "$wxUSE_DMALLOC" = "yes" ; then
+    DMALLOC_LINK="-ldmalloc"
 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
-else
-  echo "$ac_t""no" 1>&6
+PROFILE=
+if test "$wxUSE_PROFILE" = "yes" ; then
+    PROFILE="-pg"
+fi
+
+if test "$GCC" = yes ; then
+    if test "$wxUSE_NO_RTTI" = "yes" ; then
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
+    fi
+    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions"
+    fi
+    if test "$wxUSE_PERMISSIVE" = "yes" ; then
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
+    fi
+    if test "$wxUSE_NO_DEPS" = "no" ; then
+        CFLAGS="-MMD ${CFLAGS}"
+        CXXFLAGS="-MMD ${CXXFLAGS}"
+    fi
+    if test "$USE_WIN32" = 1 ; then
+        # I'm not even really sure what this was ever added to solve,
+        # but someone added it for mingw native builds, so I guess
+        # they had a reason, right??
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
+    fi
 fi
-done
 
 
-for ac_func in strtok_r
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10234: 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
+CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
+CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
+if test "$wxUSE_OPTIMISE" = "no" ; then
+    OPTIMISE=
 else
-  cat > conftest.$ac_ext <<EOF
-#line 10239 "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();
+    if test "$GCC" = yes ; then
+        OPTIMISE="-O2"
+        case "${host}" in
+            i586-*-*|i686-*-* )
+            OPTIMISE="${OPTIMISE} "
+        ;;
+        esac
+    else
+        OPTIMISE="-O"
+    fi
+fi
 
-int main() {
+if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2 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
 
-; return 0; }
-EOF
-if { (eval echo configure:10262: \"$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*
+    WXWIN_COMPATIBILITY_2_2="yes"
 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
+if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2_2 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+
 fi
-done
 
 
-INET_LINK=
-for ac_func in inet_addr
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10291: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ZLIB_INCLUDE=
+if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ZLIB 1
+EOF
+
+  if test "$wxUSE_ZLIB" = "yes" ; then
+    ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
+  else
+    ZLIB_LINK=
+    ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
+echo "configure:15390: 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
   cat > conftest.$ac_ext <<EOF
-#line 10296 "configure"
+#line 15395 "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; }
+#include <zlib.h>
 EOF
-if { (eval echo configure:10319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15400: \"$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_func_$ac_func=yes"
+  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_func_$ac_func=no"
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
 fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = 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
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:10344: checking for inet_addr in -lnsl" >&5
-ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
+  echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
+echo "configure:15417: 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="-lnsl  $LIBS"
+LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10352 "configure"
+#line 15425 "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 inet_addr();
+char deflate();
 
 int main() {
-inet_addr()
+deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:10363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15436: \"$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
@@ -10374,30 +15447,85 @@ 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"
+  ZLIB_LINK="-lz"
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:10382: checking for inet_addr in -lresolv" >&5
-ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test "x$ZLIB_LINK" = "x" ; then
+        { echo "configure: error: system zlib compression library not found! Use --with-zlib=yes to use built-in zlib" 1>&2; exit 1; }
+    fi
+  fi
+fi
+
+PNG_INCLUDE=
+if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBPNG 1
+EOF
+
+      if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+    echo "configure: warning: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" 1>&2
+    wxUSE_LIBPNG=yes
+  fi
+
+  if test "$wxUSE_LIBPNG" = "yes" ; then
+    PNG_INCLUDE="-I\${top_srcdir}/src/png"
+  else
+    PNG_LINK=
+    ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for png.h""... $ac_c" 1>&6
+echo "configure:15483: 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 15488 "configure"
+#include "confdefs.h"
+#include <png.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15493: \"$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
+  echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+echo "configure:15510: 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
   ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
+LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10390 "configure"
+#line 15518 "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 inet_addr();
+char png_check_sig();
 
 int main() {
-inet_addr()
+png_check_sig()
 ; return 0; }
 EOF
-if { (eval echo configure:10401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15529: \"$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
@@ -10412,97 +15540,90 @@ 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"
-            
+  PNG_LINK="-lpng"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-        
+                   
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-    
+    if test "x$PNG_LINK" = "x" ; then
+        { echo "configure: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" 1>&2; exit 1; }
+    fi
+  fi
 
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
-done
 
+JPEG_INCLUDE=
+if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBJPEG 1
+EOF
 
-for ac_func in inet_aton
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10434: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  if test "$wxUSE_LIBJPEG" = "yes" ; then
+    JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+  else
+    JPEG_LINK=
+                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:15573: checking for jpeglib.h" >&5
+    if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10439 "configure"
+#line 15578 "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();
 
+                #undef HAVE_STDLIB_H
+                #include <stdio.h>
+                #include <jpeglib.h>
+            
 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:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  ac_cv_header_jpeglib_h=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  ac_cv_header_jpeglib_h=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
+    echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
 
-else
-  echo "$ac_t""no" 1>&6
-            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:10487: checking for inet_aton in -l$INET_LINK" >&5
-ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
+    if test "$ac_cv_header_jpeglib_h" = "yes"; then
+        echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+echo "configure:15608: 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
   ac_save_LIBS="$LIBS"
-LIBS="-l$INET_LINK  $LIBS"
+LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10495 "configure"
+#line 15616 "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 inet_aton();
+char jpeg_read_header();
 
 int main() {
-inet_aton()
+jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:10506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15627: \"$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
@@ -10517,118 +15638,78 @@ 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
-
+  JPEG_LINK="-ljpeg"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-        
-fi
-done
-
-
-if test "x$INET_LINK" != "x"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_INET_ADDR 1
-EOF
-
-    INET_LINK="-l$INET_LINK"
-fi
-
-fi
-
+    fi
 
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# 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.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
+    if test "x$JPEG_LINK" = "x" ; then
+        { echo "configure: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" 1>&2; exit 1; }
+    fi
   fi
 fi
-rm -f confcache
-
-
-
-if test "$USE_UNIX" = 1; then
-
 
-THREADS_LINK=""
-THREADS_OBJ=""
+TIFF_INCLUDE=
+if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBTIFF 1
+EOF
 
-if test "$wxUSE_THREADS" = "yes" ; then
-    if test "$wxUSE_WINE" = 1 ; then
-        echo "configure: warning: Threads are not supported under WINE" 1>&2
-        wxUSE_THREADS="no"
-    elif test "$USE_BEOS" = 1; then
-        echo "configure: warning: BeOS threads are not yet supported" 1>&2
-        wxUSE_THREADS="no"
-    fi
+  if test "$wxUSE_LIBTIFF" = "yes" ; then
+    TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+  else
+    TIFF_LINK=
+    ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
+echo "configure:15667: 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 15672 "configure"
+#include "confdefs.h"
+#include <tiffio.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15677: \"$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
-
-if test "$wxUSE_THREADS" = "yes" ; then
-    
-                echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:10613: checking for pthread_create in -lpthread" >&5
-ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+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:15694: 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="-lpthread  $LIBS"
+LIBS="-ltiff -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10621 "configure"
+#line 15702 "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 pthread_create();
+char TIFFError();
 
 int main() {
-pthread_create()
+TIFFError()
 ; return 0; }
 EOF
-if { (eval echo configure:10632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15713: \"$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
@@ -10643,34 +15724,80 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-            THREADS_OBJ="threadpsx.lo"
-            THREADS_LINK="pthread"
-        
+  TIFF_LINK="-ltiff"
 else
   echo "$ac_t""no" 1>&6
+fi
 
-                        echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:10655: checking for pthread_create in -lc_r" >&5
-ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test "x$TIFF_LINK" = "x" ; then
+        { echo "configure: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" 1>&2; exit 1; }
+    fi
+  fi
+fi
+
+FREETYPE_INCLUDE=
+if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FREETYPE 1
+EOF
+
+  if test "$wxUSE_FREETYPE" = "yes" ; then
+    FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
+  else
+    FREETYPE_LINK=
+    ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
+echo "configure:15755: checking for freetype.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 15760 "configure"
+#include "confdefs.h"
+#include <freetype.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15765: \"$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
+  echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
+echo "configure:15782: checking for FT_Render_Glyph in -lfreetype" >&5
+ac_lib_var=`echo freetype'_'FT_Render_Glyph | 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="-lc_r  $LIBS"
+LIBS="-lfreetype -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10663 "configure"
+#line 15790 "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 pthread_create();
+char FT_Render_Glyph();
 
 int main() {
-pthread_create()
+FT_Render_Glyph()
 ; return 0; }
 EOF
-if { (eval echo configure:10674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15801: \"$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
@@ -10685,71 +15812,261 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-                THREADS_OBJ="threadpsx.lo"
-                THREADS_LINK="c_r"
-            
+  FREETYPE_LINK="-lfreetype"
 else
   echo "$ac_t""no" 1>&6
+fi
 
-                                ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:10698: checking for sys/prctl.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 10703 "configure"
-#include "confdefs.h"
-#include <sys/prctl.h>
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test "x$FREETYPE_LINK" = "x" ; then
+        { echo "configure: error: system freetype library not found! Use --with-freetype=yes to use the built-in freetype" 1>&2; exit 1; }
+    fi
+  fi
+fi
+
+
+if test "$wxUSE_GUI" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GUI 1
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10708: \"$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"
+
+
+                      else
+  cat >> confdefs.h <<\EOF
+#define wxUSE_NOGUI 1
+EOF
+
 fi
-rm -f conftest*
+
+
+if test "$wxUSE_UNIX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_UNIX 1
+EOF
+
+fi
+
+
+if test "$wxUSE_APPLE_IEEE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_APPLE_IEEE 1
+EOF
+
+fi
+
+if test "$wxUSE_TIMER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_TIMER 1
+EOF
+
+fi
+
+if test "$wxUSE_WAVE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_WAVE 1
+EOF
+
+fi
+
+if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CMDLINE_PARSER 1
+EOF
+
+fi
+
+if test "$wxUSE_STOPWATCH" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STOPWATCH 1
+EOF
+
+fi
+
+if test "$wxUSE_DATETIME" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#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
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FILE 1
+EOF
+
+fi
+
+if test "$wxUSE_FFILE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FFILE 1
+EOF
+
+fi
+
+if test "$wxUSE_FILESYSTEM" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FILESYSTEM 1
+EOF
+
+fi
+
+if test "$wxUSE_FS_INET" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FS_INET 1
+EOF
+
+fi
+
+if test "$wxUSE_FS_ZIP" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FS_ZIP 1
+EOF
+
+fi
+
+if test "$wxUSE_ZIPSTREAM" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ZIPSTREAM 1
+EOF
+
+fi
+
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ON_FATAL_EXCEPTION 1
+EOF
+
+fi
+
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_SNGLINST_CHECKER 1
+EOF
+
+fi
+
+if test "$wxUSE_BUSYINFO" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUSYINFO 1
+EOF
+
+fi
+
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STD_IOSTREAM 1
+EOF
+
+fi
+
+if test "$wxUSE_TEXTFILE" = "yes"; then
+  if test "$wxUSE_FILE" != "yes"; then
+    echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2
+  else
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTFILE 1
+EOF
+
+  fi
+fi
+
+if test "$wxUSE_CONFIG" = "yes" ; then
+  if test "$wxUSE_TEXTFILE" != "yes"; then
+    echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
+  else
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CONFIG 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
+  fi
+fi
+
+if test "$wxUSE_INTL" = "yes" ; then
+  if test "$wxUSE_FILE" != "yes"; then
+    echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
+  else
+    cat >> confdefs.h <<\EOF
+#define wxUSE_INTL 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
+    GUIDIST="$GUIDIST INTL_DIST"
+  fi
+fi
+
+if test "$wxUSE_LOG" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LOG 1
+EOF
+
+
+    if test "$wxUSE_LOGGUI" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define wxUSE_LOGGUI 1
+EOF
+
+    fi
+
+    if test "$wxUSE_LOGWINDOW" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define wxUSE_LOGWINDOW 1
+EOF
+
+    fi
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                    THREADS_OBJ="threadsgi.lo"
-                
-else
-  echo "$ac_t""no" 1>&6
+
+if test "$wxUSE_LONGLONG" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LONGLONG 1
+EOF
+
 fi
 
-            
+if test "$wxUSE_GEOMETRY" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GEOMETRY 1
+EOF
+
 fi
 
-        
+if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_DIALUP_MANAGER 1
+EOF
+
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 fi
 
+if test "$wxUSE_STREAMS" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STREAMS 1
+EOF
 
-    if test -z "$THREADS_OBJ" ; then
-        wxUSE_THREADS=no
-        echo "configure: warning: No thread support on this system" 1>&2
-    fi
 fi
 
-if test "$wxUSE_THREADS" = "yes" ; then
-  for ac_func in thr_setconcurrency
+
+if test "$wxUSE_DATETIME" = "yes"; then
+        for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10748: checking for $ac_func" >&5
+echo "configure:16065: 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 10753 "configure"
+#line 16070 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10772,7 +16089,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16093: \"$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
@@ -10797,580 +16114,427 @@ fi
 done
 
 
-                            
-  for ac_hdr in sched.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10806: 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 10811 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10816: \"$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
-
-
-  echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:10844: checking for sched_yield in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+        echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
+echo "configure:16119: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 10852 "configure"
+  
+                        cat > conftest.$ac_ext <<EOF
+#line 16125 "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 sched_yield();
 
+                                #include <time.h>
+                            
 int main() {
-sched_yield()
+
+                                int tz;
+                                tz = timezone;
+                            
 ; return 0; }
 EOF
-if { (eval echo configure:10863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                                wx_cv_var_timezone=timezone
+                            
 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
-
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:10885: checking for sched_yield in -l"posix4"" >&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
-  ac_save_LIBS="$LIBS"
-LIBS="-l"posix4"  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 10893 "configure"
+  
+                                cat > conftest.$ac_ext <<EOF
+#line 16148 "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 sched_yield();
 
+                                        #include <time.h>
+                                    
 int main() {
-sched_yield()
+
+                                        int tz;
+                                        tz = _timezone;
+                                    
 ; return 0; }
 EOF
-if { (eval echo configure:10904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                                        wx_cv_var_timezone=_timezone
+                                    
 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
-  echo "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Yield will not work properly" 1>&2
-                
-fi
-
-               
-fi
-
-
-                echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:10934: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | 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$THREADS_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 10942 "configure"
+  
+                                        cat > conftest.$ac_ext <<EOF
+#line 16171 "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 pthread_attr_getschedpolicy();
 
+                                                #include <time.h>
+                                            
 int main() {
-pthread_attr_getschedpolicy()
+
+                                                int tz;
+                                                tz = __timezone;
+                                            
 ; return 0; }
 EOF
-if { (eval echo configure:10953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                                                wx_cv_var_timezone=__timezone
+                                            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  { echo "configure: error: no timezone variable" 1>&2; exit 1; }
+                                        
 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_THREAD_PRIORITY_FUNCTIONS 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
-echo "configure:10975: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | 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"posix4"  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 10983 "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 pthread_attr_getschedpolicy();
-
-int main() {
-pthread_attr_getschedpolicy()
-; return 0; }
-EOF
-if { (eval echo configure:10994: \"$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_THREAD_PRIORITY_FUNCTIONS 1
-EOF
- POSIX4_LINK="-lposix4"
-else
-  echo "$ac_t""no" 1>&6
-echo "configure: warning: Setting thread priority will not work" 1>&2
-                
+rm -f conftest*
+                   
+    
 fi
 
-               
-fi
+echo "$ac_t""$wx_cv_var_timezone" 1>&6
 
+        cat >> confdefs.h <<EOF
+#define WX_TIMEZONE $wx_cv_var_timezone
+EOF
 
-  echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:11024: checking for pthread_cancel in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+        for ac_func in localtime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:16218: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 11032 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 16223 "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 pthread_cancel();
+char $ac_func();
 
 int main() {
-pthread_cancel()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:11043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16246: \"$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"
+  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_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_PTHREAD_CANCEL 1
+    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
-echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
 fi
+done
 
 
-  echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:11069: checking for pthread_cleanup_push/pop" >&5
-if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
+    if test "$ac_cv_func_localtime" = "yes"; then
+        echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
+echo "configure:16273: 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 11075 "configure"
+            cat > conftest.$ac_ext <<EOF
+#line 16279 "configure"
 #include "confdefs.h"
-#include <pthread.h>
+
+                    #include <time.h>
+                
 int main() {
 
-                    pthread_cleanup_push(NULL, NULL);
-                    pthread_cleanup_pop(0);
-                 
+                    struct tm tm;
+                    tm.tm_gmtoff++;
+                
 ; return 0; }
 EOF
-if { (eval echo configure:11085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                    wx_cv_func_pthread_cleanup_push=yes
-                    cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-EOF
-
-                 
+                    wx_cv_struct_tm_has_gmtoff=yes
+                
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                    wx_cv_func_pthread_cleanup_push=no
-                 
+  wx_cv_struct_tm_has_gmtoff=no
+            
 fi
 rm -f conftest*
-  
-fi
-
-echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
-
-  THREADS_LINK="-l$THREADS_LINK"
+        
 fi
 
-fi
+echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
+    fi
 
-if test "$wxUSE_THREADS" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_THREADS 1
+    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define WX_GMTOFF_IN_TM 1
 EOF
 
+    fi
 
-    CFLAGS="${CFLAGS} -D_REENTRANT"
-  CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
-
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
+            for ac_func in gettimeofday ftime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:16320: 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
-      if test "$ac_cv_func_strtok_r" = "yes"; then
-    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:11126: checking if -D_REENTRANT is needed" >&5
-    if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
-        CFLAGS="${CFLAGS} -D_REENTRANT"
-        CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
-        echo "$ac_t""yes" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-    fi
-  fi
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 16325 "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();
 
-if test "$WXGTK13" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define __WXGTK13__ $WXGTK13
-EOF
+int main() {
 
-  WXGTK12=1
-fi
+/* The GNU C library defines this for functions which it 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
 
-if test "$WXGTK12" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define __WXGTK12__ $WXGTK12
+; return 0; }
 EOF
-
-fi
-
-if test "$WXWINE" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
-fi
-
-if test "$wxUSE_CYGWIN" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
-fi
-
-WXDEBUG=
-
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
-    WXDEBUG="-g"
-    wxUSE_OPTIMISE=no
+if { (eval echo configure:16348: \"$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
-
-if test "$wxUSE_DEBUG_GDB" = "yes" ; then
-    wxUSE_DEBUG_INFO=yes
-    WXDEBUG="-ggdb"
+rm -f conftest*
 fi
 
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define WXDEBUG 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
-
-    WXDEBUG_DEFINE="-D__WXDEBUG__"
+ break
 else
-    if test "$wxUSE_GTK" = 1 ; then
-        WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
-    fi
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-if test "$wxUSE_MEM_TRACING" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_MEMORY_TRACING 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
-EOF
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
-fi
 
-if test "$wxUSE_DMALLOC" = "yes" ; then
-    DMALLOC_LINK="-ldmalloc"
-fi
+    if test "$ac_cv_func_gettimeofday" = "yes"; then
+        echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
+echo "configure:16375: 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_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
 
-PROFILE=
-if test "$wxUSE_PROFILE" = "yes" ; then
-    PROFILE="-pg"
-fi
 
-DEP_INFO_FLAGS=
-CODE_GEN_FLAGS=
-if test "$GCC" = yes ; then
-    if test "$wxUSE_NO_RTTI" = "yes" ; then
-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
-    fi
-    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
-    fi
-    if test "$wxUSE_PERMISSIVE" = "yes" ; then
-       CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
-    fi
-    if test "$wxUSE_NO_DEPS" = "no" ; then
-        DEP_INFO_FLAGS="-MMD"
-    fi
-fi
+            cat > conftest.$ac_ext <<EOF
+#line 16390 "configure"
+#include "confdefs.h"
 
+                    #include <sys/time.h>
+                    #include <unistd.h>
+                
+int main() {
 
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    OPTIMISE=
+                    struct timeval tv;
+                    gettimeofday(&tv, NULL);
+                
+; return 0; }
+EOF
+if { (eval echo configure:16403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_func_gettimeofday_has_2_args=yes
 else
-    if test "$GCC" = yes ; then
-        OPTIMISE="-O2"
-        case "${host}" in
-            i586-*-*|i686-*-* )
-            OPTIMISE="${OPTIMISE} "
-        ;;
-        esac
-    else
-        OPTIMISE="-O"
-    fi
-fi
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16411 "configure"
+#include "confdefs.h"
 
+                        #include <sys/time.h>
+                        #include <unistd.h>
+                    
+int main() {
 
-ZLIB_INCLUDE=
-if test "$wxUSE_ZLIB" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_ZLIB 1
+                        struct timeval tv;
+                        gettimeofday(&tv);
+                    
+; return 0; }
 EOF
+if { (eval echo configure:16424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_func_gettimeofday_has_2_args=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        echo "configure: warning: failed to determine number of gettimeofday() arguments" 1>&2
+                        wx_cv_func_gettimeofday_has_2_args=unknown
+                    
+                
+fi
+rm -f conftest*
+            
+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
 
-  ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
+        
 fi
 
-PNG_INCLUDE=
-if test "$wxUSE_LIBPNG" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBPNG 1
+echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6
+
+        if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+            cat >> confdefs.h <<\EOF
+#define WX_GETTIMEOFDAY_NO_TZ 1
 EOF
 
-  PNG_INCLUDE="-I\${top_srcdir}/src/png"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
-fi
+        fi
+    fi
 
-JPEG_INCLUDE=
-if test "$wxUSE_LIBJPEG" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBJPEG 1
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TIMEDATE 1
 EOF
 
-  JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
-TIFF_INCLUDE=
-if test "$wxUSE_LIBTIFF" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBTIFF 1
-EOF
 
-  TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
-fi
+if test "$TOOLKIT" != "MSW"; then
 
-if test "$wxUSE_OPENGL" = "yes"; then
-  ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:11281: checking for GL/gl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+    if test "$wxUSE_SOCKETS" = "yes"; then
+                echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:16473: checking for socket" >&5
+if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11286 "configure"
-#include "confdefs.h"
-#include <GL/gl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11291: \"$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
-  
-    echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6
-echo "configure:11309: checking for glInitNames in -lGL" >&5
-ac_lib_var=`echo GL'_'glInitNames | 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="-lGL wxUSE_OPENGL=0 $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 11317 "configure"
+#line 16478 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char socket(); 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 glInitNames();
+char socket();
 
 int main() {
-glInitNames()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_socket) || defined (__stub___socket)
+choke me
+#else
+socket();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:11328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16501: \"$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"
+  eval "ac_cv_func_socket=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_socket=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
-  
-      OPENGL_LINK="-lGL"
-      cat >> confdefs.h <<\EOF
-#define wxUSE_OPENGL 1
-EOF
 
-      UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
-    
+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
 else
   echo "$ac_t""no" 1>&6
-
-        echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6
-echo "configure:11355: checking for glInitNames in -lMesaGL" >&5
-ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:16519: 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
   ac_save_LIBS="$LIBS"
-LIBS="-lMesaGL  $LIBS"
+LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11363 "configure"
+#line 16527 "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 glInitNames();
+char socket();
 
 int main() {
-glInitNames()
+socket()
 ; return 0; }
 EOF
-if { (eval echo configure:11374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16538: \"$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
@@ -11385,184 +16549,223 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-        OPENGL_LINK="-lMesaGL"
-        cat >> confdefs.h <<\EOF
-#define wxUSE_OPENGL 1
-EOF
-
-        UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
-      
-else
-  echo "$ac_t""no" 1>&6
-wxUSE_OPENGL=0
-fi
-
-     
-fi
-
-    
+  INET_LINK="$INET_LINK -lsocket"
 else
   echo "$ac_t""no" 1>&6
-wxUSE_OPENGL=0
-fi
-
-fi
-
-
-if test "$wxUSE_GUI" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GUI 1
-EOF
-
-
-                      else
-  cat >> confdefs.h <<\EOF
-#define wxUSE_NOGUI 1
-EOF
 
+                    echo "configure: warning: socket library not found - sockets will be disabled" 1>&2
+                    wxUSE_SOCKETS=no
+                
+            
 fi
 
-
-if test "$wxUSE_UNIX" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_UNIX 1
-EOF
-
+        
 fi
 
+    fi
 
-if test "$wxUSE_APPLE_IEEE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_APPLE_IEEE 1
-EOF
+            
+    if test "$wxUSE_SOCKETS" = "yes" ; then
+                echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
+echo "configure:16571: 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_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
 
-if test "$wxUSE_WAVE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_WAVE 1
-EOF
+                cat > conftest.$ac_ext <<EOF
+#line 16586 "configure"
+#include "confdefs.h"
 
-fi
+                        #include <sys/types.h>
+                        #include <sys/socket.h>
+                    
+int main() {
 
-if test "$wxUSE_FILE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_FILE 1
+                        socklen_t len;
+                        getsockname(0, 0, &len);
+                    
+; return 0; }
 EOF
+if { (eval echo configure:16599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_getsockname3=socklen_t
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16607 "configure"
+#include "confdefs.h"
 
-fi
+                            #include <sys/types.h>
+                            #include <sys/socket.h>
+                        
+int main() {
 
-if test "$wxUSE_FS_INET" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_FS_INET 1
+                            size_t len;
+                            getsockname(0, 0, &len);
+                        
+; return 0; }
 EOF
+if { (eval echo configure:16620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_getsockname3=size_t
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16628 "configure"
+#include "confdefs.h"
 
-fi
+                                #include <sys/types.h>
+                                #include <sys/socket.h>
+                            
+int main() {
 
-if test "$wxUSE_FS_ZIP" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_FS_ZIP 1
+                                int len;
+                                getsockname(0, 0, &len);
+                            
+; return 0; }
 EOF
-
+if { (eval echo configure:16641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_getsockname3=int
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_type_getsockname3=unknown
+                        
 fi
-
-if test "$wxUSE_ZIPSTREAM" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_ZIPSTREAM 1
-EOF
-
+rm -f conftest*
+                    
 fi
-
-if test "$wxUSE_BUSYINFO" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_BUSYINFO 1
-EOF
-
+rm -f conftest*
+                
 fi
+rm -f conftest*
 
-if test "$wxUSE_STD_IOSTREAM" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_STD_IOSTREAM 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 "$wxUSE_TEXTFILE" = "yes"; then
-  if test "$wxUSE_FILE" != "yes"; then
-    echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2
-  else
-    cat >> confdefs.h <<\EOF
-#define wxUSE_TEXTFILE 1
-EOF
-
-  fi
-fi
+echo "$ac_t""$wx_cv_type_getsockname3" 1>&6
 
-if test "$wxUSE_CONFIG" = "yes" ; then
-  if test "$wxUSE_TEXTFILE" != "yes"; then
-    echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
-  else
-    cat >> confdefs.h <<\EOF
-#define wxUSE_CONFIG 1
+        if test "$wx_cv_type_getsockname3" = "unknown"; then
+            wxUSE_SOCKETS=no
+            echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2
+        else
+            cat >> confdefs.h <<EOF
+#define SOCKLEN_T $wx_cv_type_getsockname3
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
-  fi
+        fi
+    fi
 fi
 
-if test "$wxUSE_INTL" = "yes" ; then
-  if test "$wxUSE_FILE" != "yes"; then
-    echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
-  else
+if test "$wxUSE_SOCKETS" = "yes" ; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_INTL 1
+#define wxUSE_SOCKETS 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
-  fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
 fi
 
-if test "$wxUSE_LOG" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LOG 1
-EOF
 
-fi
+if test "$wxUSE_GUI" = "yes"; then
 
-if test "$wxUSE_LONGLONG" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LONGLONG 1
+        if test "$TOOLKIT" != "MSW"; then
+        if test "$wxUSE_JOYSTICK" = "yes"; then
+                        for ac_hdr in linux/joystick.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:16700: 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 16705 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
 EOF
-
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:16710: \"$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
-
-if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_DIALUP_MANAGER 1
+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
-
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-if test "$wxUSE_STREAMS" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_STREAMS 1
+            if test "$ac_cv_header_linux_joystick_h" != "yes"; then
+                wxUSE_JOYSTICK=no
+                echo "configure: warning: Joystick not supported by this system" 1>&2
+            fi
+        fi
+    fi
+
+    if test "$wxUSE_JOYSTICK" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_JOYSTICK 1
 EOF
 
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+    fi
 fi
 
 
-if test "$wxUSE_TIMEDATE" = "yes"; then
-        for ac_func in strptime
+if test "$TOOLKIT" != "MSW"; then
+
+    HAVE_DL_FUNCS=0
+    HAVE_SHL_FUNCS=0
+    if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
+        if test "$USE_DARWIN" = 1; then
+                        HAVE_DL_FUNCS=1
+        else
+                                                for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11561: checking for $ac_func" >&5
+echo "configure:16764: 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 11566 "configure"
+#line 16769 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11585,7 +16788,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16792: \"$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
@@ -11604,118 +16807,69 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
 #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
-fi
-done
-
-
-        echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:11615: checking for timezone variable in <time.h>" >&5
-if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:16820: 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
-  
-                        cat > conftest.$ac_ext <<EOF
-#line 11621 "configure"
-#include "confdefs.h"
-
-                                #include <time.h>
-                            
-int main() {
-
-                                int tz;
-                                tz = __timezone;
-                            
-; return 0; }
-EOF
-if { (eval echo configure:11633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                                wx_cv_var_timezone=__timezone
-                            
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                                cat > conftest.$ac_ext <<EOF
-#line 11644 "configure"
-#include "confdefs.h"
-
-                                        #include <time.h>
-                                    
-int main() {
-
-                                        int tz;
-                                        tz = _timezone;
-                                    
-; return 0; }
-EOF
-if { (eval echo configure:11656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                                        wx_cv_var_timezone=_timezone
-                                    
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                                        cat > conftest.$ac_ext <<EOF
-#line 11667 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 16828 "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();
 
-                                                #include <time.h>
-                                            
 int main() {
-
-                                                int tz;
-                                                tz = timezone;
-                                            
+dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:11679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  
-                                                wx_cv_var_timezone=timezone
-                                            
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  { echo "configure: error: no timezone variable" 1>&2; exit 1; }
-                                        
-fi
-rm -f conftest*
-                                    
-                                
-fi
-rm -f conftest*
-                            
-                        
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-                   
-    
-fi
-
-echo "$ac_t""$wx_cv_var_timezone" 1>&6
+LIBS="$ac_save_LIBS"
 
-        cat >> confdefs.h <<EOF
-#define WX_TIMEZONE $wx_cv_var_timezone
+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
 
+                                HAVE_DL_FUNCS=1
+                                LIBS="$LIBS -ldl"
+                            
+else
+  echo "$ac_t""no" 1>&6
 
-            for ac_func in localtime gettimeofday ftime
+                                for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11714: checking for $ac_func" >&5
+echo "configure:16868: 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 11719 "configure"
+#line 16873 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11738,7 +16892,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16896: \"$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
@@ -11756,216 +16910,147 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- break
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-    if test "$ac_cv_func_localtime" = "yes"; then
-        echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:11769: 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 11775 "configure"
-#include "confdefs.h"
-
-                    #include <time.h>
-                
-int main() {
-
-                    struct tm tm;
-                    tm.tm_gmtoff++;
-                
-; return 0; }
-EOF
-if { (eval echo configure:11787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    wx_cv_struct_tm_has_gmtoff=yes
-                    cat >> confdefs.h <<\EOF
-#define WX_GMTOFF_IN_TM 1
+ 
+                                                cat >> confdefs.h <<\EOF
+#define HAVE_SHL_LOAD 1
 EOF
 
-                
+                                                HAVE_SHL_FUNCS=1
+                                              
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_struct_tm_has_gmtoff=no
-            
-fi
-rm -f conftest*
-        
-fi
-
-echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
-    elif test "$ac_cv_func_gettimeofday" = "yes"; then
-        echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:11810: checking whether gettimeofday takes two arguments" >&5
-if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
+echo "configure:16924: 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_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 11825 "configure"
-#include "confdefs.h"
-
-                    #include <sys/time.h>
-                    #include <unistd.h>
-                
-int main() {
-
-                    struct timeval tv;
-                    struct timezone tz;
-                    gettimeofday(&tv, &tz);
-                
-; return 0; }
-EOF
-if { (eval echo configure:11839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  wx_cv_func_gettimeofday_has_2_args=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 11847 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lshl_load  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 16932 "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();
 
-                        #include <sys/time.h>
-                        #include <unistd.h>
-                    
-int main() {
-
-                        struct timeval tv;
-                        gettimeofday(&tv);
-                    
+int main() {
+dld()
 ; return 0; }
 EOF
-if { (eval echo configure:11860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  wx_cv_func_gettimeofday_has_2_args=no
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  wx_cv_func_gettimeofday_has_2_args=unknown
-                
-fi
-rm -f conftest*
-            
+  eval "ac_cv_lib_$ac_lib_var=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
+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
+                                                                LIBS="$LIBS -ldld"
+                                                             
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6
-
-        if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
-            cat >> confdefs.h <<\EOF
-#define WX_GETTIMEOFDAY_NO_TZ 1
-EOF
-
-        fi
-    fi
+                                              
+fi
+done
 
-    cat >> confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
+                            
+fi
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
+            
 fi
+done
 
 
-if test "$wxUSE_SOCKETS" = "yes"; then
-        echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:11904: checking for socket" >&5
-if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
+                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:16982: 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 11909 "configure"
+#line 16987 "configure"
 #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 $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 socket();
+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_socket) || defined (__stub___socket)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-socket();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:11932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_socket=yes"
+  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_socket=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+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 socket in -lsocket""... $ac_c" 1>&6
-echo "configure:11950: checking for socket in -lsocket" >&5
-ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
+echo "configure:17035: 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="-lsocket  $LIBS"
+LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11958 "configure"
+#line 17043 "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 socket();
+char dlerror();
 
 int main() {
-socket()
+dlerror()
 ; return 0; }
 EOF
-if { (eval echo configure:11969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17054: \"$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
@@ -11980,129 +17065,257 @@ 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="$INET_LINK -lsocket"
+  cat >> confdefs.h <<\EOF
+#define HAVE_DLERROR 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
+fi
 
-                echo "configure: warning: socket library not found - sockets will be disabled" 1>&2
-                wxUSE_SOCKETS=no
-            
-        
 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_DYNLIB_CLASS=no
+              else
+                  echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
+              fi
+            fi
+        fi
+    fi
 fi
 
+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DYNLIB_CLASS 1
+EOF
+
+else
+    wxUSE_ODBC=no
+    wxUSE_SERIAL=no
 fi
 
-if test "$wxUSE_SOCKETS" = "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 the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:12009: checking the type of the third argument of getsockname" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 12011 "configure"
-#include "confdefs.h"
-#include <sys/socket.h>
-int main() {
-socklen_t len; getsockname(0, 0, &len);
-; return 0; }
+if test "$wxUSE_FONTMAP" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FONTMAP 1
 EOF
-if { (eval echo configure:12018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+fi
+
+if test "$wxUSE_UNICODE" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define SOCKLEN_T socklen_t
+#define wxUSE_UNICODE 1
 EOF
- echo "$ac_t""socklen_t" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 12029 "configure"
-#include "confdefs.h"
-#include <sys/socket.h>
-int main() {
-size_t len; getsockname(0, 0, &len);
-; return 0; }
+
+fi
+
+if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_EXPERIMENTAL_PRINTF 1
 EOF
-if { (eval echo configure:12036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
+
+fi
+
+
+if test "$wxUSE_SERIAL" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SERIAL 1
+EOF
+
+fi
+
+
+IODBC_C_SRC=""
+if test "$wxUSE_ODBC" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_ODBC 1
+EOF
+
+    WXODBCFLAG="-D_IODBC_"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+fi
+
+
+if test "$wxUSE_POSTSCRIPT" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define SOCKLEN_T size_t
+#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_UNIVERSAL" = "yes"; then
+        echo "configure: warning: MDI is not supported for wxUNIVERSAL yet... disabled" 1>&2
+        wxUSE_MDI_ARCHITECTURE=no
+    fi
+
+    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
- echo "$ac_t""size_t" 1>&6
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+
+    if test "$USE_WIN32" = 1; then
+      if test "$wxUSE_MS_HTML_HELP" = "yes"; then
+        ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
+echo "configure:17211: checking for htmlhelp.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 12047 "configure"
+#line 17216 "configure"
 #include "confdefs.h"
-#include <sys/socket.h>
-int main() {
-int len; getsockname(0, 0, &len);
-; return 0; }
+#include <htmlhelp.h>
 EOF
-if { (eval echo configure:12054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:17221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define SOCKLEN_T int
-EOF
- echo "$ac_t""int" 1>&6
+  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*
-  echo "$ac_t""unknown" 1>&6
-            
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-        
 fi
-rm -f conftest*
-    
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                cat >> confdefs.h <<\EOF
+#define wxUSE_MS_HTML_HELP 1
+EOF
+
+            
+else
+  echo "$ac_t""no" 1>&6
+
+                echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h... disabled" 1>&2
+                wxUSE_MS_HTML_HELP=no
+            
+fi
+
+      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" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_PROLOGIO 1
+EOF
+
 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
 
+if test "$wxUSE_RESOURCES" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RESOURCES 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+fi
 
+if test "$wxUSE_X_RESOURCES" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_SOCKETS 1
+#define wxUSE_X_RESOURCES 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
 
-if test "$wxUSE_JOYSTICK" = 1; then
-    for ac_hdr in linux/joystick.h
+if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
+                            -o "$wxUSE_CLIPBOARD"     = "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:12096: checking for $ac_hdr" >&5
+echo "configure:17309: 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 12101 "configure"
+#line 17314 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17319: \"$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*
@@ -12128,710 +17341,621 @@ else
 fi
 done
 
-  if test "$ac_cv_header_linux_joystick_h" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_JOYSTICK 1
+
+    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="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
+            cat >> confdefs.h <<\EOF
+#define wxUSE_OLE 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
-  fi
-fi
 
+        fi
 
-HAVE_DL_FUNCS=0
-HAVE_SHL_FUNCS=0
-if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
-                for ac_func in dlopen
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12148: 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 12153 "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();
+                cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
 
-int main() {
+    else
+        echo "configure: warning: Some features disabled because OLE headers not found" 1>&2
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
+        wxUSE_CLIPBOARD=no
+        wxUSE_DRAG_AND_DROP=no
+        wxUSE_DATAOBJ=no
+    fi
 
-; return 0; }
+        if test "$wxUSE_METAFILE" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
 EOF
-if { (eval echo configure:12176: \"$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
+
+                cat >> confdefs.h <<\EOF
+#define wxUSE_ENH_METAFILE 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:12204: 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 12212 "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();
+    fi
+fi
 
-int main() {
-dlopen()
-; return 0; }
+if test "$wxUSE_IPC" = "yes"; then
+    if test "$wxUSE_SOCKETS" != "yes"; then
+        echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
+    fi
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IPC 1
 EOF
-if { (eval echo configure:12223: \"$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
+
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CLIPBOARD 1
 EOF
 
-                            HAVE_DL_FUNCS=1
-                            LIBS="$LIBS -ldl"
-                        
-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:12252: 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 12257 "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();
+        cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
 
-int main() {
+fi
 
-/* The GNU C library defines this for functions which it 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
+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" 1>&2
+            wxUSE_DRAG_AND_DROP=no
+        fi
+    fi
 
-; return 0; }
+    if test "$wxUSE_MOTIF" = 1; then
+        echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 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
-if { (eval echo configure:12280: \"$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*
+
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
+    fi
+
 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
+if test "$wxUSE_SPLINES" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_SPLINES 1
 EOF
 
-                                            HAVE_SHL_FUNCS=1
-                                          
-else
-  echo "$ac_t""no" 1>&6
 fi
-done
 
-                        
-fi
 
-        
+USES_CONTROLS=0
+if test "$wxUSE_CONTROLS" = "yes"; then
+  USES_CONTROLS=1
 fi
-done
 
+if test "$wxUSE_ACCEL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ACCEL 1
+EOF
 
-    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_DYNLIB_CLASS=no
-          else
-              echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
-          fi
-        fi
-    fi
+  USES_CONTROLS=1
 fi
 
-if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_DYNLIB_CLASS 1
+if test "$wxUSE_BUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
 EOF
 
-else
-    wxUSE_ODBC=no
-    wxUSE_SERIAL=no
+  USES_CONTROLS=1
 fi
 
-
-if test "$wxUSE_UNICODE" = "yes" ; then
+if test "$wxUSE_BMPBUTTON" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_UNICODE 1
+#define wxUSE_BMPBUTTON 1
 EOF
 
+  USES_CONTROLS=1
 fi
 
-if test "$wxUSE_WCSRTOMBS" = "yes" ; then
+if test "$wxUSE_CALCTRL" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_WCSRTOMBS 1
+#define wxUSE_CALENDARCTRL 1
 EOF
 
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
 fi
 
-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
+if test "$wxUSE_CARET" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
+#define wxUSE_CARET 1
 EOF
 
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
-
-if test "$wxUSE_SERIAL" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_SERIAL 1
+if test "$wxUSE_COMBOBOX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_COMBOBOX 1
 EOF
 
+  USES_CONTROLS=1
 fi
 
-
-IODBC_C_SRC=""
-if test "$wxUSE_ODBC" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_ODBC 1
+if test "$wxUSE_CHOICE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICE 1
 EOF
 
-    WXODBCFLAG="-D_IODBC_"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-    IODBCOBJS="\$(IODBC_OBJS)"
-else
-    IODBCOBJS=
+  USES_CONTROLS=1
 fi
 
-
-if test "$wxUSE_POSTSCRIPT" = "yes" ; then
+if test "$wxUSE_CHECKBOX" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_POSTSCRIPT 1
+#define wxUSE_CHECKBOX 1
 EOF
 
+  USES_CONTROLS=1
 fi
 
-cat >> confdefs.h <<\EOF
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
+if test "$wxUSE_CHECKLST" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHECKLISTBOX 1
 EOF
 
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
+fi
 
-cat >> confdefs.h <<\EOF
-#define wxUSE_NORMALIZED_PS_FONTS 1
+if test "$wxUSE_GAUGE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GAUGE 1
 EOF
 
+  USES_CONTROLS=1
+fi
 
-
-if test "$wxUSE_CONSTRAINTS" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_CONSTRAINTS 1
+if test "$wxUSE_NEW_GRID" = "yes"; then
+  wxUSE_GRID="yes"
+  cat >> confdefs.h <<\EOF
+#define wxUSE_NEW_GRID 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
-if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_MDI_ARCHITECTURE 1
+if test "$wxUSE_GRID" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GRID 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
-if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
+if test "$wxUSE_IMAGLIST" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+#define wxUSE_IMAGLIST 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
+if test "$wxUSE_LISTBOX" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_HELP 1
+#define wxUSE_LISTBOX 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+    USES_CONTROLS=1
 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
+if test "$wxUSE_LISTCTRL" = "yes"; then
+    if test "$wxUSE_IMAGLIST" = "yes"; then
         cat >> confdefs.h <<\EOF
-#define wxUSE_PRINTING_ARCHITECTURE 1
+#define wxUSE_LISTCTRL 1
 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
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
-if test "$wxUSE_PROLOGIO" = "yes" ; then
+if test "$wxUSE_NOTEBOOK" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_PROLOGIO 1
+#define wxUSE_NOTEBOOK 1
 EOF
 
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
-if test "$wxUSE_RESOURCES" = "yes" ; then
-    if test "$wxUSE_PROLOGIO" = "yes" ; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_RESOURCES 1
+if test "$wxUSE_PROPSHEET" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_PROPSHEET 1
 EOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
-    else
-        echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2
-    fi
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
 fi
 
-if test "$wxUSE_X_RESOURCES" = "yes"; then
+if test "$wxUSE_RADIOBOX" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_X_RESOURCES 1
+#define wxUSE_RADIOBOX 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
-
-if test "$wxUSE_IPC" = "yes"; then
+if test "$wxUSE_RADIOBTN" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_IPC 1
+#define wxUSE_RADIOBTN 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_CLIPBOARD" = "yes"; then
+if test "$wxUSE_SASH" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_CLIPBOARD 1
+#define wxUSE_SASH 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
 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" 1>&2
-            wxUSE_DRAG_AND_DROP=no
-        fi
-    fi
-
-    if test "$wxUSE_MOTIF" = 1; then
-        echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
-    if test "$USE_WIN32" = 1; 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:12509: 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 12514 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
+if test "$wxUSE_SCROLLBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SCROLLBAR 1
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12519: \"$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*
+
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 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
+
+if test "$wxUSE_SLIDER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SLIDER 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
 
-        if test "x$HAVE_OLE2_H" = x ; then
-            echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
-            wxUSE_DRAG_AND_DROP=no
-        fi
-    fi
+    USES_CONTROLS=1
+fi
 
-    if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_DRAG_AND_DROP 1
+if test "$wxUSE_SPINBTN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINBTN 1
 EOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
-    fi
-
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_SPLINES" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_SPLINES 1
+if test "$wxUSE_SPINCTRL" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINCTRL 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
-
-if test "$wxUSE_ACCEL" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_ACCEL 1
+if test "$wxUSE_SPLITTER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPLITTER 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
 fi
 
-if test "$wxUSE_CARET" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CARET 1
+if test "$wxUSE_STATBMP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATBMP 1
 EOF
 
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_COMBOBOX" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_COMBOBOX 1
+if test "$wxUSE_STATBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATBOX 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_CHOICE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CHOICE 1
+if test "$wxUSE_STATTEXT" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATTEXT 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_BMPBUTTON" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_BMPBUTTON 1
+if test "$wxUSE_STATLINE" = "yes"; then
+    if test "$wxUSE_WINE" = 1 ; then
+        echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_STATLINE 1
 EOF
 
+        USES_CONTROLS=1
+    fi
 fi
 
-if test "$wxUSE_CHECKBOX" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CHECKBOX 1
+if test "$wxUSE_STATUSBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATUSBAR 1
 EOF
 
+    USES_CONTROLS=1
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi
 
-if test "$wxUSE_CHECKLST" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CHECKLISTBOX 1
+if test "$wxUSE_TABDIALOG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TAB_DIALOG 1
 EOF
 
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
-if test "$wxUSE_GAUGE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GAUGE 1
+if test "$wxUSE_TEXTCTRL" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTCTRL 1
 EOF
 
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
 fi
 
-if test "$wxUSE_GRID" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GRID 1
+if test "$wxUSE_TOGGLEBTN" = "yes"; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
+        echo "configure: warning: Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled" 1>&2
+        wxUSE_TOGGLEBTN=no
+    fi
+
+    if test "$wxUSE_TOGGLEBTN" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TOGGLEBTN 1
 EOF
 
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
+        USES_CONTROLS=1
+    fi
 fi
 
-if test "$wxUSE_NEW_GRID" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_NEW_GRID 1
+if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_SIMPLE 1
 EOF
 
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
+    wxUSE_TOOLBAR="yes"
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_IMAGLIST" = "yes"; then
+if test "$wxUSE_TOOLBAR" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_IMAGLIST 1
+#define wxUSE_TOOLBAR 1
+EOF
+
+    USES_CONTROLS=1
+
+        if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
+        wxUSE_TOOLBAR_NATIVE="yes"
+    fi
+
+    if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_NATIVE 1
 EOF
 
+        USES_CONTROLS=1
+    fi
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
 fi
 
-if test "$wxUSE_LISTBOX" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_LISTBOX 1
+if test "$wxUSE_TOOLTIPS" = "yes"; then
+    if test "$wxUSE_MOTIF" = 1; then
+        echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2
+    else
+        if test "$wxUSE_WINE" = 1; then
+            echo "configure: warning: wxTooltip not supported under WINE" 1>&2
+        else
+            cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLTIPS 1
 EOF
 
+        fi
+    fi
 fi
 
-if test "$wxUSE_LISTCTRL" = "yes"; then
+if test "$wxUSE_TREECTRL" = "yes"; then
     if test "$wxUSE_IMAGLIST" = "yes"; then
         cat >> confdefs.h <<\EOF
-#define wxUSE_LISTCTRL 1
+#define wxUSE_TREECTRL 1
 EOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
+        USES_CONTROLS=1
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else
-        echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
+        echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
     fi
 fi
 
-if test "$wxUSE_NOTEBOOK" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_NOTEBOOK 1
+if test "$wxUSE_POPUPWIN" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Popup window is not yet supported under Mac OS" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_POPUPWIN 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
+        USES_CONTROLS=1
+    fi
 fi
 
-if test "$wxUSE_RADIOBOX" = "yes"; then
+if test "$USES_CONTROLS" = 1; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_RADIOBOX 1
+#define wxUSE_CONTROLS 1
 EOF
 
 fi
 
-if test "$wxUSE_RADIOBTN" = "yes"; then
+
+if test "$wxUSE_TREELAYOUT" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_RADIOBTN 1
+#define wxUSE_TREELAYOUT 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
 fi
 
-if test "$wxUSE_SASH" = "yes"; then
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_SASH 1
+#define wxUSE_DRAGIMAGE 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 
-if test "$wxUSE_SCROLLBAR" = "yes"; then
+if test "$wxUSE_MENUS" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_SCROLLBAR 1
+#define wxUSE_MENUS 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
 fi
 
-if test "$wxUSE_SLIDER" = "yes"; then
+if test "$wxUSE_METAFILE" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_SLIDER 1
+#define wxUSE_METAFILE 1
 EOF
 
 fi
 
-if test "$wxUSE_SPINBTN" = "yes"; then
+if test "$wxUSE_MIMETYPE" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_SPINBTN 1
+#define wxUSE_MIMETYPE 1
 EOF
 
 fi
 
-if test "$wxUSE_SPINCTRL" = "yes"; then
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_SPINCTRL 1
+#define wxUSE_SYSTEM_OPTIONS 1
 EOF
 
 fi
 
-if test "$wxUSE_SPLITTER" = "yes"; then
+if test "$wxUSE_MINIFRAME" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_SPLITTER 1
+#define wxUSE_MINIFRAME 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
-if test "$wxUSE_STATBMP" = "yes"; then
+if test "$wxUSE_HTML" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_STATBMP 1
+#define wxUSE_HTML 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
 fi
 
-if test "$wxUSE_STATBOX" = "yes"; then
+if test "$wxUSE_VALIDATORS" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_STATBOX 1
+#define wxUSE_VALIDATORS 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
-if test "$wxUSE_STATLINE" = "yes"; then
-    if test "$wxUSE_WINE" = 1 ; then
-        echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2
-    else
-        cat >> confdefs.h <<\EOF
-#define wxUSE_STATLINE 1
+if test "$wxUSE_PALETTE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PALETTE 1
 EOF
 
-    fi
 fi
 
-if test "$wxUSE_STATUSBAR" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_STATUSBAR 1
+if test "$wxUSE_IMAGE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_IMAGE 1
 EOF
 
 fi
 
-if test "$wxUSE_TABDIALOG" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_TAB_DIALOG 1
+if test "$wxUSE_GIF" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GIF 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
-if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_TOOLBAR_SIMPLE 1
+if test "$wxUSE_PCX" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PCX 1
 EOF
 
-    wxUSE_TOOLBAR="yes"
 fi
 
-if test "$wxUSE_TOOLBAR" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_TOOLBAR 1
+if test "$wxUSE_PNM" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PNM 1
 EOF
 
+fi
 
-        if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
-        wxUSE_TOOLBAR_NATIVE="yes"
-    fi
+if test "$wxUSE_XPM" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_XPM 1
+EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
 fi
 
-if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+
+if test "$wxUSE_CHOICEDLG" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_TOOLBAR_NATIVE 1
+#define wxUSE_CHOICEDLG 1
 EOF
 
 fi
 
-if test "$wxUSE_TOOLTIPS" = "yes"; then
-    if test "$wxUSE_MOTIF" = 1; then
-        echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2
-    else
-        if test "$wxUSE_WINE" = 1; then
-            echo "configure: warning: wxTooltip not supported under WINE" 1>&2
-        else
-            cat >> confdefs.h <<\EOF
-#define wxUSE_TOOLTIPS 1
+if test "$wxUSE_COLOURDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_COLOURDLG 1
 EOF
 
-        fi
-    fi
 fi
 
-if test "$wxUSE_TREECTRL" = "yes"; then
-    if test "$wxUSE_IMAGLIST" = "yes"; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_TREECTRL 1
+if test "$wxUSE_FILEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FILEDLG 1
 EOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
-    else
-        echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
-    fi
 fi
 
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FINDREPLDLG 1
+EOF
 
+fi
 
-if test "$wxUSE_METAFILE" = "yes"; then
+if test "$wxUSE_FONTDLG" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_METAFILE 1
+#define wxUSE_FONTDLG 1
 EOF
 
 fi
@@ -12851,22 +17975,18 @@ EOF
     fi
 fi
 
-if test "$wxUSE_TEXTDLG" = "yes"; then
+if test "$wxUSE_MSGDLG" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_TEXTDLG 1
+#define wxUSE_MSGDLG 1
 EOF
 
 fi
 
-if test "$wxUSE_STARTUP_TIPS" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
-    else
-        cat >> confdefs.h <<\EOF
-#define wxUSE_STARTUP_TIPS 1
+if test "$wxUSE_NUMBERDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NUMBERDLG 1
 EOF
 
-    fi
 fi
 
 if test "$wxUSE_PROGRESSDLG" = "yes"; then
@@ -12880,93 +18000,128 @@ EOF
     fi
 fi
 
-if test "$wxUSE_MINIFRAME" = "yes"; then
+if test "$wxUSE_SPLASH" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_MINIFRAME 1
+#define wxUSE_SPLASH 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
-if test "$wxUSE_HTML" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_HTML 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
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html"
+    fi
 fi
 
-if test "$wxUSE_VALIDATORS" = "yes"; then
+if test "$wxUSE_TEXTDLG" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_VALIDATORS 1
+#define wxUSE_TEXTDLG 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
-if test "$wxUSE_GIF" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GIF 1
+if test "$wxUSE_WIZARDDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WIZARDDLG 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
 fi
 
-if test "$wxUSE_PCX" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_PCX 1
-EOF
 
+if test "$cross_compiling" = "yes"; then
+        OSINFO="\"$host\""
+else
+        OSINFO=`uname -s -r -m`
+    OSINFO="\"$OSINFO\""
 fi
 
-if test "$wxUSE_PNM" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_PNM 1
+cat >> confdefs.h <<EOF
+#define WXWIN_OS_DESCRIPTION $OSINFO
 EOF
 
-fi
 
 
-OSINFO=`uname -s -r -m`
-OSINFO="\"$OSINFO\""
+if test "x$prefix" != "xNONE"; then
+    wxPREFIX=$prefix
+else
+    wxPREFIX=$ac_default_prefix
+fi
+
 cat >> confdefs.h <<EOF
-#define WXWIN_OS_DESCRIPTION $OSINFO
+#define wxINSTALL_PREFIX "$wxPREFIX"
 EOF
 
 
 
-GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"
+GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
+
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+
+if test "$wxUSE_MAC" = 1 ; then
+    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
+fi
 
-EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
+    EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
+
+        
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+                     drawing dynamic erase event exec font image \
+                     minimal richedit rotate widgets"
+
+        CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
+else
+    SAMPLES_SUBDIRS="console"
 fi
 
 LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I. -I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
+$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
+$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
+
+if test "$wxUSE_GTK" = 1; then
+    WXCONFIG_INCLUDE=""
+else
+    WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
+fi
 
 if test "$GXX" = yes ; then
         CXXWARNINGS="-Wall"
-            fi
+        fi
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
 
-CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
+CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
 CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
 LDFLAGS="$LDFLAGS $PROFILE"
 
-if test "$wxUSE_GUI" = "yes"; then
-        
-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
-                     font fractal image minimal richedit"
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-        CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
-else
-    SAMPLES_SUBDIRS=""
-fi
 
-SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
 
 
 
@@ -13031,7 +18186,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:13035: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18190: 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
@@ -13058,15 +18213,25 @@ else
 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 "$wxUSE_GUI" = "yes"; then
+            wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
+    wx_cv_path_ifs=$PATH_IFS
+    wx_cv_program_ext=$PROGRAM_EXT
+    wx_cv_target_library=$WX_TARGET_LIBRARY
+    wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
+    wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+            export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
+           wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
+    subdirs="demos samples utils contrib"
 
-if test "${TOOLKIT_DIR}" = "msw" ; then
-  GL_TOOLKIT_DIR="win"
-else
-  GL_TOOLKIT_DIR="${TOOLKIT_DIR}"
 fi
 
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -13174,83 +18339,6 @@ trap 'rm -fr `echo "
             src/makeprog.env
             src/makelib.env
             Makefile
-            demos/Makefile
-            demos/bombs/Makefile
-            demos/forty/Makefile
-            demos/fractal/Makefile
-            demos/life/Makefile
-            demos/poem/Makefile
-            samples/Makefile
-            samples/caret/Makefile
-            samples/calendar/Makefile
-            samples/checklst/Makefile
-            samples/config/Makefile
-            samples/controls/Makefile
-            samples/console/Makefile
-            samples/db/Makefile
-            samples/dialogs/Makefile
-            samples/docview/Makefile
-            samples/docvwmdi/Makefile
-            samples/dnd/Makefile
-            samples/drawing/Makefile
-            samples/exec/Makefile
-            samples/font/Makefile
-            samples/grid/Makefile
-            samples/help/Makefile
-            samples/image/Makefile
-            samples/internat/Makefile
-            samples/ipc/Makefile
-            samples/layout/Makefile
-            samples/listctrl/Makefile
-            samples/mdi/Makefile
-            samples/minifram/Makefile
-            samples/minimal/Makefile
-            samples/dialup/Makefile
-            samples/newgrid/Makefile
-            samples/notebook/Makefile
-            samples/png/Makefile
-            samples/printing/Makefile
-            samples/proplist/Makefile
-            samples/propsize/Makefile
-            samples/richedit/Makefile
-            samples/resource/Makefile
-            samples/sashtest/Makefile
-            samples/scroll/Makefile
-            samples/scrollsub/Makefile
-            samples/splitter/Makefile
-            samples/text/Makefile
-            samples/thread/Makefile
-            samples/toolbar/Makefile
-            samples/treectrl/Makefile
-            samples/typetest/Makefile
-            samples/validate/Makefile
-            samples/sockets/Makefile
-            samples/wizard/Makefile
-            samples/html/Makefile
-            samples/html/about/Makefile
-            samples/html/help/Makefile
-            samples/html/printing/Makefile
-            samples/html/helpview/Makefile
-            samples/html/test/Makefile
-            samples/html/zip/Makefile
-            samples/html/virtual/Makefile
-            samples/html/widget/Makefile
-            utils/Makefile
-            utils/wxMMedia2/Makefile
-            utils/wxMMedia2/lib/Makefile
-            utils/wxMMedia2/sample/Makefile
-            utils/glcanvas/Makefile
-            utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
-            utils/ogl/Makefile
-            utils/ogl/src/Makefile
-            utils/makegen/Makefile
-            utils/HelpGen/Makefile
-            utils/HelpGen/src/Makefile
-            utils/tex2rtf/Makefile
-            utils/tex2rtf/src/Makefile
-            utils/hhp2cached/Makefile
-            utils/dialoged/Makefile
-            utils/dialoged/src/Makefile
            setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -13301,7 +18389,6 @@ s%@build_os@%$build_os%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@CXX@%$CXX%g
-s%@CXXCPP@%$CXXCPP%g
 s%@RANLIB@%$RANLIB%g
 s%@AR@%$AR%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
@@ -13312,66 +18399,79 @@ s%@YACC@%$YACC%g
 s%@LEX@%$LEX%g
 s%@LEXLIB@%$LEXLIB%g
 s%@LN_S@%$LN_S%g
-s%@GTK_CONFIG@%$GTK_CONFIG%g
+s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
+s%@GTK_CONFIG@%$GTK_CONFIG%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%@RESCOMP@%$RESCOMP%g
+s%@DEREZ@%$DEREZ%g
+s%@CXXCPP@%$CXXCPP%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@%$WX_LIBRARY_NAME%g
 s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
 s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
-s%@WX_LIBRARY@%$WX_LIBRARY%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%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%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%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g
 s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g
-s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%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%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
 s%@USE_GUI@%$USE_GUI%g
 s%@AFMINSTALL@%$AFMINSTALL%g
 s%@TOOLKIT@%$TOOLKIT%g
-s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
 s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
-s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
-s%@GUIHEADERS@%$GUIHEADERS%g
-s%@GUIOBJS@%$GUIOBJS%g
-s%@COMMONOBJS@%$COMMONOBJS%g
-s%@GENERICOBJS@%$GENERICOBJS%g
-s%@GUIDEPS@%$GUIDEPS%g
-s%@COMMONDEPS@%$COMMONDEPS%g
-s%@GENERICDEPS@%$GENERICDEPS%g
-s%@IODBCOBJS@%$IODBCOBJS%g
-s%@UNIXOBJS@%$UNIXOBJS%g
-s%@UNIXDEPS@%$UNIXDEPS%g
+s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
+s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
+s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
+s%@cross_compiling@%$cross_compiling%g
+s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
+s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g
+s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
 s%@ALL_OBJECTS@%$ALL_OBJECTS%g
-s%@ALL_DEPFILES@%$ALL_DEPFILES%g
-s%@ALL_HEADERS@%$ALL_HEADERS%g
 s%@GUIDIST@%$GUIDIST%g
-s%@SRC_SUBDIRS@%$SRC_SUBDIRS%g
-s%@INCLUDE_SUBDIRS@%$INCLUDE_SUBDIRS%g
-s%@UTILS_SUBDIRS@%$UTILS_SUBDIRS%g
-s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g
+s%@PORT_FILES@%$PORT_FILES%g
+s%@DISTDIR@%$DISTDIR%g
+s%@RPM_SPEC@%$RPM_SPEC%g
+s%@RPM_FILES@%$RPM_FILES%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
-s%@USER_SUBDIRS@%$USER_SUBDIRS%g
 s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+s%@OPENGL_LIBS@%$OPENGL_LIBS%g
 s%@EXTRADEFS@%$EXTRADEFS%g
 s%@LD_LIBS@%$LD_LIBS%g
+s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g
+s%@RESFLAGS@%$RESFLAGS%g
+s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
+s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g
+s%@LIBWXMACRES@%$LIBWXMACRES%g
+s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
+s%@DLLTOOL@%$DLLTOOL%g
+s%@AS@%$AS%g
+s%@NM@%$NM%g
+s%@LD@%$LD%g
+s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
-s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g
+s%@subdirs@%$subdirs%g
 
 CEOF
 EOF
@@ -13418,83 +18518,6 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
             src/makeprog.env
             src/makelib.env
             Makefile
-            demos/Makefile
-            demos/bombs/Makefile
-            demos/forty/Makefile
-            demos/fractal/Makefile
-            demos/life/Makefile
-            demos/poem/Makefile
-            samples/Makefile
-            samples/caret/Makefile
-            samples/calendar/Makefile
-            samples/checklst/Makefile
-            samples/config/Makefile
-            samples/controls/Makefile
-            samples/console/Makefile
-            samples/db/Makefile
-            samples/dialogs/Makefile
-            samples/docview/Makefile
-            samples/docvwmdi/Makefile
-            samples/dnd/Makefile
-            samples/drawing/Makefile
-            samples/exec/Makefile
-            samples/font/Makefile
-            samples/grid/Makefile
-            samples/help/Makefile
-            samples/image/Makefile
-            samples/internat/Makefile
-            samples/ipc/Makefile
-            samples/layout/Makefile
-            samples/listctrl/Makefile
-            samples/mdi/Makefile
-            samples/minifram/Makefile
-            samples/minimal/Makefile
-            samples/dialup/Makefile
-            samples/newgrid/Makefile
-            samples/notebook/Makefile
-            samples/png/Makefile
-            samples/printing/Makefile
-            samples/proplist/Makefile
-            samples/propsize/Makefile
-            samples/richedit/Makefile
-            samples/resource/Makefile
-            samples/sashtest/Makefile
-            samples/scroll/Makefile
-            samples/scrollsub/Makefile
-            samples/splitter/Makefile
-            samples/text/Makefile
-            samples/thread/Makefile
-            samples/toolbar/Makefile
-            samples/treectrl/Makefile
-            samples/typetest/Makefile
-            samples/validate/Makefile
-            samples/sockets/Makefile
-            samples/wizard/Makefile
-            samples/html/Makefile
-            samples/html/about/Makefile
-            samples/html/help/Makefile
-            samples/html/printing/Makefile
-            samples/html/helpview/Makefile
-            samples/html/test/Makefile
-            samples/html/zip/Makefile
-            samples/html/virtual/Makefile
-            samples/html/widget/Makefile
-            utils/Makefile
-            utils/wxMMedia2/Makefile
-            utils/wxMMedia2/lib/Makefile
-            utils/wxMMedia2/sample/Makefile
-            utils/glcanvas/Makefile
-            utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
-            utils/ogl/Makefile
-            utils/ogl/src/Makefile
-            utils/makegen/Makefile
-            utils/HelpGen/Makefile
-            utils/HelpGen/src/Makefile
-            utils/tex2rtf/Makefile
-            utils/tex2rtf/src/Makefile
-            utils/hhp2cached/Makefile
-            utils/dialoged/Makefile
-            utils/dialoged/src/Makefile
           "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -13664,24 +18687,36 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-            TOOLKIT_DIR="${TOOLKIT_DIR}"
+            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
+            LN_S="${LN_S}"
           
          
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 
-            chmod +x wx-config
-            if test ! -d include; then
-              mkdir include
+                                                            if test ! -L wx-config; then
+                chmod +x wx-config
+                mv wx-config wx${TOOLCHAIN_NAME}-config
+                ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config
+            fi
+
+            if test ! -d lib; then
+              mkdir lib
+            fi
+            if test ! -d lib/wx; then
+              mkdir lib/wx
             fi
-            if test ! -d include/wx; then
-              mkdir include/wx
+            if test ! -d lib/wx/include; then
+              mkdir lib/wx/include
             fi
-            if test ! -d include/wx/${TOOLKIT_DIR}; then
-              mkdir include/wx/${TOOLKIT_DIR}
+            if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then
+              mkdir lib/wx/include/${TOOLCHAIN_NAME}
+            fi
+            if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then
+              mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx
             fi
             if test -f setup.h; then
-                mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+              mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
             fi
           
 exit 0
@@ -13690,4 +18725,101 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+if test "$no_recursion" != yes; then
+
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  ac_sub_configure_args=
+  ac_prev=
+  for ac_arg in $ac_configure_args; do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      continue
+    fi
+    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-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+      ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+    esac
+  done
+
+  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.
+    if test ! -d $srcdir/$ac_config_dir; then
+      continue
+    fi
+
+    echo configuring in $ac_config_dir
+
+    case "$srcdir" in
+    .) ;;
+    *)
+      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
+      else
+        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
+      fi
+      ;;
+    esac
+
+    ac_popdir=`pwd`
+    cd $ac_config_dir
+
+      # A "../" for each directory in /$ac_config_dir.
+      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+
+    case "$srcdir" in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    /*) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure; then
+      ac_sub_configure=$ac_sub_srcdir/configure
+    elif test -f $ac_sub_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure
+    else
+      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
+
+      # Make the cache file name correct relative to the subdirectory.
+      case "$cache_file" in
+      /*) ac_sub_cache_file=$cache_file ;;
+      *) # Relative path.
+        ac_sub_cache_file="$ac_dots$cache_file" ;;
+      esac
+  case "$ac_given_INSTALL" in
+        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+        esac
+
+      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+      # The eval makes quoting arguments work.
+      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+      then :
+      else
+        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+      fi
+    fi
+
+    cd $ac_popdir
+  done
+fi
+